roadie-rails 1.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4d5c326e544bd6b1009636f171a58e72d617d46
-  data.tar.gz: 5dab77d31e9efae6d1a63846cd9a506501fcb407
+SHA256:
+  metadata.gz: 3763b68398678ce8340c842702ed7321dce653b992c336c5d646e554696f2e83
+  data.tar.gz: a09a2aa1df722ddb5d13635ea1efaab6756c44f9a50258e27c2042b71e4dd8dc
 SHA512:
-  metadata.gz: fb007edf188d872bd9143cf90ee974fed1d896d2ae849d14dc168be176c03aac868f911f5d289b94d911158e6588b9b6dce19a9eba65a682ee8369c75097195c
-  data.tar.gz: cad9b361c937836cffab6bc74e27d61b5f5fe7dba0d84821d271c29a53565b794bb451d1c879c6fb2e19de9cb8633b60155724d397a425bbc18b4e2b2b53a6d3
+  metadata.gz: fb6f168beb438f59455e2b04ce07e6face9b4db9f226e5603bbe20bdaf0568ea2870ace9d6edde1884fbe0e09958d74f19b5a6c565d08b572459a60aee8ce203
+  data.tar.gz: e0b3f1146229dc609018db1d77d544ef4f9e9c3644e6a834b38dd7b00adcdafef02d79e248c914b24db1622beaacdffefbcc863383fd1b9005763bdab8ad3cd1

data/.github/workflows/main.yml

@@ -0,0 +1,43 @@
+name: Main
+on:
+  push:
+    branches:
+      - main
+      - master
+
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  base:
+    name: Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # 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: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Rake
+        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/.rubocop.yml

