roadie 3.4.0 → 5.0.0

data/spec/lib/roadie/style_property_spec.rb

@@ -1,11 +1,13 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Roadie
   describe StyleProperty do
     it "is initialized with a property, value, if it is marked as important, and the specificity" do
-      StyleProperty.new('color', 'green', true, 45).tap do |declaration|
-        expect(declaration.property).to eq('color')
-        expect(declaration.value).to eq('green')
+      StyleProperty.new("color", "green", true, 45).tap do |declaration|
+        expect(declaration.property).to eq("color")
+        expect(declaration.value).to eq("green")
         expect(declaration).to be_important
         expect(declaration.specificity).to eq(45)
       end
@@ -13,18 +15,18 @@ module Roadie
 
     describe "string representation" do
       it "is the property and the value joined with a colon" do
-        expect(StyleProperty.new('color', 'green', false, 1).to_s).to eq('color:green')
-        expect(StyleProperty.new('font-size', '1.1em', false, 1).to_s).to eq('font-size:1.1em')
+        expect(StyleProperty.new("color", "green", false, 1).to_s).to eq("color:green")
+        expect(StyleProperty.new("font-size", "1.1em", false, 1).to_s).to eq("font-size:1.1em")
       end
 
       it "contains the !important flag when set" do
-        expect(StyleProperty.new('color', 'green', true, 1).to_s).to eq('color:green !important')
+        expect(StyleProperty.new("color", "green", true, 1).to_s).to eq("color:green !important")
       end
     end
 
     describe "comparing" do
       def declaration(specificity, important = false)
-        StyleProperty.new('color', 'green', important, specificity)
+        StyleProperty.new("color", "green", important, specificity)
       end
 
       it "compares on specificity" do

data/spec/lib/roadie/stylesheet_spec.rb

@@ -1,5 +1,6 @@
-# encoding: UTF-8
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Roadie
   describe Stylesheet do
@@ -17,28 +18,10 @@ module Roadie
       expect(stylesheet.blocks.map(&:to_s)).to eq([
         "body{color:green !important;font-size:200%}",
         "a{color:red}",
-        "i{color:red}",
+        "i{color:red}"
       ])
     end
 
-    if VERSION < "4.0"
-      it "can iterate all inlinable blocks" do
-        inlinable = double(inlinable?: true, selector: "good", properties: "props")
-        bad = double(inlinable?: false, selector: "bad", properties: "props")
-
-        stylesheet = Stylesheet.new("example.css", "")
-        allow(stylesheet).to receive_messages blocks: [bad, inlinable, bad]
-
-        expect(stylesheet.each_inlinable_block.to_a).to eq([
-          ["good", "props"],
-        ])
-      end
-    else
-      it "should no longer have #each_inlinable_block" do
-        fail "Remove #each_inlinable_block"
-      end
-    end
-
     it "has a string representation of the contents" do
       stylesheet = Stylesheet.new("example.css", "body { color: green;}a{ color: red; font-size: small }")
       expect(stylesheet.to_s).to eq("body{color:green}\na{color:red;font-size:small}")

data/spec/lib/roadie/test_provider_spec.rb

@@ -1,5 +1,7 @@
-require 'spec_helper'
-require 'roadie/rspec'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "roadie/rspec"
 
 describe TestProvider do
   subject(:provider) { TestProvider.new }
@@ -11,7 +13,7 @@ describe TestProvider do
   it "finds styles from a predefined hash" do
     provider = TestProvider.new({
       "foo.css" => "a { color: red; }",
-      "bar.css" => "body { color: green; }",
+      "bar.css" => "body { color: green; }"
     })
     expect(provider.find_stylesheet("foo.css").to_s).not_to include("body")
     expect(provider.find_stylesheet("bar.css").to_s).to include("body")
@@ -21,7 +23,7 @@ describe TestProvider do
   it "can have a default for missing entries" do
     provider = TestProvider.new({
       "foo.css" => "a { color: red; }",
-      :default  => "body { color: green; }",
+      :default => "body { color: green; }"
     })
     expect(provider.find_stylesheet("foo.css").to_s).not_to include("body")
     expect(provider.find_stylesheet("bar.css").to_s).to include("body")

