roadie 3.5.1 → 5.0.1

data/spec/lib/roadie/filesystem_provider_spec.rb

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

data/spec/lib/roadie/path_rewriter_provider_spec.rb

@@ -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 PathRewriterProvider do
@@ -8,7 +10,7 @@ module Roadie
 
     subject(:provider) do
       PathRewriterProvider.new(upstream) do |path|
-        path.gsub('well', 'good')
+        path.gsub("well", "good")
       end
     end
 

data/spec/lib/roadie/provider_list_spec.rb

@@ -1,6 +1,7 @@
-# encoding: UTF-8
-require 'spec_helper'
-require 'roadie/rspec'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "roadie/rspec"
 
 module Roadie
   describe ProviderList do
@@ -68,36 +69,40 @@ module Roadie
       provider = double("Provider", to_s: "Some provider")
       sublist = ProviderList.new([provider, provider])
       list = ProviderList.new([provider, sublist, provider])
-      expect(list.to_s).to eql(
-        "ProviderList: [\n" +
-          "\tSome provider,\n" +
-          "\tProviderList: [\n" +
-            "\t\tSome provider,\n" +
-            "\t\tSome provider\n" +
-          "\t],\n" +
-          "\tSome provider\n" +
-        "]"
-      )
+      expect(list.to_s).to eq(<<~TEXT)
+        ProviderList: [
+        \tSome provider,
+        \tProviderList: [
+        \t\tSome provider,
+        \t\tSome provider
+        \t],
+        \tSome provider
+        ]
+      TEXT
     end
 
     it "raises a readable error message" do
       provider = double("Provider", to_s: "Some provider")
       allow(provider).to receive(:find_stylesheet!).and_raise(
-        CssNotFound.new("style.css", "I tripped", provider)
+        CssNotFound.new(
+          css_name: "style.css",
+          message: "I tripped",
+          provider: provider
+        )
       )
 
       sublist = ProviderList.new([provider, provider])
       list = ProviderList.new([provider, sublist, provider])
 
       expect { list.find_stylesheet!("style.css") }.to raise_error { |error|
-        expect(error.message).to eq(
-          "Could not find stylesheet \"style.css\": All providers failed\n" +
-          "Used providers:\n" +
-            "\tSome provider: I tripped\n" +
-            "\tSome provider: I tripped\n" +
-            "\tSome provider: I tripped\n" +
-            "\tSome provider: I tripped\n"
-        )
+        expect(error.message).to eq(<<~TEXT)
+          Could not find stylesheet "style.css": All providers failed
+          Used providers:
+          \tSome provider: I tripped
+          \tSome provider: I tripped
+          \tSome provider: I tripped
+          \tSome provider: I tripped
+        TEXT
       }
     end
 

data/spec/lib/roadie/selector_spec.rb

@@ -1,5 +1,6 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Roadie
   describe Selector do
@@ -26,19 +27,20 @@ module Roadie
         p:enabled
         p:disabled
         p:checked
+        p:host
       ].each do |bad_selector|
         expect(Selector.new(bad_selector)).not_to be_inlinable
       end
 
-      expect(Selector.new('p.active')).to be_inlinable
+      expect(Selector.new("p.active")).to be_inlinable
     end
 
     it "cannot be inlined when containing pseudo elements" do
-      expect(Selector.new('p::some-element')).not_to be_inlinable
+      expect(Selector.new("p::some-element")).not_to be_inlinable
     end
 
     it "cannot be inlined when selector is an at-rule" do
-      expect(Selector.new('@keyframes progress-bar-stripes')).not_to be_inlinable
+      expect(Selector.new("@keyframes progress-bar-stripes")).not_to be_inlinable
     end
 
     it "has a calculated specificity" do

data/spec/lib/roadie/style_attribute_builder_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Roadie
   describe StyleAttributeBuilder do
@@ -15,8 +17,8 @@ module Roadie
     it "preserves the order of added attributes with the same specificity" do
       builder = StyleAttributeBuilder.new
 
-      builder << StyleProperty.new("color", "pink",  false, 50)
-      builder << StyleProperty.new("color", "red",   false, 50)
+      builder << StyleProperty.new("color", "pink", false, 50)
+      builder << StyleProperty.new("color", "red", false, 50)
       builder << StyleProperty.new("color", "green", false, 50)
 
       # We need one different element to trigger the problem with Ruby's
@@ -29,9 +31,9 @@ module Roadie
     it "removes duplicate properties" do
       builder = StyleAttributeBuilder.new
 
-      builder << StyleProperty.new("color", "pink",  false, 10)
+      builder << StyleProperty.new("color", "pink", false, 10)
       builder << StyleProperty.new("color", "green", false, 20)
-      builder << StyleProperty.new("color", "pink",  false, 50)
+      builder << StyleProperty.new("color", "pink", false, 50)
 
       expect(builder.attribute_string).to eq "color:green;color:pink"
     end

data/spec/lib/roadie/style_block_spec.rb

@@ -1,5 +1,6 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Roadie
   describe StyleBlock do