@@ -0,0 +1,71 @@
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - spec/railsapps/**/*
+
+Naming/FileName:
+  Exclude:
+    # This is named intentionally this way (the gem name), in case someone
+    # includes it instead of "roadie/rails".
+    - lib/roadie-rails.rb
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/Documentation:
+  Enabled: false
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: true
+  EnforcedStyle: braces_for_chaining
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/BlockLength:
+  ExcludedMethods:
+    - refine
+    - describe
+    - context
+    - shared_examples
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/*_spec.rb'
+    - 'spec/**/*_spec.rb'
+    - 'spec/shared_examples/*.rb'
+
+Layout/LineLength:
+  IgnoredPatterns:
+    - '^\s*it\s' # Test names can be long
+  Exclude:
+    - roadie-rails.gemspec

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,57 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.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
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v2.2.0...v2.3.0)
+
+* Support Rails 7.0 - [Sean Floyd (SeanLF)](https://github.com/SeanLF)
+* Drop support for Ruby 2.5 (EoL).
+
+### 2.2.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v2.1.1...v2.2.0)
+
+* Support Rails 6.1 - [A. Fomera (afomera)](https://github.com/afomera)
+
+### 2.1.1
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v2.1.0...v2.1.1)
+
+* Relax Roadie dependency to allow v4.x
+
+Development changes:
+
+* Updated embedded Rails apps (used in tests) to work with new Sprockets 4.
+* Updated Rubocop config to work with newer Rubocop versions.
+
+### 2.1.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v2.0.0...v2.1.0)
+
+* Rails 6 support (#88) - [Gleb Mazovetskiy (glebm)](https://github.com/glebm)
+
+### 2.0.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.3.0...v2.0.0)
+
+* Drop support for Ruby before 2.5.
+* Drop support for Rails before 5.1.
+* Add support for Ruby 2.5.
+* Add support for Ruby 2.6.
+* Fix arity of `Roadie::Rails::Mailer#roadie_mail` - [Adrian Lehmann (ownadi)](https://github.com/ownadi)
 
 ### 1.3.0
 

data/Gemfile

@@ -1,14 +1,14 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in roadie-rails.gemspec
 gemspec
 
-# Additional development dependencies I use but don't want to declare in the
-# gemfile since they aren't required to develop this codebase.
-group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-end
-
 # 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

@@ -1,6 +1,6 @@
 # roadie-rails
 
-[![Build history and status](https://secure.travis-ci.org/Mange/roadie-rails.png)](http://travis-ci.org/#!/Mange/roadie-rails)
+[![Build history and status](https://github.com/Mange/roadie-rails/actions/workflows/main.yml/badge.svg)](https://github.com/Mange/roadie-rails/actions/workflows/main.yml)
 [![Code Climate](https://codeclimate.com/github/Mange/roadie-rails.png)](https://codeclimate.com/github/Mange/roadie-rails)
 [![Code coverage status](https://codecov.io/github/Mange/roadie-rails/coverage.svg?branch=master)](https://codecov.io/github/Mange/roadie-rails?branch=master)
 [![Gem](https://img.shields.io/gem/v/roadie-rails.svg)](https://rubygems.org/gems/roadie-rails)
@@ -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', '~> 0.0'
+gem 'roadie-rails', '~> 3.0'
 ```
 
 ## Usage ##
@@ -190,7 +190,7 @@ class MyOtherMailer
   include Roadie::Rails::Mailer
 
   def some_mail(user)
-    roadie_email {to: "foo@example.com"}, roadie_options_for(user)
+    roadie_mail {to: "foo@example.com"}, roadie_options_for(user)
   end
 
   private
@@ -278,18 +278,21 @@ end
 
 ## Build status ##
 
-Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of](http://travis-ci.org/#!/Mange/roadie-rails):
+Tested with Github Actions on multiple Ruby and Rails versions:
 
 * Ruby:
-  * MRI 2.2
-  * MRI 2.3
-  * MRI 2.4
+  * MRI 2.6
+  * MRI 2.7
+  * MRI 3.0
+  * MRI 3.1
 * Rails
-  * 4.2
-  * 5.0
   * 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-2018 [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/Rakefile

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 
 desc "Install gems for embedded Rails apps"
 task :install_gems do
-  Bundler.with_clean_env do
+  Bundler.with_unbundled_env do
     sh "./setup.sh install"
   end
 end
 
 desc "Update gems for embedded Rails apps"
 task :update_gems do
-  Bundler.with_clean_env do
+  Bundler.with_unbundled_env do
     sh "./setup.sh update"
   end
 end
@@ -20,4 +22,4 @@ task :spec do
 end
 
 desc "Default: Update gems and run specs"
-task :default => [:update_gems, :spec]
+task default: %i[update_gems spec]

data/lib/roadie/rails/asset_pipeline_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     class AssetPipelineProvider
@@ -5,7 +7,13 @@ module Roadie
       attr_reader :pipeline
 
       def initialize(pipeline)
-        raise ArgumentError, "You need to pass a pipeline to initialize AssetPipelineProvider" unless pipeline
+        unless pipeline
+          raise(
+            ArgumentError,
+            "You need to pass a pipeline to initialize AssetPipelineProvider"
+          )
+        end
+
         super()
         @pipeline = pipeline
       end
@@ -17,6 +25,7 @@ module Roadie
       end
 
       private
+
       def filename(asset)
         if asset.respond_to?(:filename) # sprockets 4 or later
           asset.filename
@@ -27,11 +36,12 @@ module Roadie
 
       def find_asset_in_pipeline(name)
         normalized_name = normalize_asset_name(name)
-        @pipeline[normalized_name] || @pipeline[remove_asset_digest(normalized_name)]
+        @pipeline[normalized_name] ||
+          @pipeline[remove_asset_digest(normalized_name)]
       end
 
       def normalize_asset_name(href)
-        remove_asset_prefix(href.split('?').first)
+        remove_asset_prefix(href.split("?").first)
       end
 
       DIGEST_PATTERN = /
@@ -44,7 +54,7 @@ module Roadie
       /x.freeze
 
       def remove_asset_digest(path)
-        path.gsub(DIGEST_PATTERN, '.')
+        path.gsub(DIGEST_PATTERN, ".")
       end
 
       def remove_asset_prefix(path)

data/lib/roadie/rails/automatic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     module Automatic

data/lib/roadie/rails/document_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     class DocumentBuilder

data/lib/roadie/rails/inline_on_delivery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     # Extend instances of Mail with this to have it inlined automatically when

data/lib/roadie/rails/mail_inliner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     class MailInliner
@@ -10,13 +12,14 @@ module Roadie
 
       def execute
         if options
-          improve_body if email.content_type =~ /^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/mailer.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     module Mailer
-      def roadie_mail(options = {}, &block)
+      # Generate an email and run Roadie on it. Will use #roadie_options to get
+      # default options if not passed in.
+      def roadie_mail(
+        options = {},
+        final_roadie_options = roadie_options,
+        &block
+      )
         email = mail(options, &block)
-        MailInliner.new(email, roadie_options).execute
+        MailInliner.new(email, final_roadie_options).execute
       end
 
       def roadie_options

data/lib/roadie/rails/options.rb

@@ -1,58 +1,46 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
     class Options
-      ATTRIBUTE_NAMES = [
-        :after_transformation,
-        :asset_providers,
-        :before_transformation,
-        :external_asset_providers,
-        :keep_uninlinable_css,
-        :url_options,
-      ]
+      ATTRIBUTE_NAMES = %i[
+        after_transformation
+        asset_providers
+        before_transformation
+        external_asset_providers
+        keep_uninlinable_css
+        url_options
+      ].freeze
       private_constant :ATTRIBUTE_NAMES
+
       attr_reader(*ATTRIBUTE_NAMES)
+      attr_writer(
+        :url_options,
+        :before_transformation,
+        :after_transformation,
+        :keep_uninlinable_css
+      )
 
       def initialize(options = {})
         complain_about_unknown_keys options.keys
-        self.after_transformation     = options[:after_transformation]
-        self.asset_providers          = options[:asset_providers]
-        self.before_transformation    = options[:before_transformation]
-        self.external_asset_providers = options[:external_asset_providers]
-        self.keep_uninlinable_css     = options[:keep_uninlinable_css]
-        self.url_options              = options[:url_options]
-      end
-
-      def url_options=(options)
-        @url_options = options
-      end
-
-      def before_transformation=(callback)
-        @before_transformation = callback
-      end
-
-      def after_transformation=(callback)
-        @after_transformation = callback
-      end
-
-      def keep_uninlinable_css=(bool)
-        @keep_uninlinable_css = bool
+        options.each_pair do |name, value|
+          self[name] = value
+        end
       end
 
       def asset_providers=(providers)
+        # TODO: Raise an error when setting to nil in order to make this not a
+        # silent error.
         if providers
           @asset_providers = ProviderList.wrap providers
-        # TODO: Raise an error when setting to nil in order to make this not a silent error.
-        # else
-        #   raise ArgumentError, "Cannot set asset_providers to nil. Set to Roadie::NullProvider if you want no external assets inlined."
         end
       end
 
       def external_asset_providers=(providers)
+        # TODO: Raise an error when setting to nil in order to make this not a
+        # silent error.
         if providers
           @external_asset_providers = ProviderList.wrap providers
-        # TODO: Raise an error when setting to nil in order to make this not a silent error.
-        # else
-        #   raise ArgumentError, "Cannot set asset_providers to nil. Set to Roadie::NullProvider if you want no external assets inlined."
         end
       end
 
@@ -62,9 +50,14 @@ module Roadie
         document.after_transformation = after_transformation
 
         document.asset_providers = asset_providers if asset_providers
-        document.external_asset_providers = external_asset_providers if external_asset_providers
 
-        document.keep_uninlinable_css = keep_uninlinable_css unless keep_uninlinable_css.nil?
+        if external_asset_providers
+          document.external_asset_providers = external_asset_providers
+        end
+
+        unless keep_uninlinable_css.nil?
+          document.keep_uninlinable_css = keep_uninlinable_css
+        end
       end
 
       def merge(options)
@@ -73,7 +66,7 @@ module Roadie
 
       def merge!(options)
         ATTRIBUTE_NAMES.each do |attribute|
-          send "#{attribute}=", options.fetch(attribute, send(attribute))
+          self[attribute] = options.fetch(attribute, self[attribute])
         end
         self
       end
@@ -83,63 +76,52 @@ module Roadie
       end
 
       def combine!(options)
-        self.after_transformation = combine_callable(
-          after_transformation, options[:after_transformation]
-        )
-
-        self.asset_providers = combine_providers(
-          asset_providers, options[:asset_providers]
-        )
-
-        self.before_transformation = combine_callable(
-          before_transformation, options[:before_transformation]
-        )
+        %i[after_transformation before_transformation].each do |name|
+          self[name] = Utils.combine_callable(self[name], options[name])
+        end
 
-        self.external_asset_providers = combine_providers(
-          external_asset_providers, options[:external_asset_providers]
-        )
+        %i[asset_providers external_asset_providers].each do |name|
+          self[name] = Utils.combine_providers(self[name], options[name])
+        end
 
-        self.keep_uninlinable_css =
-          options[:keep_uninlinable_css] if options.has_key?(:keep_uninlinable_css)
+        if options.key?(:keep_uninlinable_css)
+          self.keep_uninlinable_css = options[:keep_uninlinable_css]
+        end
 
-        self.url_options = combine_hash(
-          url_options, options[:url_options]
+        self.url_options = Utils.combine_hash(
+          url_options,
+          options[:url_options]
         )
 
         self
       end
 
-      private
-      def combine_hash(first, second)
-        combine_nilable(first, second) do |a, b|
-          a.merge(b)
-        end
-      end
-
-      def combine_callable(first, second)
-        combine_nilable(first, second) do |a, b|
-          proc { |*args| a.call(*args); b.call(*args) }
-        end
-      end
-
-      def combine_providers(first, second)
-        combine_nilable(first, second) do |a, b|
-          ProviderList.new(a.to_a + Array.wrap(b))
+      def [](option)
+        if ATTRIBUTE_NAMES.include?(option)
+          public_send(option)
+        else
+          raise ArgumentError, "#{option.inspect} is not a valid option"
         end
       end
 
-      def combine_nilable(first, second)
-        if first && second
-          yield first, second
+      def []=(option, value)
+        if ATTRIBUTE_NAMES.include?(option)
+          public_send("#{option}=", value)
         else
-          first ? first : second
+          raise ArgumentError, "#{option.inspect} is not a valid option"
         end
       end
 
+      private
+
       def complain_about_unknown_keys(keys)
         invalid_keys = keys - ATTRIBUTE_NAMES
-        if invalid_keys.size > 0
-          raise ArgumentError, "Unknown configuration parameters: #{invalid_keys}", caller(1)
+        unless invalid_keys.empty?
+          raise(
+            ArgumentError,
+            "Unknown configuration parameters: #{invalid_keys}",
+            caller(1)
+          )
         end
       end
     end

data/lib/roadie/rails/railtie.rb

@@ -1,4 +1,6 @@
-require 'rails'
+# frozen_string_literal: true
+
+require "rails"
 
 module Roadie
   module Rails
@@ -7,18 +9,17 @@ 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)
         ]
 
-        # Saying config.assets.enabled here does not work in Rails 3.1-3.2, but
-        # APP.config.assets work. There is a difference between "config" and
-        # "app.config" on those versions.
-        if app.config.respond_to?(:assets) && app.config.assets.enabled != false
+        if app.config.respond_to?(:assets) && app.config.assets
           if app.assets
-            config.roadie.asset_providers << AssetPipelineProvider.new(app.assets)
+            config.roadie.asset_providers <<
+              AssetPipelineProvider.new(app.assets)
           else
             app.config.assets.configure do |env|
-              config.roadie.asset_providers << AssetPipelineProvider.new(env)
+              config.roadie.asset_providers <<
+                AssetPipelineProvider.new(env)
             end
           end
         end

data/lib/roadie/rails/utils.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+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)
+        combine_nilable(first, second) do |a, b|
+          a.merge(b)
+        end
+      end
+
+      # Return a callable that will call both inputs. If either is nil, then
+      # just return the other.
+      #
+      # The result from the second one will be the result of the combined
+      # callable.
+      #
+      # ```ruby
+      # combine_callable(-> { 1 }, -> { 2 }).call # => 2
+      # combine_callable(-> { 1 }, nil).call # => 1
+      # combine_callable(nil, nil).nil? # => true
+      # ```
+      def combine_callable(first, second)
+        combine_nilable(first, second) do |a, b|
+          lambda do |*args|
+            a.call(*args)
+            b.call(*args)
+          end
+        end
+      end
+
+      # Combine two Provider ducks into a ProviderList. If either is nil, pick
+      # the non-nil value instead.
+      def combine_providers(first, second)
+        combine_nilable(first, second) do |a, b|
+          ProviderList.new(a.to_a + Array.wrap(b))
+        end
+      end
+
+      # Discard the nil value. If neither is nil, then yield both and return
+      # the result from the block.
+      #
+      # ```ruby
+      # combine_nilable(nil, 5) { |a, b| a+b } # => 5
+      # combine_nilable(7, nil) { |a, b| a+b } # => 7
+      # combine_nilable(nil, nil) { |a, b| a+b } # => nil
+      # combine_nilable(7, 5) { |a, b| a+b } # => 12
+      # ```
+      def combine_nilable(first, second)
+        if first && second
+          yield first, second
+        else
+          first || second
+        end
+      end
+    end
+  end
+end

data/lib/roadie/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "3.0.0"
   end
 end

data/lib/roadie/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roadie
   module Rails
   end
@@ -6,6 +8,7 @@ end
 require "roadie"
 
 require "roadie/rails/version"
+require "roadie/rails/utils"
 require "roadie/rails/options"
 
 require "roadie/rails/document_builder"

data/lib/roadie-rails.rb

@@ -1 +1,3 @@
-require 'roadie/rails'
+# frozen_string_literal: true
+
+require "roadie/rails"

data/roadie-rails.gemspec

@@ -1,32 +1,33 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'roadie/rails/version'
+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       = %q{Making HTML emails comfortable for the Rails rockstars}
-  spec.description   = %q{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.2"
+  spec.required_ruby_version = ">= 2.6"
 
-  spec.files         = `git ls-files | grep -v ^spec`.split($/)
-  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 "roadie", "~> 3.1"
-  spec.add_dependency "railties", ">= 3.0", "< 5.3"
+  spec.add_dependency "railties", ">= 5.1", "< 7.1"
+  spec.add_dependency "roadie", "~> 5.0"
 
-  spec.add_development_dependency "rails", ">= 4.2", "< 5.3"
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rails", ">= 5.1", "< 7.1"
+  spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-collection_matchers"
+  spec.add_development_dependency "rspec-rails"
 end

data/setup.sh

@@ -10,7 +10,7 @@ function header() {
 }
 
 function green() {
-  echo $(tput setaf 2)$@$(tput sgr0)
+  echo "$(tput setaf 2)$*$(tput sgr0)"
 }
 
 function update() {
@@ -23,20 +23,21 @@ function install() {
 }
 
 
-root=$(dirname $0)
+root=$(dirname "$0")
 
-# Set by Travis CI; interferes with the nested repos
+# Previously needed by Travis CI; might still be needed at Github Actions
+# due to nested repos
 unset BUNDLE_GEMFILE
 
 if [[ $1 == "install" ]]; then
   header "Installing gem dependencies"
   install
 
-  for app_path in $root/spec/railsapps/rails_*; do
+  for app_path in "$root"/spec/railsapps/rails_*; do
     (
-      header "Rails app $(basename $app_path)"
-      cd $app_path
-      echo "Installing gems for $(basename $app_path)"
+      header "Rails app $(basename "$app_path")"
+      cd "$app_path"
+      echo -n "Installing gems for $(basename "$app_path")"
       install
     )
   done
@@ -46,10 +47,10 @@ elif [[ $1 == "update" ]]; then
   header "Updating gem dependencies"
   update
 
-  for app_path in $root/spec/railsapps/rails_*; do
+  for app_path in "$root"/spec/railsapps/rails_*; do
     (
-      cd $app_path
-      header "Updating $(basename $app_path)"
+      cd "$app_path"
+      header "Updating $(basename "$app_path")"
       update
     )
   done

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Magnus Bergmark
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: roadie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: roadie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,11 +130,12 @@ extra_rdoc_files:
 - Changelog.md
 - LICENSE.txt
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".solargraph.yml"
 - Changelog.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -150,6 +151,7 @@ files:
 - lib/roadie/rails/mailer.rb
 - lib/roadie/rails/options.rb
 - lib/roadie/rails/railtie.rb
+- lib/roadie/rails/utils.rb
 - lib/roadie/rails/version.rb
 - roadie-rails.gemspec
 - setup.sh
@@ -157,7 +159,7 @@ homepage: http://github.com/Mange/roadie-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,16 +167,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      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 Rails rockstars
 test_files: []

data/.travis.yml

@@ -1,20 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-
-matrix:
-  fast_finish: true
-
-cache:
-  directories:
-  - .bundle
-  - spec/railsapps/rails_42/.bundle
-  - spec/railsapps/rails_42_sprockets_rails_3/.bundle
-  - spec/railsapps/rails_50/.bundle
-  - spec/railsapps/rails_51/.bundle
-  - spec/railsapps/rails_52/.bundle
-bundler_args: --without guard --path=.bundle
-script: "rake"

data/Guardfile

@@ -1,16 +0,0 @@
-rspec_options = {
-  cmd: 'rspec -f documentation',
-  fail_mode: :keep,
-  all_after_pass: true,
-  all_on_start: true,
-  run_all: {cmd: 'rspec -f progress'}
-}
-
-guard :rspec, rspec_options do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-
-  watch('spec/spec_helper.rb')  { "spec" }
-  watch(%r{^spec/support/.+\.rb$}) { "spec" }
-end
-