roadie 5.2.1 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf21805d618315993a32ce718e78c756c82627d3139c5ad9823e539d183c244f
-  data.tar.gz: 2d440a7a8f27d4ab08b4f5795222b329863816f4c55c593b217488ef0b97b5b0
+  metadata.gz: bf09ebd39e5df6de904dd29d3d2962713d3528bfa971e159dace62168992a934
+  data.tar.gz: 2cc21635c9109f1160562d61ef259addb80c1c7174568bbff742ec66b6906065
 SHA512:
-  metadata.gz: 2c411ae8897ebbcf2e57dea6c1dd265c8d4c6e5ed43ca9dc20b085cb3cac084e7e92189ae2f621609a406621e7ebea4676d13d6ef38dde88394bd004a57d836e
-  data.tar.gz: cedc2284f27ab48522989550440235af8c39c86ff4d6f437d722b971d4356f36db674a116c3427d71374a7075d358bb478c759f5178125e6ae53e0c38072892a
+  metadata.gz: dbe53da038fd12980969a1c9f5aefc2d42cc311e71e535ef54d59ed1fa176ced6a727e1f3949883a1ffeb17d55a0677eb9c4c440a5ac4df1c9d41b72964f1df4
+  data.tar.gz: 9b8da1c24184823d9fbb4609d349c596609c21315a2f7627c8d7183e1dc59a1c6747c3a37be3be0635107be09771429b60c3360f3a0fe10242ef9cf70cf10805

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "16:00"

data/.github/workflows/main.yml

@@ -1,34 +1,52 @@
 name: Main
 on:
+  schedule:
+    # Run on the first day of every month
+    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
+    - cron: '0 0 1 * *'
+  # Allow running manually
+  # For more details: https://docs.github.com/en/actions/using-workflows/manually-running-a-workflow?tool=webui
+  workflow_dispatch:
   push:
     branches:
       - main
       - master
+    paths-ignore:
+      - '**.md'
 
   pull_request:
     types: [opened, synchronize, reopened]
 
 jobs:
   base:
-    name: Ruby ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.css_parser.name }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - "2.7"
-          - "3.0"
-          - "3.1"
-          - "3.2"
+          - "3.3"
+          - "3.4"
+          - "4.0"
+        css_parser:
+          - gemfile: gemfiles/css_parser_1.gemfile
+            name: css_parser 1.x
+          - gemfile: gemfiles/css_parser_2.gemfile
+            name: css_parser 2.x
+          - gemfile: gemfiles/css_parser_3.gemfile
+            name: css_parser 3.x
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.css_parser.gemfile }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       # This setup is not compatible with the way Travis CI was
       # setup, so the cache will only work for the root folder.
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
@@ -36,20 +54,20 @@ jobs:
       - name: Rake
         run: bundle exec rake
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
 
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       # This setup is not compatible with the way Travis CI was
       # setup, so the cache will only work for the root folder.
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.4"
           bundler-cache: true
 
       - name: standardrb

data/.gitignore

@@ -5,6 +5,7 @@
 .ruby-version
 
 Gemfile.lock
