roadie-rails 2.3.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d1d4fb6f37c6612f565f809c51f5d1b1a9aea2a469ec431d1c180aadd19e46
-  data.tar.gz: 1d198927ae248450f45120f9c32d0af1eacaeed690ff18f78f819b0aadbe0a4c
+  metadata.gz: 16580bfa2467fceffbbc8e06e701098916fbcbb9bee06837939bdd8e8b8ee32c
+  data.tar.gz: f0ef8c91dfb32a406a3a4e3d705fd0ccfc7a49b939e378acb1296a58e03c2314
 SHA512:
-  metadata.gz: 6354732056b71a05443197cedbe8e42efef99c535b0debc63abc7271dd581b87c29d5dd3ac605c0332baa7bc9b8a12870093b8d77838e5a5386a3984d778f8e9
-  data.tar.gz: 3e617ef0ba8330db2802212c41b44bcda55b8548110195f8d45b99f1c58cb6ec8991ad6de93433d9b3104c116f53b9d0d9d16ac9be9eca3ddc08c85ccda9a6da
+  metadata.gz: 38c8fcad0c0b77105922656042f8f5e0ff515bcca6cad7f65b0f6817bffdd02920a7a1184d61a993ea54d6287b78f641726937d3c53d2784e319b3be4049b57f
+  data.tar.gz: 1e35117740bbec441a9e7f443176695982db10e245b9d00491350a277fcbf66100e384798df04bfd6789478fdc3feaf85565b0581981b2078e689a4ea98405fa

data/.github/workflows/main.yml

@@ -1,19 +1,30 @@
 name: Main
 on:
   push:
+    branches:
+      - main
+      - master
+
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   base:
     name: Ruby ${{ matrix.ruby }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6.9", "2.7.2", "3.0.3"]
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # This setup is not compatible with the way Travis CI was
       # setup, so the cache will only work for the root folder.
@@ -24,6 +35,23 @@ jobs:
           bundler-cache: true
 
       - name: Rake
-        run: rake
+        run: bundle exec rake
+
+      - uses: codecov/codecov-action@v3
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # 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
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
 
-      - uses: codecov/codecov-action@v2
+      - name: standardrb
+        run: bundle exec standardrb

data/.solargraph.yml

@@ -0,0 +1,16 @@
+---
+include:
+  - "**/*.rb"
+exclude:
+  - spec/**/*
+  - test/**/*
+  - vendor/**/*
+  - ".bundle/**/*"
+require: []
+domains: []
+plugins:
+  - solargraph-standardrb
+reporters:
+  - standardrb
+require_paths: []
+max_files: 5000

data/Changelog.md

@@ -1,8 +1,28 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v2.3.0...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v3.1.0...master)
 
