RubyGems - roadie - Versions diffs - 3.5.1 → 5.1.0 - Mend

roadie 3.5.1 → 5.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

checksums.yaml +4 -4
data/.github/workflows/main.yml +46 -0
data/.rubocop.yml +5 -0
data/.solargraph.yml +16 -0
data/Changelog.md +35 -4
data/Gemfile +7 -2
data/README.md +14 -14
data/Rakefile +4 -3
data/lib/roadie/asset_provider.rb +5 -1
data/lib/roadie/asset_scanner.rb +8 -6
data/lib/roadie/cached_provider.rb +3 -0
data/lib/roadie/deduplicator.rb +3 -0
data/lib/roadie/document.rb +24 -17
data/lib/roadie/errors.rb +22 -16
data/lib/roadie/filesystem_provider.rb +15 -3
data/lib/roadie/inliner.rb +51 -19
data/lib/roadie/markup_improver.rb +24 -31
data/lib/roadie/net_http_provider.rb +27 -12
data/lib/roadie/null_provider.rb +20 -5
data/lib/roadie/null_url_rewriter.rb +11 -3
data/lib/roadie/path_rewriter_provider.rb +6 -1
data/lib/roadie/provider_list.rb +17 -11
data/lib/roadie/rspec/asset_provider.rb +6 -1
data/lib/roadie/rspec/cache_store.rb +2 -0
data/lib/roadie/rspec.rb +4 -2
data/lib/roadie/selector.rb +18 -5
data/lib/roadie/style_attribute_builder.rb +4 -1
data/lib/roadie/style_block.rb +5 -3
data/lib/roadie/style_property.rb +5 -2
data/lib/roadie/stylesheet.rb +4 -13
data/lib/roadie/url_generator.rb +26 -8
data/lib/roadie/url_rewriter.rb +12 -9
data/lib/roadie/utils.rb +3 -1
data/lib/roadie/version.rb +1 -1
data/lib/roadie.rb +25 -23
data/roadie.gemspec +23 -23
data/spec/hash_as_cache_store_spec.rb +3 -1
data/spec/integration_spec.rb +75 -44
data/spec/lib/roadie/asset_scanner_spec.rb +11 -5
data/spec/lib/roadie/cached_provider_spec.rb +6 -4
data/spec/lib/roadie/css_not_found_spec.rb +10 -5
data/spec/lib/roadie/deduplicator_spec.rb +5 -3
data/spec/lib/roadie/document_spec.rb +57 -28
data/spec/lib/roadie/filesystem_provider_spec.rb +10 -11
data/spec/lib/roadie/inliner_spec.rb +42 -45
data/spec/lib/roadie/markup_improver_spec.rb +19 -26
data/spec/lib/roadie/net_http_provider_spec.rb +16 -14
data/spec/lib/roadie/null_provider_spec.rb +4 -3
data/spec/lib/roadie/null_url_rewriter_spec.rb +4 -3
data/spec/lib/roadie/path_rewriter_provider_spec.rb +6 -4
data/spec/lib/roadie/provider_list_spec.rb +27 -22
data/spec/lib/roadie/selector_spec.rb +7 -5
data/spec/lib/roadie/style_attribute_builder_spec.rb +7 -5
data/spec/lib/roadie/style_block_spec.rb +3 -2
data/spec/lib/roadie/style_property_spec.rb +10 -8
data/spec/lib/roadie/stylesheet_spec.rb +4 -21
data/spec/lib/roadie/test_provider_spec.rb +6 -4
data/spec/lib/roadie/url_generator_spec.rb +3 -2
data/spec/lib/roadie/url_rewriter_spec.rb +10 -7
data/spec/lib/roadie/utils_spec.rb +2 -0
data/spec/shared_examples/asset_provider.rb +2 -0
data/spec/shared_examples/url_rewriter.rb +5 -3
data/spec/spec_helper.rb +10 -8
data/spec/support/have_attribute_matcher.rb +3 -2
data/spec/support/have_node_matcher.rb +5 -3
data/spec/support/have_selector_matcher.rb +4 -3
data/spec/support/have_styling_matcher.rb +12 -11
data/spec/support/have_xpath_matcher.rb +4 -3
data/spec/support/test_provider.rb +2 -0
metadata +24 -8
data/.travis.yml +0 -22

