roadie-rails 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d1d4fb6f37c6612f565f809c51f5d1b1a9aea2a469ec431d1c180aadd19e46
-  data.tar.gz: 1d198927ae248450f45120f9c32d0af1eacaeed690ff18f78f819b0aadbe0a4c
+  metadata.gz: 3763b68398678ce8340c842702ed7321dce653b992c336c5d646e554696f2e83
+  data.tar.gz: a09a2aa1df722ddb5d13635ea1efaab6756c44f9a50258e27c2042b71e4dd8dc
 SHA512:
-  metadata.gz: 6354732056b71a05443197cedbe8e42efef99c535b0debc63abc7271dd581b87c29d5dd3ac605c0332baa7bc9b8a12870093b8d77838e5a5386a3984d778f8e9
-  data.tar.gz: 3e617ef0ba8330db2802212c41b44bcda55b8548110195f8d45b99f1c58cb6ec8991ad6de93433d9b3104c116f53b9d0d9d16ac9be9eca3ddc08c85ccda9a6da
+  metadata.gz: fb6f168beb438f59455e2b04ce07e6face9b4db9f226e5603bbe20bdaf0568ea2870ace9d6edde1884fbe0e09958d74f19b5a6c565d08b572459a60aee8ce203
+  data.tar.gz: e0b3f1146229dc609018db1d77d544ef4f9e9c3644e6a834b38dd7b00adcdafef02d79e248c914b24db1622beaacdffefbcc863383fd1b9005763bdab8ad3cd1

data/.github/workflows/main.yml

@@ -1,6 +1,12 @@
 name: Main
 on:
   push:
+    branches:
+      - main
+      - master
+
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   base:
@@ -9,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6.9", "2.7.2", "3.0.3"]
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
 
     steps:
       - name: Checkout code
@@ -27,3 +33,11 @@ jobs:
         run: rake
 
       - uses: codecov/codecov-action@v2
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: standardrb
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: amoeba/standardrb-action@v2

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,17 @@
 ### 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.0.0...master)
 
-* Nothing yet.
+### 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', '~> 3.0'
 ```
 
 ## 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

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.0.0"
   end
 end

data/roadie-rails.gemspec

@@ -5,25 +5,25 @@ $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.test_files = spec.files.grep(%r{^(test|spec|features)/})
   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 "roadie", "~> 5.0"
 
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rails", ">= 5.1", "< 7.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -34,20 +34,14 @@ dependencies:
   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
@@ -139,6 +133,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".solargraph.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -172,7 +167,7 @@ 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:
   - - ">="