data/spec/lib/roadie/url_generator_spec.rb

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

data/spec/lib/roadie/url_rewriter_spec.rb

@@ -1,5 +1,7 @@
-require 'spec_helper'
-require 'shared_examples/url_rewriter'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "shared_examples/url_rewriter"
 
 module Roadie
   describe UrlRewriter do
@@ -9,7 +11,9 @@ module Roadie
     it_behaves_like "url rewriter"
 
     describe "transforming DOM trees" do
-      def dom_document(html); Nokogiri::HTML.parse html; end
+      def dom_document(html)
+        Nokogiri::HTML.parse html
+      end
 
       it "rewrites all a[href]" do
         expect(generator).to receive(:generate_url).with("some/path").and_return "http://foo.com/"
@@ -71,9 +75,8 @@ module Roadie
       it "rewrites all url() directives" do
         expect(generator).to receive(:generate_url).with("some/path.jpg").and_return "http://foo.com/image.jpg"
         css = "body { background: top url(some/path.jpg) #eee; }"
-        expect {
-          rewriter.transform_css css
-        }.to change { css }.to "body { background: top url(http://foo.com/image.jpg) #eee; }"
+        transformed_css = rewriter.transform_css css
+        expect(transformed_css).to eq "body { background: top url(http://foo.com/image.jpg) #eee; }"
       end
 
       it "correctly identifies URLs with single quotes" do
@@ -88,7 +91,7 @@ module Roadie
 
       it "correctly identifies URLs with parenthesis inside them" do
         expect(generator).to receive(:generate_url).with("images/map_(large_(extra)).png").and_return "x"
-        rewriter.transform_css 'url(images/map_(large_(extra)).png)'
+        rewriter.transform_css "url(images/map_(large_(extra)).png)"
       end
     end
   end

data/spec/lib/roadie/utils_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 module Roadie

data/spec/shared_examples/asset_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples_for "asset provider role" do
   it "responds to #find_stylesheet" do
     expect(subject).to respond_to(:find_stylesheet)

data/spec/shared_examples/url_rewriter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples_for "url rewriter" do
   it "is constructed with a generator" do
     generator = double "URL generator"
@@ -6,7 +8,7 @@ shared_examples_for "url rewriter" do
     }.to_not raise_error
   end
 
-  it "has a #transform_dom(dom) method that returns nil" do
+  it "has a #transform_dom(dom) method that returns the modified string" do
     expect(subject).to respond_to(:transform_dom)
     expect(subject.method(:transform_dom).arity).to eq(1)
 
@@ -14,10 +16,10 @@ shared_examples_for "url rewriter" do
     expect(subject.transform_dom(dom)).to be_nil
   end
 
-  it "has a #transform_css(css) method that returns nil" do
+  it "has a #transform_css(css) method that returns the modified string" do
     expect(subject).to respond_to(:transform_css)
     expect(subject.method(:transform_css).arity).to eq(1)
 
-    expect(subject.transform_css("")).to be_nil
+    expect(subject.transform_css("")).to eq("")
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,21 @@
-require 'rspec/collection_matchers'
-require 'webmock/rspec'
+# frozen_string_literal: true
 
-if ENV['CI']
-  require 'simplecov'
+require "rspec/collection_matchers"
+require "webmock/rspec"
+
+if ENV["CI"]
+  require "simplecov"
   SimpleCov.start
 
-  require 'codecov'
+  require "codecov"
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-$: << File.dirname(__FILE__) + '/../lib'
-require 'roadie'
+$: << File.dirname(__FILE__) + "/../lib"
+require "roadie"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 end
 
-Dir['./spec/support/**/*.rb'].each { |file| require file }
+Dir["./spec/support/**/*.rb"].sort.each { |file| require file }

data/spec/support/have_attribute_matcher.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :have_attribute do |attribute|
-  @selector = 'body > *:first'
+  @selector = "body > *:first"
 
   chain :at_selector do |selector|
     @selector = selector
@@ -25,4 +27,3 @@ RSpec::Matchers.define :have_attribute do |attribute|
     node && node[attribute_name]
   end
 end
-

data/spec/support/have_node_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :have_node do |selector|
   chain(:with_attributes) { |attributes| @attributes = attributes }
   match do |document|