-* Nothing yet.
+### 3.1.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v3.0.0...v3.1.0)
+
+* Support Rails 7.1 - [Frederik Spang](https://github.com/frederikspang)
+* Add support for Ruby 3.2.
+
+Development changes:
+
+* Fix Github CI lint job with standardrb.
+
+### 3.0.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v2.3.0...v3.0.0)
+
+* Drop support for Ruby versions < 2.6.
+* Add support for Ruby 3.0 and 3.1.
+
+Development changes:
+
+* Replace Travis CI with Github CI.
 
 ### 2.3.0
 

data/Gemfile

@@ -8,3 +8,7 @@ gemspec
 # Added here so it does not show up on the Gemspec; I only want it for CI builds
 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

@@ -20,7 +20,7 @@ This gem hooks up your Rails application with Roadie to help you generate HTML e
 [Add this gem to your Gemfile as recommended by Rubygems][gem] and run `bundle install`.
 
 ```ruby
-gem 'roadie-rails', '~> 2.3'
+gem 'roadie-rails'
 ```
 
 ## Usage ##
@@ -284,12 +284,15 @@ Tested with Github Actions on multiple Ruby and Rails versions:
   * MRI 2.6
   * MRI 2.7
   * MRI 3.0
+  * MRI 3.1
 * Rails
   * 5.1
   * 5.2
   * 6.0
+  * 6.1
   * 7.0
 
+Please note that [all Rails-versions are not compatible with all Ruby-versions](https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html).
 Let me know if you want any other combination supported officially.
 
 ### Versioning ###
@@ -316,7 +319,7 @@ After running `rake` for the first time and you want to keep running tests witho
 
 (The MIT License)
 
-Copyright © 2013-2021 [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>, et. al.
+Copyright © 2013-2022 [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>, et. al.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/roadie/rails/asset_pipeline_provider.rb

@@ -10,7 +10,7 @@ module Roadie
         unless pipeline
           raise(
             ArgumentError,
-            "You need to pass a pipeline to initialize AssetPipelineProvider",
+            "You need to pass a pipeline to initialize AssetPipelineProvider"
           )
         end
 
@@ -25,6 +25,7 @@ module Roadie
       end
 
       private
+
       def filename(asset)
         if asset.respond_to?(:filename) # sprockets 4 or later
           asset.filename
@@ -50,7 +51,7 @@ module Roadie
          [a-z0-9]{64}    # New style is 64 characters
         )
         \.               # Dot for the file extension
-      /x.freeze
+      /x
 
       def remove_asset_digest(path)
         path.gsub(DIGEST_PATTERN, ".")

data/lib/roadie/rails/mail_inliner.rb

@@ -12,13 +12,14 @@ module Roadie
 
       def execute
         if options
-          improve_body if email.content_type =~ %r{^text/html}
+          improve_body if %r{^text/html}.match?(email.content_type)
           improve_html_part(email.html_part) if email.html_part
         end
         email
       end
 
       private
+
       def improve_body
         email.body = transform_html(email.body.decoded)
       end

data/lib/roadie/rails/options.rb

@@ -18,7 +18,7 @@ module Roadie
         :url_options,
         :before_transformation,
         :after_transformation,
-        :keep_uninlinable_css,
+        :keep_uninlinable_css
       )
 
       def initialize(options = {})
@@ -75,7 +75,7 @@ module Roadie
         dup.combine! options
       end
 
-      def combine!(options) # rubocop:disable Metrics/MethodLength
+      def combine!(options)
         %i[after_transformation before_transformation].each do |name|
           self[name] = Utils.combine_callable(self[name], options[name])
         end
@@ -90,7 +90,7 @@ module Roadie
 
         self.url_options = Utils.combine_hash(
           url_options,
-          options[:url_options],
+          options[:url_options]
         )
 
         self
@@ -113,13 +113,14 @@ module Roadie
       end
 
       private
+
       def complain_about_unknown_keys(keys)
         invalid_keys = keys - ATTRIBUTE_NAMES
         unless invalid_keys.empty?
           raise(
             ArgumentError,
             "Unknown configuration parameters: #{invalid_keys}",
-            caller(1),
+            caller(1)
           )
         end
       end

data/lib/roadie/rails/railtie.rb

@@ -9,7 +9,7 @@ module Roadie
 
       initializer "roadie-rails.setup" do |app|
         config.roadie.asset_providers = [
-          Roadie::FilesystemProvider.new(::Rails.root.join("public").to_s),
+          Roadie::FilesystemProvider.new(::Rails.root.join("public").to_s)
         ]
 
         if app.config.respond_to?(:assets) && app.config.assets

data/lib/roadie/rails/utils.rb

@@ -4,6 +4,7 @@ module Roadie
   module Rails
     module Utils
       module_function
+
       # Combine two hashes, or return the non-nil hash if either is nil.
       # Returns nil if both are nil.
       def combine_hash(first, second)

data/lib/roadie/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Roadie
   module Rails
-    VERSION = "2.3.0"
+    VERSION = "3.1.0"
   end
 end

data/roadie-rails.gemspec

@@ -5,29 +5,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "roadie/rails/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "roadie-rails"
-  spec.version       = Roadie::Rails::VERSION
-  spec.authors       = ["Magnus Bergmark"]
-  spec.email         = ["magnus.bergmark@gmail.com"]
-  spec.homepage      = "http://github.com/Mange/roadie-rails"
-  spec.summary       = "Making HTML emails comfortable for the Rails rockstars"
-  spec.description   = "Hooks Roadie into your Rails application to help with email generation."
-  spec.license       = "MIT"
+  spec.name = "roadie-rails"
+  spec.version = Roadie::Rails::VERSION
+  spec.authors = ["Magnus Bergmark"]
+  spec.email = ["magnus.bergmark@gmail.com"]
+  spec.homepage = "http://github.com/Mange/roadie-rails"
+  spec.summary = "Making HTML emails comfortable for the Rails rockstars"
+  spec.description = "Hooks Roadie into your Rails application to help with email generation."
+  spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.6"
 
-  spec.files         = `git ls-files | grep -v ^spec`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files | grep -v ^spec`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.extra_rdoc_files = %w[README.md Changelog.md LICENSE.txt]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "railties", ">= 5.1", "< 7.1"
-  spec.add_dependency "roadie", ">= 3.1", "< 5.0"
+  spec.add_dependency "railties", ">= 5.1", "< 8.0"
+  spec.add_dependency "roadie", "~> 5.0"
 
   spec.add_development_dependency "bundler", "~> 2.2"
-  spec.add_development_dependency "rails", ">= 5.1", "< 7.1"
+  spec.add_development_dependency "rails", ">= 5.1", "< 8.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "standard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,25 +29,19 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: roadie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -73,7 +67,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +77,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  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'
 description: Hooks Roadie into your Rails application to help with email generation.
 email:
 - magnus.bergmark@gmail.com
@@ -139,6 +147,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".solargraph.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -172,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Making HTML emails comfortable for the Rails rockstars