data/spec/lib/roadie/deduplicator_spec.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require "spec_helper"
 module Roadie
@@ -7,13 +9,13 @@ module Roadie
         ["a", "1"],
         ["b", "2"],
         ["a", "3"],
-        ["a", "1"],
+        ["a", "1"]
       ]
       expect(Deduplicator.apply(input)).to eq [
         ["b", "2"],
         ["a", "3"],
-        ["a", "1"],
+        ["a", "1"]
       ]
     end
@@ -21,7 +23,7 @@ module Roadie
       input = [
         ["a", "1"],
         ["a", "3"],
-        ["a", "2"],
+        ["a", "2"]
       ]
       expect(Deduplicator.apply(input)).to eq input

data/spec/lib/roadie/document_spec.rb CHANGED Viewed

@@ -1,5 +1,6 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+require "spec_helper"
 module Roadie
   describe Document do
@@ -16,6 +17,16 @@ module Roadie
       expect(document.url_options).to eq({host: "foo.bar"})
     end
+    it "has an accessor for serialization options" do
+      serialization_options = Nokogiri::XML::Node::SaveOptions::FORMAT |
+        Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS
+      document.serialization_options = serialization_options
+      expect(document.serialization_options).to eq(serialization_options)
+      document.serialization_options = nil
+      expect(document.serialization_options).to eq(0)
+    end
     it "has a setting for keeping uninlinable styles" do
       expect(document.keep_uninlinable_css).to be true
       document.keep_uninlinable_css = false
@@ -69,6 +80,9 @@ module Roadie
       document.mode = :html
       expect(document.mode).to eq(:html)
+      document.mode = :xml
+      expect(document.mode).to eq(:xml)
     end
     it "does not allow unknown modes" do
@@ -90,8 +104,8 @@ module Roadie
     describe "transforming" do
       it "runs the before and after callbacks" do
         document = Document.new "<body></body>"
-        before = ->{}
-        after = ->{}
+        before = -> {}
+        after = -> {}
         document.before_transformation = before
         document.after_transformation = after
@@ -102,21 +116,6 @@ module Roadie
         document.transform
       end
-      # TODO: Remove on next major version.
-      it "works on callables that don't expect more than one argument" do
-        document = Document.new "<body></body>"
-        document.before_transformation = ->(first) { }
-        document.after_transformation = ->(first = nil) { }
-        expect { document.transform }.to_not raise_error
-        # It still supplies the second argument, if possible.
-        document.after_transformation = ->(first, second = nil) {
-          raise "Oops" unless second
-        }
-        expect { document.transform }.to_not raise_error
-      end
       context "in HTML mode" do
         it "does not escape curly braces" do
           document = Document.new "<body><a href='https://google.com/{{hello}}'>Hello</a></body>"
@@ -125,26 +124,41 @@ module Roadie
           expect(document.transform).to include("{{hello}}")
         end
       end
+      context "in XML mode" do
+        it "doesn't replace empty tags with self-closed ones" do
+          document = Document.new "<img src='https://google.com/image.png'></img>"
+          document.mode = :xml
+          expect(document.transform_partial).to end_with("</img>")
+        end
+        it "does not escape curly braces" do
+          document = Document.new "<a href='https://google.com/{{hello}}'>Hello</a>"
+          document.mode = :xml
+          expect(document.transform_partial).to include("{{hello}}")
+        end
+      end
     end
     describe "partial transforming" do
       it "runs the before and after callbacks" do
         document = Document.new "<p></p>"
-        before = ->{}
-        after = ->{}
+        before = -> {}
+        after = -> {}
         document.before_transformation = before
         document.after_transformation = after
         expect(before).to receive(:call).with(
           instance_of(Nokogiri::HTML::DocumentFragment),
-          document,
+          document
         ).ordered
         expect(Inliner).to receive(:new).ordered.and_return double.as_null_object
         expect(after).to receive(:call).with(
           instance_of(Nokogiri::HTML::DocumentFragment),
-          document,
+          document
         ).ordered
         document.transform_partial
