roadie-rails 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3763b68398678ce8340c842702ed7321dce653b992c336c5d646e554696f2e83
-  data.tar.gz: a09a2aa1df722ddb5d13635ea1efaab6756c44f9a50258e27c2042b71e4dd8dc
+  metadata.gz: 3adee731af7278bfca961e1573c6ed2b6dcb666bbf862b42995d241d1558799c
+  data.tar.gz: 8dc5dbf397cbefe8465754dc609987cb3abf3f24b495b340e072bcef38d8313c
 SHA512:
-  metadata.gz: fb6f168beb438f59455e2b04ce07e6face9b4db9f226e5603bbe20bdaf0568ea2870ace9d6edde1884fbe0e09958d74f19b5a6c565d08b572459a60aee8ce203
-  data.tar.gz: e0b3f1146229dc609018db1d77d544ef4f9e9c3644e6a834b38dd7b00adcdafef02d79e248c914b24db1622beaacdffefbcc863383fd1b9005763bdab8ad3cd1
+  metadata.gz: b8ab3af161873b9a05e887b5a0556094450d34b69b89d8703df9cc5f2cf8c48b248ea6ed23e28acca0fef274c5102b3ff7a7c47ab175ccaf619ed692239c5d8c
+  data.tar.gz: 5caf0748d8c9aadf006e3e3a7a21bd36b41214e1ecf83d7d6d387dc02cac0e82a5d6652865f29aace10cec05c25d5d87606193b59a5d22d08475f4e166a0b5a0

data/.github/workflows/main.yml

@@ -1,9 +1,19 @@
 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'
+      - '**.txt'
 
   pull_request:
     types: [opened, synchronize, reopened]
@@ -11,15 +21,21 @@ on:
 jobs:
   base:
     name: Ruby ${{ matrix.ruby }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
 
     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.
@@ -30,14 +46,23 @@ jobs:
           bundler-cache: true
 
       - name: Rake
-        run: rake
+        run: bundle exec rake
 
-      - uses: codecov/codecov-action@v2
+      - uses: codecov/codecov-action@v4
 
   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.3"
+          bundler-cache: true
+
       - name: standardrb
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: amoeba/standardrb-action@v2
+        run: bundle exec standardrb

data/.standard.yml

@@ -0,0 +1,2 @@
+ruby_version: 2.6
+parallel: true

data/Changelog.md

@@ -1,6 +1,25 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v3.0.0...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v3.2.0...master)
+
+### 3.2.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v3.1.0...v3.2.0)
+
+* Support [Propshaft](https://github.com/rails/propshaft) - [Juani Villarejo](https://github.com/jvillarejo) [#114](https://github.com/Mange/roadie-rails/pull/114)
+* Add support (CI) for Ruby 3.3.
+* Last version for supporting Ruby 2.6 (EoL).
+
+### 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
 

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', '~> 3.0'
+gem 'roadie-rails'
 ```
 
 ## Usage ##
@@ -281,16 +281,9 @@ end
 Tested with Github Actions on multiple Ruby and Rails versions:
 
 * Ruby:
-  * MRI 2.6
-  * MRI 2.7
-  * MRI 3.0
-  * MRI 3.1
+  See [Workflow Matrix](/.github/workflows/main.yml)
 * Rails
-  * 5.1
-  * 5.2
-  * 6.0
-  * 6.1
-  * 7.0
+  See [Integration Spec File](/spec/integration_spec.rb)
 
 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.

data/lib/roadie/rails/asset_pipeline_provider.rb

@@ -51,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/asset_propshaft_provider.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Roadie
+  module Rails
+    class AssetPropshaftProvider
+      include Roadie::AssetProvider
+
+      def initialize(assembly)
+        @assembly = assembly
+        @stylesheets = {}
+      end
+
+      def find_stylesheet(stylesheet_asset_path)
+        stylesheet = @stylesheets[stylesheet_asset_path]
+        return stylesheet if stylesheet.present?
+
+        path, digest = extract_path_and_digest(stylesheet_asset_path)
+
+        asset = @assembly.load_path.find(path)
+        if asset.present? && asset.fresh?(digest)
+          compiled_content = @assembly.compilers.compile(asset)
+
+          stylesheet = Stylesheet.new(stylesheet_asset_path, compiled_content.force_encoding("UTF-8"))
+          @stylesheets[stylesheet_asset_path] = stylesheet
+        end
+
+        stylesheet
+      end
+
+      private
+
+      def extract_path_and_digest(stylesheet_asset_path)
+        full_path = stylesheet_asset_path.sub(%r{#{::Rails.configuration.assets.prefix}/}, "")
+        digest = full_path[/-([0-9a-zA-Z]{7,128})\.(?!digested)[^.]+\z/, 1]
+        path = digest ? full_path.sub("-#{digest}", "") : full_path
+
+        [path, digest]
+      end
+    end
+  end
+end

data/lib/roadie/rails/options.rb

@@ -106,7 +106,7 @@ module Roadie
 
       def []=(option, value)
         if ATTRIBUTE_NAMES.include?(option)
-          public_send("#{option}=", value)
+          public_send(:"#{option}=", value)
         else
           raise ArgumentError, "#{option.inspect} is not a valid option"
         end

data/lib/roadie/rails/railtie.rb

@@ -14,8 +14,11 @@ module Roadie
 
         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)
+          elsif defined?(Propshaft)
+            config.after_initialize do |app|
+              config.roadie.asset_providers << AssetPropshaftProvider.new(app.assets)
+            end
           else
             app.config.assets.configure do |env|
               config.roadie.asset_providers <<

data/lib/roadie/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Roadie
   module Rails
-    VERSION = "3.0.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/roadie/rails.rb

@@ -15,6 +15,7 @@ require "roadie/rails/document_builder"
 require "roadie/rails/mail_inliner"
 
 require "roadie/rails/asset_pipeline_provider"
+require "roadie/rails/asset_propshaft_provider"
 
 require "roadie/rails/mailer"
 

data/roadie-rails.gemspec

@@ -18,16 +18,18 @@ Gem::Specification.new do |spec|
 
   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 "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"
+
+  spec.post_install_message = "This would be the last version that supports ruby 2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2024-05-13 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,7 +29,7 @@ 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
@@ -67,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
@@ -77,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
@@ -120,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
@@ -134,6 +148,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".solargraph.yml"
+- ".standard.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -144,6 +159,7 @@ files:
 - lib/roadie-rails.rb
 - lib/roadie/rails.rb
 - lib/roadie/rails/asset_pipeline_provider.rb
+- lib/roadie/rails/asset_propshaft_provider.rb
 - lib/roadie/rails/automatic.rb
 - lib/roadie/rails/document_builder.rb
 - lib/roadie/rails/inline_on_delivery.rb
@@ -159,7 +175,7 @@ homepage: http://github.com/Mange/roadie-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: This would be the last version that supports ruby 2.6
 rdoc_options: []
 require_paths:
 - lib
@@ -174,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Making HTML emails comfortable for the Rails rockstars