+gemfiles/*.lock
 doc
 tmp
 pkg

data/Changelog.md

@@ -1,10 +1,25 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v5.2.1...master)
+[full changelog](https://github.com/Mange/roadie/compare/v5.3.1...master)
 
-Nothing yet.
+### 5.3.1
 
-### dev
+[full changelog](https://github.com/Mange/roadie/compare/v5.3.0...v5.3.1)
+
+- Add support for `css_parser` 3.x.
+
+### 5.3.0
+
+[full changelog](https://github.com/Mange/roadie/compare/v5.2.1...v5.3.0)
+
+All listed changes by [Andrei Andriichuk (@faraquet)](https://github.com/faraquet).
+
+- Accept `css_parser` 2.x.
+- Add CI coverage for both `css_parser` 1.x and 2.x.
+- Drop support for Ruby versions before 3.3.
+- Add Ruby 4.0 to the CI matrix.
+
+### 5.2.1
 
 [full changelog](https://github.com/Mange/roadie/compare/v5.2.0...v5.2.1)
 
@@ -73,7 +88,6 @@ Nothing yet.
 [full changelog](https://github.com/Mange/roadie/compare/v3.3.0...v3.4.0)
 
 - Enhancements
-
   - Better support for media queries - [BroiSatse (Stanislaw
     Klajn)](https://github.com/BroiSatse) and [jeznag (Jeremy
     Nagel)](https://github.com/jeznag) (#157).
@@ -216,7 +230,6 @@ Nothing yet.
 [full changelog](https://github.com/Mange/roadie/compare/v3.0.0.pre1...v3.0.0)
 
 - Enhancements:
-
   - `Roadie::ProviderList` responds to `#empty?` and `#last`
   - `Roadie::FilesystemProvider` ignores query string in filename.
 

data/Gemfile

@@ -4,7 +4,8 @@ source "https://rubygems.org"
 gemspec
 
 # Added here so it does not show up on the Gemspec; I only want it for CI builds
-gem "codecov", group: :test, require: false
+gem "simplecov", group: :test, require: false
+gem "simplecov-cobertura", group: :test, require: false
 # Not actually required to run the tests for the gem, but a real convenience
 # for local development.
 gem "standard", group: [:test, :development], require: false

data/README.md

@@ -448,12 +448,8 @@ Partial documents does not have a `<!DOCTYPE>`.
 Build Status
 ------------
 
-Tested with Github CI using:
-
-* MRI 2.7
-* MRI 3.0
-* MRI 3.1
-* MRI 3.2
+Tested with Github CI using:  
+See [Workflow Matrix](/.github/workflows/main.yml)
 
 Let me know if you want any other runtime supported officially.
 

data/gemfiles/css_parser_1.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+eval_gemfile "../Gemfile"
+
+gem "css_parser", "~> 1.4"

data/gemfiles/css_parser_2.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+eval_gemfile "../Gemfile"
+
+gem "css_parser", "~> 2.0"

data/gemfiles/css_parser_3.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+eval_gemfile "../Gemfile"
+
+gem "css_parser", "~> 3.0"

data/lib/roadie/asset_scanner.rb

@@ -59,6 +59,7 @@ module Roadie
       #       call in #find_css.
       "link[rel=stylesheet][href]:not([data-roadie-ignore])"
     ).freeze
+    private_constant :STYLE_ELEMENT_QUERY
 
     # Cleans out stupid CDATA and/or HTML comments from the style text
     # TinyMCE causes this, allegedly
@@ -71,6 +72,7 @@ module Roadie
         (\]\]>)
       $)
     /x.freeze
+    private_constant :CLEANING_MATCHER
 
     def read_stylesheet(element)
       if element.name == "style"

data/lib/roadie/inliner.rb

@@ -167,7 +167,7 @@ module Roadie
     # @return {Array<String>}
     def styles_in_shared_media_queries(style_blocks)
       style_blocks.group_by(&:media).map do |media_types, blocks|
-        css_rules = blocks.map(&:to_s).join("\n")
+        css_rules = blocks.join("\n")
 
         if media_types == ["all"]
           css_rules

data/lib/roadie/selector.rb

@@ -73,6 +73,7 @@ module Roadie
       :host
       :root
     ].freeze
+    private_constant :BAD_PSEUDO_FUNCTIONS
 
     def pseudo_element?
       selector.include? "::"

data/lib/roadie/style_block.rb

@@ -7,6 +7,7 @@ module Roadie
   # A style block is the combination of a {Selector} and a list of {StyleProperty}.
   class StyleBlock
     extend Forwardable
+
     attr_reader :selector, :properties, :media
 
     # @param [Selector] selector
@@ -39,7 +40,7 @@ module Roadie
     # @return {String}
     def to_s
       # NB - leave off redundant final semicolon - see https://www.w3.org/TR/CSS2/syndata.html#declaration
-      "#{selector}{#{properties.map(&:to_s).join(";")}}"
+      "#{selector}{#{properties.join(";")}}"
     end
 
     private

data/lib/roadie/url_generator.rb

@@ -137,6 +137,7 @@ module Roadie
     end
 
     VALID_OPTIONS = Set[:host, :port, :path, :protocol, :scheme].freeze
+    private_constant :VALID_OPTIONS
 
     def validate_options(options)
       keys = Set.new(options.keys)

data/lib/roadie/url_rewriter.rb

@@ -73,6 +73,7 @@ module Roadie
         \k'quote'          # Closing quote
       \)
     }x
+    private_constant :CSS_URL_REGEXP
 
     def transform_element(element)
       case element.name

data/lib/roadie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roadie
-  VERSION = "5.2.1"
+  VERSION = "5.3.1"
 end

data/roadie.gemspec

@@ -10,15 +10,15 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ["Magnus Bergmark"]
   s.email = ["magnus.bergmark@gmail.com"]
-  s.homepage = "http://github.com/Mange/roadie"
+  s.homepage = "https://github.com/Mange/roadie"
   s.summary = "Making HTML emails comfortable for the Ruby rockstars"
   s.description = "Roadie tries to make sending HTML emails a little less painful by inlining stylesheets and rewriting relative URLs for you."
   s.license = "MIT"
 
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.3"
 
   s.add_dependency "nokogiri", "~> 1.15"
-  s.add_dependency "css_parser", "~> 1.4"
+  s.add_dependency "css_parser", ">= 1.4", "< 4.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.0"

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ if ENV["CI"]
   require "simplecov"
   SimpleCov.start
 
-  require "codecov"
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  require "simplecov-cobertura"
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 end
 
 $: << File.dirname(__FILE__) + "/../lib"

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.1
 platform: ruby
 authors:
 - Magnus Bergmark
-autorequire:
 bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
@@ -28,16 +27,22 @@ dependencies:
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,9 +120,10 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - Changelog.md
+- README.md
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -129,6 +135,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/css_parser_1.gemfile
+- gemfiles/css_parser_2.gemfile
+- gemfiles/css_parser_3.gemfile
 - lib/roadie.rb
 - lib/roadie/asset_provider.rb
 - lib/roadie/asset_scanner.rb
@@ -192,11 +201,10 @@ files:
 - spec/support/have_styling_matcher.rb
 - spec/support/have_xpath_matcher.rb
 - spec/support/test_provider.rb
-homepage: http://github.com/Mange/roadie
+homepage: https://github.com/Mange/roadie
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,15 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Making HTML emails comfortable for the Ruby rockstars
 test_files: []