@@ -158,6 +172,21 @@ module Roadie
           expect(document.transform_partial).to include("{{hello}}")
         end
       end
+      context "in XML mode" do
+        it "doesn't replace empty tags with self-closed ones" do
+          document = Document.new "<img src='https://google.com/image.png'></img>"
+          document.mode = :xml
+          expect(document.transform_partial).to end_with("</img>")
+        end
+        it "does not escape curly braces" do
+          document = Document.new "<a href='https://google.com/{{hello}}'>Hello</a>"
+          document.mode = :xml
+          expect(document.transform_partial).to include("{{hello}}")
+        end
+      end
     end
   end
@@ -178,11 +207,11 @@ module Roadie
       result = Nokogiri::HTML.parse document.transform
-      expect(result).to have_selector('html > head > title')
-      expect(result.at_css('title').text).to eq("Greetings")
+      expect(result).to have_selector("html > head > title")
+      expect(result.at_css("title").text).to eq("Greetings")
-      expect(result).to have_selector('html > body > p')
-      paragraph = result.at_css('p')
+      expect(result).to have_selector("html > body > p")
+      paragraph = result.at_css("p")
       expect(paragraph.text).to eq("Hello, world!")
       expect(paragraph.to_xml).to eq('<p style="color:green">Hello, world!</p>')
     end
@@ -201,7 +230,7 @@ module Roadie
       HTML
       document.asset_providers = TestProvider.new({
-        "/sample.css" => "p { color: red; text-align: right; }",
+        "/sample.css" => "p { color: red; text-align: right; }"
       })
       document.add_css "p { color: green; text-size: 2em; }"

data/spec/lib/roadie/filesystem_provider_spec.rb CHANGED Viewed

@@ -1,7 +1,8 @@
-# encoding: UTF-8
-require 'spec_helper'
-require 'roadie/rspec'
-require 'shared_examples/asset_provider'
+# frozen_string_literal: true
+require "spec_helper"
+require "roadie/rspec"
+require "shared_examples/asset_provider"
 module Roadie
   describe FilesystemProvider do
@@ -62,13 +63,11 @@ module Roadie
       end
       it "shows that the query string is ignored inside raised errors" do
-        begin
-          provider.find_stylesheet!("/foo.css?query-string")
-          fail "No error was raised"
-        rescue CssNotFound => error
-          expect(error.css_name).to eq("foo.css")
-          expect(error.to_s).to include("/foo.css?query-string")
-        end
+        provider.find_stylesheet!("/foo.css?query-string")
+        fail "No error was raised"
+      rescue CssNotFound => error
+        expect(error.css_name).to eq("foo.css")
+        expect(error.to_s).to include("/foo.css?query-string")
       end
     end
   end

data/spec/lib/roadie/inliner_spec.rb CHANGED Viewed

@@ -1,10 +1,13 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+require "spec_helper"
 module Roadie
   describe Inliner do
-    before { @stylesheet = "".freeze }
-    def use_css(css) @stylesheet = Stylesheet.new("example", css) end
+    before { @stylesheet = "" }
+    def use_css(css)
+      @stylesheet = Stylesheet.new("example", css)
+    end
     def rendering(html, stylesheet = @stylesheet)
       dom = Nokogiri::HTML.parse html
@@ -14,17 +17,17 @@ module Roadie
     describe "inlining styles" do
       it "inlines simple attributes" do
-        use_css 'p { color: green }'
-        expect(rendering('<p></p>')).to have_styling('color' => 'green')
+        use_css "p { color: green }"
+        expect(rendering("<p></p>")).to have_styling("color" => "green")
       end
       it "keeps multiple versions of the same property to support progressive enhancement" do
         # https://github.com/premailer/css_parser/issues/44
         pending "css_parser issue #44"