@@ -9,11 +11,11 @@ RSpec::Matchers.define :have_node do |selector|
     end
   end
 
-  failure_message { "expected document to #{name_to_sentence}#{expected_to_sentence}"}
-  failure_message_when_negated { "expected document to not #{name_to_sentence}#{expected_to_sentence}"}
+  failure_message { "expected document to #{name_to_sentence}#{expected_to_sentence}" }
+  failure_message_when_negated { "expected document to not #{name_to_sentence}#{expected_to_sentence}" }
 
   def match_attributes(node_attributes)
-    attributes = Hash[node_attributes.map { |name, attribute| [name, attribute.value] }]
+    attributes = node_attributes.map { |name, attribute| [name, attribute.value] }.to_h
     @attributes == attributes
   end
 end

data/spec/support/have_selector_matcher.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :have_selector do |selector|
   match { |document| !document.css(selector).empty? }
-  failure_message { "expected document to have selector #{selector.inspect}"}
-  failure_message_when_negated { "expected document to not have selector #{selector.inspect}"}
+  failure_message { "expected document to have selector #{selector.inspect}" }
+  failure_message_when_negated { "expected document to not have selector #{selector.inspect}" }
 end
-

data/spec/support/have_styling_matcher.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :have_styling do |rules|
   normalized_rules = StylingExpectation.new(rules)
 
   chain(:at_selector) { |selector| @selector = selector }
   match { |document|
-    @selector ||= 'body > *:first'
+    @selector ||= "body > *:first"
     normalized_rules == styles_at_selector(document)
   }
 
@@ -21,7 +23,7 @@ RSpec::Matchers.define :have_styling do |rules|
 
   def styles_at_selector(document)
     expect(document).to have_selector(@selector)
-    StylingExpectation.new document.at_css(@selector)['style']
+    StylingExpectation.new document.at_css(@selector)["style"]
   end
 end
 
@@ -40,23 +42,22 @@ class StylingExpectation
     rules == other.rules
   end
 
-  def to_s() rules.to_s end
+  def to_s
+    rules.to_s
+  end
 
   protected
+
   attr_reader :rules
 
   private
+
   def parse_rules(css)
-    css.split(';').map { |property| parse_property(property) }
+    css.split(";").map { |property| parse_property(property) }
   end
 
   def parse_property(property)
-    rule, value = property.split(':', 2).map(&:strip)
-    [rule, normalize_quotes(value)]
-  end
-
-  # JRuby's Nokogiri encodes quotes
-  def normalize_quotes(string)
-    string.gsub '%22', '"'
+    rule, value = property.split(":", 2).map(&:strip)
+    [rule, value]
   end
 end

data/spec/support/have_xpath_matcher.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :have_xpath do |xpath|
   match { |document| !document.xpath(xpath).empty? }
-  failure_message { "expected document to have xpath #{xpath.inspect}"}
-  failure_message_when_negated { "expected document to not have xpath #{xpath.inspect}"}
+  failure_message { "expected document to have xpath #{xpath.inspect}" }
+  failure_message_when_negated { "expected document to not have xpath #{xpath.inspect}" }
 end
-

data/spec/support/test_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestProvider
   include Roadie::AssetProvider
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Magnus Bergmark
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +105,10 @@ extra_rdoc_files:
 - Changelog.md
 files:
 - ".autotest"
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".solargraph.yml"
 - ".yardopts"
 - Changelog.md
 - Gemfile
@@ -166,7 +182,7 @@ homepage: http://github.com/Mange/roadie
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,16 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Making HTML emails comfortable for the Ruby rockstars
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - jruby
-  - rbx
-before_install:
-  - gem update --system # Need for Ruby 2.5.0. https://github.com/travis-ci/travis-ci/issues/8978
-  - gem install bundler
-matrix:
-  allow_failures:
-    # Rubinius and JRuby have a lot of trouble and no large following, so I'm going to
-    # allow failures on it until it gets more stable on Travis / Real Life(tm).
-    # Let me know if you need it. Patches are welcome!
-    - rvm: jruby
-    - rvm: rbx
-  fast_finish: true
-cache: bundler
-script: "rake"