-        use_css 'p { color: #eee; color: rgba(255, 255, 255, 0.9); }'
-        expect(rendering('<p></p>')).to have_styling(
-          [['color', 'green'], ['color', 'rgba(255, 255, 255, 0.9)']]
+        use_css "p { color: #eee; color: rgba(255, 255, 255, 0.9); }"
+        expect(rendering("<p></p>")).to have_styling(
+          [["color", "green"], ["color", "rgba(255, 255, 255, 0.9)"]]
         )
       end
@@ -35,35 +38,35 @@ module Roadie
           .positive { color: green; }
         '
         expect(rendering('<p class="message positive"></p>')).to have_styling(
-          [['color', 'blue'], ['color', 'green']]
+          [["color", "blue"], ["color", "green"]]
         )
       end
       it "inlines browser-prefixed attributes" do
-        use_css 'p { -vendor-color: green }'
-        expect(rendering('<p></p>')).to have_styling('-vendor-color' => 'green')
+        use_css "p { -vendor-color: green }"
+        expect(rendering("<p></p>")).to have_styling("-vendor-color" => "green")
       end
       it "inlines CSS3 attributes" do
-        use_css 'p { border-radius: 2px; }'
-        expect(rendering('<p></p>')).to have_styling('border-radius' => '2px')
+        use_css "p { border-radius: 2px; }"
+        expect(rendering("<p></p>")).to have_styling("border-radius" => "2px")
       end
       it "keeps the order of the styles that are inlined" do
-        use_css 'h1 { padding: 2px; margin: 5px; }'
-        expect(rendering('<h1></h1>')).to have_styling([['padding', '2px'], ['margin', '5px']])
+        use_css "h1 { padding: 2px; margin: 5px; }"
+        expect(rendering("<h1></h1>")).to have_styling([["padding", "2px"], ["margin", "5px"]])
       end
       it "combines multiple selectors into one" do
         use_css 'p { color: green; }
                 .tip { float: right; }'
-        expect(rendering('<p class="tip"></p>')).to have_styling([['color', 'green'], ['float', 'right']])
+        expect(rendering('<p class="tip"></p>')).to have_styling([["color", "green"], ["float", "right"]])
       end
       it "uses the attributes with the highest specificity when conflicts arises" do
         use_css ".safe { color: green; }
                 p { color: red; }"
-        expect(rendering('<p class="safe"></p>')).to have_styling([['color', 'red'], ['color', 'green']])
+        expect(rendering('<p class="safe"></p>')).to have_styling([["color", "red"], ["color", "green"]])
       end
       it "sorts styles by specificity order" do
@@ -81,10 +84,10 @@ module Roadie
       end
       it "supports multiple selectors for the same rules" do
-        use_css 'p, a { color: green; }'
-        rendering('<p></p><a></a>').tap do |document|
-          expect(document).to have_styling('color' => 'green').at_selector('p')
-          expect(document).to have_styling('color' => 'green').at_selector('a')
+        use_css "p, a { color: green; }"
+        rendering("<p></p><a></a>").tap do |document|
+          expect(document).to have_styling("color" => "green").at_selector("p")
+          expect(document).to have_styling("color" => "green").at_selector("a")
         end
       end
@@ -92,22 +95,22 @@ module Roadie
         use_css "a { text-decoration: underline !important; }
                  a.hard-to-spot { text-decoration: none; }"
         expect(rendering('<a class="hard-to-spot"></a>')).to have_styling([
-          ['text-decoration', 'none'], ['text-decoration', 'underline !important']
+          ["text-decoration", "none"], ["text-decoration", "underline !important"]
         ])
       end
       it "combines with already present inline styles" do
         use_css "p { color: green }"
-        expect(rendering('<p style="font-size: 1.1em"></p>')).to have_styling([['color', 'green'], ['font-size', '1.1em']])
+        expect(rendering('<p style="font-size: 1.1em"></p>')).to have_styling([["color", "green"], ["font-size", "1.1em"]])
       end
       it "does not override inline styles" do
         use_css "p { text-transform: uppercase; color: red }"
         # The two color properties are kept to make css fallbacks work correctly
         expect(rendering('<p style="color: green"></p>')).to have_styling([
-          ['text-transform', 'uppercase'],
-          ['color', 'red'],
-          ['color', 'green'],
+          ["text-transform", "uppercase"],
+          ["color", "red"],
+          ["color", "green"]
         ])
       end
@@ -122,7 +125,7 @@ module Roadie
           p.active { width: 100%; }
         "
-        expect(rendering('<p class="active"></p>')).to have_styling('width' => '100%')
+        expect(rendering('<p class="active"></p>')).to have_styling("width" => "100%")
       end
       it "does not crash on any pseudo element selectors" do
@@ -130,7 +133,7 @@ module Roadie
           p.some-element { width: 100%; }
           p::some-element { color: red; }
         "
-        expect(rendering('<p class="some-element"></p>')).to have_styling('width' => '100%')
+        expect(rendering('<p class="some-element"></p>')).to have_styling("width" => "100%")
       end
       it "warns on selectors that crash Nokogiri" do
@@ -139,7 +142,7 @@ module Roadie
         stylesheet = Stylesheet.new "foo.css", "p[%^=foo] { color: red; }"
         inliner = Inliner.new([stylesheet], dom)
         expect(Utils).to receive(:warn).with(
-          %{Cannot inline "p[%^=foo]" from "foo.css" stylesheet. If this is valid CSS, please report a bug.}
+          %(Cannot inline "p[%^=foo]" from "foo.css" stylesheet. If this is valid CSS, please report a bug.)
         )
         inliner.inline
       end
@@ -151,8 +154,8 @@ module Roadie
         "
         result = rendering("<p></p> <p></p>")
-        expect(result).to have_styling([['color', 'red']]).at_selector('p:first')
-        expect(result).to have_styling([['color', 'red'], ['color', 'green']]).at_selector('p:last')
+        expect(result).to have_styling([["color", "red"]]).at_selector("p:first")
+        expect(result).to have_styling([["color", "red"], ["color", "green"]]).at_selector("p:last")
       end
       context "with uninlinable selectors" do
@@ -161,7 +164,7 @@ module Roadie
         end
         it "puts them in a new <style> element in the <head>" do
-          use_css 'a:hover { color: red; }'
+          use_css "a:hover { color: red; }"
           result = rendering("
             <html>
               <head></head>
@@ -173,7 +176,7 @@ module Roadie
         end
         it "puts them in <head> on unexpected inlining problems" do
-          use_css 'p:some-future-thing { color: red; }'
+          use_css "p:some-future-thing { color: red; }"
           result = rendering("
             <html>
               <head></head>
@@ -197,15 +200,9 @@ module Roadie
           }'
           use_css css
-          result = rendering('<p></p>')
+          result = rendering("<p></p>")
           expect(result).to have_styling([]).at_selector("p")
-          # css_parser actually sees an empty @keyframes on JRuby, and nothing
-          # on the others
-          if (style_element = result.at_css("head > style"))
-            expect(style_element.text).to_not include "background-position"
-          end
         end
         it "ignores them if told not to keep them" do
@@ -224,14 +221,14 @@ module Roadie
         end
         it "puts the <style> element at the root when told so" do
-          stylesheet = use_css 'a:hover { color: red; }'
+          stylesheet = use_css "a:hover { color: red; }"
           dom = Nokogiri::HTML.fragment("
             <a></a>
           ")
           Inliner.new([stylesheet], dom).inline(
             keep_uninlinable_css: true,
-            keep_uninlinable_in: :root,
+            keep_uninlinable_in: :root
           )
           expect(dom).to have_xpath("./a")
@@ -239,7 +236,7 @@ module Roadie
         end
         it "raises error when told to save styles in an unknown place" do
-          stylesheet = use_css 'a:hover { color: red; }'
+          stylesheet = use_css "a:hover { color: red; }"
           dom = Nokogiri::HTML.fragment("
             <a></a>
           ")
@@ -248,7 +245,7 @@ module Roadie
           expect {
             inliner.inline(
               keep_uninlinable_css: true,
-              keep_uninlinable_in: :unknown_place,
+              keep_uninlinable_in: :unknown_place
             )
           }.to raise_error(ArgumentError, /:unknown_place/)
         end

data/spec/lib/roadie/markup_improver_spec.rb CHANGED Viewed

@@ -1,5 +1,6 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+require "spec_helper"
 module Roadie
   describe MarkupImprover do
@@ -9,22 +10,14 @@ module Roadie
       dom
     end
-    # JRuby up to at least 1.6.0 has a bug where the doctype of a document cannot be changed.
-    # See https://github.com/sparklemotion/nokogiri/issues/984
-    def pending_for_buggy_jruby
-      # No reason to check for version yet since no existing version has a fix.
-      skip "Pending until Nokogiri issue #984 is fixed and released" if defined?(JRuby)
-    end
     describe "automatic doctype" do
       it "inserts a HTML5 doctype if no doctype is present" do
-        pending_for_buggy_jruby
         expect(improve("<html></html>").internal_subset.to_xml).to eq("<!DOCTYPE html>")
       end
       it "does not insert duplicate doctypes" do
-        html = improve('<!DOCTYPE html><html><body></body></html>').to_html
-        expect(html.scan('DOCTYPE').size).to eq(1)
+        html = improve("<!DOCTYPE html><html><body></body></html>").to_html
+        expect(html.scan("DOCTYPE").size).to eq(1)
       end
       it "leaves other doctypes alone" do
@@ -38,35 +31,35 @@ module Roadie
       it "inserts a <html> element as the root" do
         expect(improve("")).to have_selector("html")
         expect(improve("<h1>Hey!</h1>")).to have_selector("html h1")
-        expect(improve("<html></html>").css('html').size).to eq(1)
+        expect(improve("<html></html>").css("html").size).to eq(1)
       end
       it "inserts <head> if not present" do
-        expect(improve('<html><body></body></html>')).to have_selector('html > head + body')
-        expect(improve('<html></html>')).to have_selector('html > head')
-        expect(improve('Foo')).to have_selector('html > head')
-        expect(improve('<html><head></head></html>').css('head').size).to eq(1)
+        expect(improve("<html><body></body></html>")).to have_selector("html > head + body")
+        expect(improve("<html></html>")).to have_selector("html > head")
+        expect(improve("Foo")).to have_selector("html > head")
+        expect(improve("<html><head></head></html>").css("head").size).to eq(1)
       end
       it "inserts <body> if not present" do
-        expect(improve('<h1>Hey!</h1>')).to have_selector('html > body > h1')
-        expect(improve('<html><h1>Hey!</h1></html>')).to have_selector('html > body > h1')
-        expect(improve('<html><body><h1>Hey!</h1></body></html>').css('body').size).to eq(1)
+        expect(improve("<h1>Hey!</h1>")).to have_selector("html > body > h1")
+        expect(improve("<html><h1>Hey!</h1></html>")).to have_selector("html > body > h1")
+        expect(improve("<html><body><h1>Hey!</h1></body></html>").css("body").size).to eq(1)
       end
     end
     describe "charset declaration" do
       it "is inserted if missing" do
-        dom = improve('<html><head></head><body></body></html>')
+        dom = improve("<html><head></head><body></body></html>")
-        expect(dom).to have_selector('head meta')
-        meta = dom.at_css('head meta')
-        expect(meta['http-equiv']).to eq('Content-Type')
-        expect(meta['content']).to eq('text/html; charset=UTF-8')
+        expect(dom).to have_selector("head meta")
+        meta = dom.at_css("head meta")
+        expect(meta["http-equiv"]).to eq("Content-Type")
+        expect(meta["content"]).to eq("text/html; charset=UTF-8")
       end
       it "is left alone when predefined" do
-        expect(improve(<<-HTML).xpath('//meta')).to have(1).item
+        expect(improve(<<-HTML).xpath("//meta")).to have(1).item
         <html>
           <head>
             <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />

data/spec/lib/roadie/net_http_provider_spec.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-require 'spec_helper'
-require 'roadie/rspec'
-require 'shared_examples/asset_provider'
+# frozen_string_literal: true
+require "spec_helper"
+require "roadie/rspec"
+require "shared_examples/asset_provider"
 module Roadie
   describe NetHttpProvider do
@@ -10,7 +12,7 @@ module Roadie
       WebMock.allow_net_connect!
     end
-    url = "http://example.com/style.css".freeze
+    url = "http://example.com/style.css"
     it_behaves_like(
       "roadie asset provider",
@@ -18,13 +20,13 @@ module Roadie
       invalid_name: "http://example.com/red.css"
     ) do
       before do
-        stub_request(:get, "http://example.com/green.css").and_return(body: "p { color: green; }")
+        stub_request(:get, "http://example.com/green.css").and_return(body: +"p { color: green; }")
         stub_request(:get, "http://example.com/red.css").and_return(status: 404, body: "Not here!")
       end
     end
     it "can download over HTTPS" do
-      stub_request(:get, "https://example.com/style.css").and_return(body: "p { color: green; }")
+      stub_request(:get, "https://example.com/style.css").and_return(body: +"p { color: green; }")
       expect {
         NetHttpProvider.new.find_stylesheet!("https://example.com/style.css")
       }.to_not raise_error
@@ -37,7 +39,7 @@ module Roadie
       # asset inlining, but the scheme-less URL implies that there should exist
       # both a HTTP and a HTTPS endpoint. Let's take the secure one in that
       # case!
-      stub_request(:get, "https://example.com/style.css").and_return(body: "p { color: green; }")
+      stub_request(:get, "https://example.com/style.css").and_return(body: +"p { color: green; }")
       expect {
         NetHttpProvider.new.find_stylesheet!("//example.com/style.css")
       }.to_not raise_error
@@ -48,8 +50,8 @@ module Roadie
       # (US-ASCII). The headers will indicate what charset the client should
       # use when trying to make sense of these bytes.
       stub_request(:get, url).and_return(
-        body: %(p::before { content: "l\xF6ve" }).force_encoding("US-ASCII"),
-        headers: {"Content-Type" => "text/css;charset=ISO-8859-1"},
+        body: (+%(p::before { content: "l\xF6ve" })).force_encoding("US-ASCII"),
+        headers: {"Content-Type" => "text/css;charset=ISO-8859-1"}
       )
       # Seems like CssParser strips out the non-ascii character for some
@@ -64,8 +66,8 @@ module Roadie
     it "assumes UTF-8 encoding if server headers do not specify a charset" do
       stub_request(:get, url).and_return(
-        body: %(p::before { content: "Åh nej" }).force_encoding("US-ASCII"),
-        headers: {"Content-Type" => "text/css"},
+        body: (+%(p::before { content: "Åh nej" })).force_encoding("US-ASCII"),
+        headers: {"Content-Type" => "text/css"}
       )
       # Seems like CssParser strips out the non-ascii characters for some
@@ -117,10 +119,10 @@ module Roadie
         provider = NetHttpProvider.new(whitelist: ["whitelisted.example.com"])
         whitelisted_url = "http://whitelisted.example.com/style.css"
-        other_url       = "http://www.example.com/style.css"
+        other_url = "http://www.example.com/style.css"
-        whitelisted_request = stub_request(:get, whitelisted_url).and_return(body: "x")
-        other_request       = stub_request(:get, other_url).and_return(body: "x")
+        whitelisted_request = stub_request(:get, whitelisted_url).and_return(body: +"x")
+        other_request = stub_request(:get, other_url).and_return(body: +"x")
         expect(provider.find_stylesheet(other_url)).to be_nil
         expect {

data/spec/lib/roadie/null_provider_spec.rb CHANGED Viewed

@@ -1,6 +1,7 @@
-# encoding: UTF-8
-require 'spec_helper'
-require 'shared_examples/asset_provider'
+# frozen_string_literal: true
+require "spec_helper"
+require "shared_examples/asset_provider"
 module Roadie
   describe NullProvider do

data/spec/lib/roadie/null_url_rewriter_spec.rb CHANGED Viewed

@@ -1,6 +1,7 @@
-# encoding: UTF-8
-require 'spec_helper'
-require 'shared_examples/url_rewriter'
+# frozen_string_literal: true
+require "spec_helper"
+require "shared_examples/url_rewriter"
 module Roadie
   describe NullUrlRewriter do