rails-assets-manifest 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b37255b188591ca005e9421faf46d08a6906e5d13d7b6d2bc27cc278dde8ea
-  data.tar.gz: 1d3faec5a30ce6c2cbe41b7c543b9e1b3fd9162320c2a8babf08533b4aebec41
+  metadata.gz: 36c667b7c457d214df43ac5f4c9e54f5baac237c0f9a61ac3eeedc6d1d458ab9
+  data.tar.gz: 1a7c777200e2087c05be7759091007857861261a5d00912256f35f5ff98d2a6c
 SHA512:
-  metadata.gz: f2dce0a879ba0931ed9ff2544ebabae420780a3f6c25bc9617f36c833758d4408f4c2ef388ed5bf59974a225d6cdfa2a578d217f5c552f9b0abfc0242de381c1
-  data.tar.gz: b29d086dcf4a9c93f5892ae204ac1f0ad8a51cd24d918fdcecc56f02cc87de8b99cdeccce4eb2111de563d923aa4059ed8f294a2f1c00c71f066d3cb313de15b
+  metadata.gz: 6117f1e88a27ba3dd5ce5edc85a21952e91de97abd3d72bc9b37a1527aa8352a7170371acf2bec29a268a8aced6b3519af4d9e4409848f041c9d950090ca38cb
+  data.tar.gz: 2f38b29bf90d82cd5a4a8e039a2fef2bd536326d1fe81eb3ee9e04d5b2637f4f3114a5deeb75ce6a6aec332cdf7874056033d4dde53d8bea7bc5d053774dbc6a

data/.github/workflows/test.yml

@@ -0,0 +1,66 @@
+---
+name: test
+on: push
+jobs:
+  rspec:
+    name: "ruby:${{ matrix.ruby }} rails:${{ matrix.rails }} ${{ matrix.variant }}"
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.1"
+          - "3.0"
+          - "2.7"
+        rails:
+          - "7.0"
+          - "6.1"
+          - "6.0"
+          - "5.2"
+        variant:
+          - ""
+          - "no-sprockets"
+        exclude:
+          - ruby: "3.1"
+            rails: "6.1"
+          - ruby: "3.1"
+            rails: "6.0"
+          - ruby: "3.1"
+            rails: "5.2"
+          - ruby: "3.0"
+            rails: "5.2"
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+      BUNDLE_WITHOUT: development
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      VARIANT: ${{ matrix.variant }}
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rspec --color
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-20.04
+
+    env:
+      BUNDLE_WITHOUT: development
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - run: bundle exec rubocop --parallel --fail-level E

data/.gitignore

@@ -3,6 +3,8 @@
 /coverage
 /doc
 /pkg
+/spec/dummy/log
+/spec/dummy/tmp
 /spec/examples.txt
 /tmp
 /vendor/bundle

data/.rspec

@@ -1,3 +1,4 @@
---format documentation
+--backtrace
 --color
+--format documentation
 --require spec_helper

data/.rubocop.yml

@@ -1,211 +1,7 @@
-require:
-  - rubocop-rspec
+inherit_gem:
+  rubocop-config: default.yml
 
 AllCops:
-  Exclude:
-    - 'bin/**'
-    - 'config/initializers/integration*'
-    - 'db/schema.rb'
-    - 'vendor/**'
-  TargetRubyVersion: 2.5
-  TargetRailsVersion: 5.2
-
-
-
-# -----------------------------------------------------------------------------
-#                                   RAILS
-
-Rails:
-  Enabled: true
-
-#
-# False positives:
-#   * On Acfs::Resource#update_attriubutes!
-#
-Rails/ActiveRecordAliases:
-  Exclude:
-    - spec/**/*_spec.rb
-
-#
-# False positives:
-#   * On embedded models in migrations.
-#
-Rails/ApplicationRecord:
-  Exclude:
-    - 'db/**/*'
-
-#
-# Often when triggered it just wants to pass joined paths as separate
-# arguments but that can hurt readability.
-#
-Rails/FilePath:
-  Enabled: false
-
-#
-# False positives:
-#   * Specs and migrations often need to update things without validations.
-#
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/migrations/**.rb'
-    - 'spec/**/*_spec.rb'
-
-
-
-# -----------------------------------------------------------------------------
-#                                   RSPEC
-
-RSpec:
-  Include:
-    - 'spec/**/*_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/rails_helper.rb'
-
-RSpec/ContextWording:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Enabled: false
-
-RSpec/ExpectInHook:
-  Enabled: false
-
-RSpec/FilePath:
-  Exclude:
-    - 'spec/client/**/*_spec.rb'
-
-RSpec/MessageSpies:
-  Enabled: false
-
-RSpec/MissingExampleGroupArgument:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Max: 5
-
-# -----------------------------------------------------------------------------
-#                                   Layout
-
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/CaseIndentation:
-  EnforcedStyle: end
-  SupportedStyles:
-    - case
-    - end
-  IndentOneStep: true
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: no_space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-
-
-# -----------------------------------------------------------------------------
-#                                    Lint
-
-#
-# False positives:
-#   * expect { something }.to change { something } often triggers this
-#
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
-
-
-# -----------------------------------------------------------------------------
-#                                   Metrics
-
-Metrics/BlockLength:
-  Exclude:
-    - 'db/**/*'
-    - 'spec/**/*'
-    - 'config/**/*'
-    - '**/*.rake'
-
-Metrics/ClassLength:
-  Max: 200
-
-Metrics/LineLength:
-  Exclude:
-    - 'db/**/*'
-    - 'spec/**/*'
-    - 'config/**/*'
-
-Metrics/MethodLength:
-  Exclude:
-    - 'db/**/*'
-
-
-
-# -----------------------------------------------------------------------------
-#                                   Style
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
-#
-# Both styles or mixtures are reasonable
-#
-Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
-  Enabled: false
-
-#
-# Would be better but unlikely...
-#
-Style/Documentation:
-  Enabled: false
-
-#
-# Scripts might include on top-level
-#
-Style/MixinUsage:
-  Exclude:
-    - 'scripts/**/*'
-
-Style/RaiseArgs:
-  EnforcedStyle: compact
-
-#
-# Quick single line rescues in specs
-#
-Style/RescueModifier:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
-#
-# Quick single line rescues in specs
-#
-Style/RescueStandardError:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
-#
-# Often used pattern in chaining subjects in specs
-#
-Style/Semicolon:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
+  TargetRubyVersion: 2.7
+  SuggestExtensions: False
+  NewCops: enable

data/Appraisals

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0'
+end

data/CHANGELOG.md

@@ -17,6 +17,46 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Breaks
 
 
+## 3.0.0 - (2022-02-08)
+---
+
+### New
+* Test integration with a Rails application without sprockets
+* Add support for Rails 7.0 and Ruby 3.1
+
+
+### Breaks
+* Default to `public/assets/assets-manifest.json` manifest path matching new default from `webpack-assets-manifest` plugin
+* Only support single manifest source file and error if not found (#9)
+* Use `config.assets_manifest` as the config base to avoid conflicts in apps without sprockets (#9)
+* Drop support for Ruby <2.7
+
+
+## 2.1.2 - (2021-09-05)
+---
+
+### Fixes
+* Return correct fully qualified URLs from manifest when relative URL host or asset host is configured
+
+
+## 2.1.1 - (2021-06-20)
+---
+
+### Fixes
+* Super method signature for keyword arguments
+
+
+## 2.1.0 - (2019-09-11)
+---
+
+### New
+* Automatically add `crossorigin="anonymous"` for SRI resources
+* Separate manifest caching and eager loading
+
+### Changes
+* Remove defunct onboot manifest validation (f3fe8f57)
+
+
 ## 2.0.1 - (2019-08-09)
 ---
 
@@ -33,7 +73,6 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 
 ### Breaks
 * Change `manifest` configuration option into `manifests` to support multiple files
-* Change  configuration option into  to support multiple files
 
 
 ## 1.1.0 - (2019-08-08)

data/Gemfile

@@ -5,5 +5,18 @@ source 'https://rubygems.org'
 # Load gem's dependencies
 gemspec
 
-gem 'rake', '~> 12.0'
+gem 'net-smtp', require: false # not bundled in Ruby 3.1+
+gem 'rails', require: false
+gem 'sprockets-rails', require: false # not included by default in Rails 7+
+gem 'sqlite3', require: false
+
+gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
+gem 'rspec-rails', '~> 5.0'
+
+gem 'pry'
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v7', require: false
+
+group :development do
+  gem 'appraisal'
+end

data/README.md

@@ -1,8 +1,11 @@
 # Rails::Assets::Manifest
 
-Load all assets in your rails application from a `manifest.json`, e.g. generated by [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest).
+[![Gem Version](https://img.shields.io/gem/v/rails-assets-manifest?logo=ruby)](https://rubygems.org/gems/rails-assets-manifest)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jgraichen/rails-assets-manifest/test?logo=github)](https://github.com/jgraichen/rails-assets-manifest/actions)
 
-This gem does not make any assumption on which tool to use to make your assets not how to configure or invoke it. It only requires a manifest JSON. The Manifest must either be a simple string map or must map to objects having a `'src'` attribute. Subresource integrity is supported too:
+Load all assets in your Rails application from a `manifest.json`, e.g. generated by [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest).
+
+This gem does not make any assumption on which tool to use to make your assets not how to configure or invoke it. It only requires a manifest JSON. The manifest must either be a simple string map or must map to objects having a `'src'` attribute. Sub-resource integrity is supported too:
 
 ```json
 {
@@ -17,7 +20,7 @@ This gem does not make any assumption on which tool to use to make your assets n
 }
 ```
 
-This gem does not add new helper methods but extends the existing helpers. SRI is automatically added if available and within a secure context:
+This gem does not add new helper methods but extends the existing helpers. SRI is automatically added if available and within a secure context. A `crossorigin="anonymous"` attribute is automatically added if non is present.
 
 ```slim
 html
@@ -27,8 +30,8 @@ html
 ```
 
 ```html
-<link rel="stylesheet" media="all" href="2b16adf6f756625a0194.css" integrity="sha384-/oreyvcV6U6htGZD0fDWR8/Txezke8KhD0QNgHb660hSaW7M+ZzxxuB4Vo+PuAC9">
-<script src="2b16adf6f756625a0194.js" integrity="sha384-iJ55fQQApbQGxWEWSbWStBabi+yNGxZSQy/010+1Dhxl+rymyhGF4NtjUkOsYv7B"></script>
+<link rel="stylesheet" media="all" href="2b16adf6f756625a0194.css" integrity="sha384-/oreyvcV6U6htGZD0fDWR8/Txezke8KhD0QNgHb660hSaW7M+ZzxxuB4Vo+PuAC9" crossorigin="anonymous">
+<script src="2b16adf6f756625a0194.js" integrity="sha384-iJ55fQQApbQGxWEWSbWStBabi+yNGxZSQy/010+1Dhxl+rymyhGF4NtjUkOsYv7B" crossorigin="anonymous"></script>
 ```
 
 ## Installation
@@ -41,22 +44,39 @@ gem 'rails-assets-manifest'
 
 ## Usage
 
-The manifest path can be configured e.g. in an environment:
+The manifest path can be configured e.g. in an `environments/*.rb` file:
 
 ```ruby
-  config.assets.manifests = %w(public/.asset-manifest.json)
+  config.assets_manifest.path = "public/.asset-manifest.json"
 ```
 
-If `config.cache_classes` is set to `true` the manifest file be loaded once on boot and raise errors if missing or invalid.
+If `config.cache_classes` is set to `true` the manifest file be loaded once on boot. Assets included with `integrity: true` will raise an error if the integrity option is missing in the manifest.
 
-Assets included with `integrity: true` will raise an error if the integrity option is missing in the manifest.
+## Webpack Assets Manifest Example
 
-Multiple manifests can be loaded by specifying multiple files. Glob patterns are supported:
+The following snippet provides an example configuration for the[webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest) plugin to generating a compatible assets manifest file.
 
-```ruby
-  config.assets.manifests = %w(public/.manifest.*.json lib/manifest.json)
+```ts
+new WebpackAssetsManifest({
+  integrity: true,
+  integrityHashes: ["sha384"],
+  writeToDisk: true,
+  entrypoints: false,
+  entrypointsUseAssets: true,
+  publicPath,
+  // Ignore a source maps and compressed files.
+  customize(e) {
+    if (e.key.endsWith(".map") || e.key.endsWith(".gz")) {
+      return false;
+    }
+
+    return e;
+  },
+})
 ```
 
+Specifying `writeToDisk: true` allows running the `webpack-dev-server` as proxy to the Rails application, and still generate correct assets links in Rails code. `rails-assets-manifest` defaults to using `public/assets/assets-manifest.json` as the manifest path.
+
 ## TODO
 
 * Override/Join with `asset_host` URL?
@@ -72,7 +92,7 @@ Multiple manifests can be loaded by specifying multiple files. Glob patterns are
 
 ## MIT License
 
-Copyright (c) 2018 Jan Graichen
+Copyright (c) 2018-2022 Jan Graichen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'rails/assets/manifest'

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "sprockets-rails", require: false
+gem "net-smtp", require: false
+gem "sqlite3", require: false
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rspec-rails", "~> 5.0"
+gem "rubocop", "~> 1.14"
+gem "pry"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "sprockets-rails", require: false
+gem "net-smtp", require: false
+gem "sqlite3", require: false
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rspec-rails", "~> 5.0"
+gem "rubocop", "~> 1.14"
+gem "pry"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "sprockets-rails", require: false
+gem "net-smtp", require: false
+gem "sqlite3", require: false
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rspec-rails", "~> 5.0"
+gem "rubocop", "~> 1.14"
+gem "pry"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+gem "sprockets-rails", require: false
+gem "net-smtp", require: false
+gem "sqlite3", require: false
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rspec-rails", "~> 5.0"
+gem "rubocop", "~> 1.14"
+gem "pry"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/lib/rails/assets/manifest/helper.rb

@@ -2,22 +2,44 @@
 
 module Rails::Assets::Manifest
   module Helper
-    def compute_asset_path(name, **_kwargs)
+    URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}i.freeze
+
+    def path_to_asset(source, options)
+      if (entry = ::Rails::Assets::Manifest.lookup(path_with_extname(source, options)))
+        # Directly return the entry src if it is a fully qualified URL. Otherwise,
+        # Rails will join the URL with `relative_url_root` and/or asset host.
+        return entry.src if URI_REGEXP.match?(entry.src)
+
+        if entry.src[0] == '/'
+          # When the asset name starts with a slash, Rails will skip an
+          # additional lookup via `#compute_asset_path` and directly use the
+          # provided path. As we already have looked up the manifest entry here,
+          # we can pass the entry source, but only *if* it starts with a slash.
+          return super entry.src, options
+        end
+      end
+
+      super
+    end
+
+    def compute_asset_path(name, _options)
       ::Rails::Assets::Manifest.lookup!(name).src
-    rescue EntryMissing => e
+    rescue EntryMissing
       return super if Rails::Assets::Manifest.passthrough?
+
       raise
     end
 
-    def asset_integrity(name, **kwargs)
-      ::Rails::Assets::Manifest.lookup!(path_with_extname(name, **kwargs)).integrity
-    rescue EntryMissing => e
+    def asset_integrity(name, options)
+      ::Rails::Assets::Manifest.lookup!(path_with_extname(name, options)).integrity
+    rescue EntryMissing
       return super if Rails::Assets::Manifest.passthrough?
+
       raise
     end
 
     def javascript_include_tag(*sources, integrity: nil, **kwargs)
-      return super(*sources, **kwargs) unless compute_integrity?(integrity)
+      return super(*sources, **kwargs) unless manifest_use_integrity?(integrity)
 
       with_integrity(sources, integrity, :javascript, **kwargs) do |source, options|
         super(source, options)
@@ -25,7 +47,7 @@ module Rails::Assets::Manifest
     end
 
     def stylesheet_link_tag(*sources, integrity: nil, **kwargs)
-      return super(*sources, **kwargs) unless compute_integrity?(integrity)
+      return super(*sources, **kwargs) unless manifest_use_integrity?(integrity)
 
       with_integrity(sources, integrity, :stylesheet, **kwargs) do |source, options|
         super(source, options)
@@ -34,38 +56,43 @@ module Rails::Assets::Manifest
 
     private
 
-    def compute_integrity?(option)
-      return false unless secure_subresource_integrity_context?
+    def manifest_use_integrity?(option)
+      return false unless secure_request_context?
 
       option || option.nil?
     end
 
+    # http://www.w3.org/TR/SRI/#non-secure-contexts-remain-non-secure
+    def secure_request_context?
+      respond_to?(:request) && request && (request.local? || request.ssl?)
+    end
+
     def with_integrity(sources, required, type, **kwargs)
       sources.map do |source|
         path = path_with_extname(source, type: type, **kwargs)
 
         # integrity hash passed directly
         if required.is_a?(String)
-          next yield(source, integrity: required, **kwargs)
+          next yield(source, integrity: required, crossorigin: 'anonymous', **kwargs)
+        end
 
         # Explicit passed `true` option
-        elsif required
+        if required
           integrity = asset_integrity(source, type: type, **kwargs)
 
-          if !integrity
-            raise IntegrityMissing.new "SRI missing for #{path}"
-          end
+          raise IntegrityMissing.new "SRI missing for #{path}" unless integrity
 
-          next yield(source, integrity: integrity, **kwargs)
+          next yield(source, integrity: integrity, crossorigin: 'anonymous', **kwargs)
+        end
 
         # No integrity option passed or `nil` default from above
-        elsif required.nil?
+        if required.nil?
           entry = ::Rails::Assets::Manifest.lookup(path)
 
           # Only if it is an asset from our manifest and there is an integrity
           # we default to adding one
-          if(entry && entry.integrity)
-            next yield(source, integrity: entry.integrity, **kwargs)
+          if entry && entry.integrity
+            next yield(source, integrity: entry.integrity, crossorigin: 'anonymous', **kwargs)
           end
         end
 
@@ -73,10 +100,6 @@ module Rails::Assets::Manifest
       end.join.html_safe
     end
 
-    def secure_subresource_integrity_context?
-      respond_to?(:request) && (request&.local? || request&.ssl?)
-    end
-
     def path_with_extname(path, options)
       path = path.to_s
       "#{path}#{compute_asset_extname(path, options)}"

data/lib/rails/assets/manifest/manifest.rb

@@ -4,11 +4,9 @@ module Rails::Assets::Manifest
   class Manifest
     attr_reader :path
 
-    def initialize(files:, cache: true)
-      @files = Array(files).flatten.each(&:freeze).freeze
+    def initialize(path, cache: true)
+      @path = Rails.root.join(path).to_s.freeze
       @cache = cache
-
-      data if cache?
     end
 
     def cache?
@@ -22,7 +20,7 @@ module Rails::Assets::Manifest
     def lookup!(name)
       lookup(name) || begin
         raise EntryMissing.new <<~ERROR
-          Can't find #{name} in #{path}. Your manifests contain:
+          Can't find #{name} in #{path}. Your manifest contain:
           #{JSON.pretty_generate(data.keys)}
         ERROR
       end
@@ -32,6 +30,10 @@ module Rails::Assets::Manifest
       data.key?(name.to_s)
     end
 
+    def eager_load!
+      data
+    end
+
     private
 
     Entry = Struct.new(:src, :integrity) do
@@ -48,13 +50,9 @@ module Rails::Assets::Manifest
       end
     end
 
-    def files
-      @files.map {|path| Dir.glob(path) }.flatten
-    end
-
     def load
-      files.each_with_object({}) do |file, entries|
-        JSON.parse(File.read(file)).each_pair do |key, entry|
+      {}.tap do |entries|
+        JSON.parse(File.read(path)).each_pair do |key, entry|
           if entry.is_a?(String)
             entries[key] = Entry.new(entry, nil)
           elsif entry.is_a?(Hash) && entry.key?('src')
@@ -68,7 +66,7 @@ module Rails::Assets::Manifest
       raise ManifestMissing.new <<~ERROR
         Asset manifest does not exist: #{e}
       ERROR
-    rescue => e
+    rescue StandardError => e
       raise ManifestInvalid.new <<~ERROR
         Asset manifest could not be loaded: #{e}
       ERROR

data/lib/rails/assets/manifest/railtie.rb

@@ -4,48 +4,27 @@ module Rails
   module Assets
     module Manifest
       class Railtie < ::Rails::Railtie
-        # If this plugin is used with sprockets this option
-        # already exists and must not be overriden. Otherwise
-        # all sprockets default options are removed breaking
-        # sprockets.
-        unless config.respond_to?(:assets)
-          config.assets = ::ActiveSupport::OrderedOptions.new
-        end
+        config.assets_manifest = ::ActiveSupport::OrderedOptions.new
 
-        # Path where the manifest files are loaded from.
-        config.assets.manifests = ['public/assets/manifest.json']
+        # Path where the manifest file is loaded from.
+        config.assets_manifest.path = 'public/assets/assets-manifest.json'
 
-        # If set to true missing assets will not raise an
-        # exception but are passed through to sprockets
-        # or rails own asset methods.
-        config.assets.passthrough = false
+        # If set to true missing assets will not raise an exception but are
+        # passed through to sprockets or rails own asset methods.
+        config.assets_manifest.passthrough = false
 
         config.after_initialize do |_|
           ActiveSupport.on_load(:action_view) do
-            include Helper
+            prepend Helper
           end
         end
 
-        initializer 'rails-assets-manifest' do |app|
-          ::Rails::Assets::Manifest.instance if server?
-        end
-
-        private
-
-        def server?
-          !(console? || generator? || rake?)
-        end
-
-        def console?
-          defined?(Rails::Console)
-        end
-
-        def generator?
-          defined?(Rails::Generators)
+        config.to_prepare do
+          ::Rails::Assets::Manifest.prepare!
         end
 
-        def rake?
-          File.basename($0) == "rake"
+        config.before_eager_load do
+          ::Rails::Assets::Manifest.eager_load!
         end
       end
     end

data/lib/rails/assets/manifest/version.rb

@@ -4,12 +4,12 @@ module Rails
   module Assets
     module Manifest
       module VERSION
-        MAJOR = 2
+        MAJOR = 3
         MINOR = 0
-        PATCH = 1
+        PATCH = 0
         STAGE = nil
 
-        STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
+        STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.')
 
         def self.to_s
           STRING

data/lib/rails/assets/manifest.rb

@@ -13,25 +13,37 @@ module Rails
       require 'rails/assets/manifest/railtie' if defined?(Rails::Railtie)
 
       class ManifestMissing < StandardError; end
+
       class ManifestInvalid < StandardError; end
+
       class EntryMissing < StandardError; end
+
       class IntegrityMissing < StandardError; end
 
       class << self
         delegate :lookup, :lookup!, to: :instance
 
-        def instance
-          @instance ||= begin
+        attr_reader :instance
+
+        def prepare!
+          @instance = begin
             config = Rails.application.config
 
-            Manifest.new \
-              files: config.assets.manifests,
-              cache: config.cache_classes
+            Manifest.new(
+              config.assets_manifest.path,
+              cache: config.cache_classes,
+            )
           end
         end
 
+        def eager_load!
+          return unless @instance
+
+          @instance.eager_load!
+        end
+
         def passthrough?
-          Rails.application.config.assets.passthrough
+          Rails.application.config.assets_manifest.passthrough
         end
       end
     end

data/rails-assets-manifest.gemspec

@@ -14,9 +14,10 @@ Gem::Specification.new do |spec|
   spec.description   = 'Load all rails assets from an external manifest.'
   spec.homepage      = 'https://github.com/jgraichen/rails-assets-manifest'
 
-  spec.metadata['homepage_uri']    = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/jgraichen/rails-assets-manifest'
-  spec.metadata['changelog_uri']   = 'https://github.com/jgraichen/rails-assets-manifest/blob/master/CHANGELOG.md'
+  spec.metadata['homepage_uri']          = spec.homepage
+  spec.metadata['source_code_uri']       = 'https://github.com/jgraichen/rails-assets-manifest'
+  spec.metadata['changelog_uri']         = 'https://github.com/jgraichen/rails-assets-manifest/blob/master/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -28,6 +29,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.7.0'
+
   spec.add_dependency 'activesupport', '> 4.2'
   spec.add_dependency 'railties', '> 4.2'
 

data/renovate.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["config:base", "schedule:earlyMondays"]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-assets-manifest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,10 +60,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -71,23 +72,24 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails-4-2.gemfile
-- gemfiles/rails-5-0.gemfile
-- gemfiles/rails-5-1.gemfile
-- gemfiles/rails-5-2.gemfile
-- gemfiles/rails-master.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/rails/assets/manifest.rb
 - lib/rails/assets/manifest/helper.rb
 - lib/rails/assets/manifest/manifest.rb
 - lib/rails/assets/manifest/railtie.rb
 - lib/rails/assets/manifest/version.rb
 - rails-assets-manifest.gemspec
+- renovate.json
 homepage: https://github.com/jgraichen/rails-assets-manifest
 licenses: []
 metadata:
   homepage_uri: https://github.com/jgraichen/rails-assets-manifest
   source_code_uri: https://github.com/jgraichen/rails-assets-manifest
   changelog_uri: https://github.com/jgraichen/rails-assets-manifest/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -96,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Load all rails assets from an external manifest.

data/.travis.yml

@@ -1,37 +0,0 @@
-dist: xenial
-language: ruby
-cache: bundler
-
-rvm:
-- 2.6.3
-- 2.5.5
-
-gemfile:
-- gemfiles/rails-5-2.gemfile
-- gemfiles/rails-master.gemfile
-
-before_install:
-- gem update --system
-- gem install bundler
-
-script:
-- bundle exec rspec spec
-
-jobs:
-  allow_failures:
-  - gemfile: gemfiles/rails-master.gemfile
-
-  include:
-  - stage: Release
-    rvm: 2.6.3
-    env: []
-    script: skip
-    install: skip
-    deploy:
-      provider: rubygems
-      api_key:
-        secure: m5gUzb8J40lo4EJ2xE8XwoeHq4S3ZEDE+AyikDHzGKc5NEQQcCRoc469UlDO7fYfBHGKLh2eEe6+e/T+dyRE/C0qE/tfd6pVWf8xdyzt9+rB0zM3k7pR2Aud2hZ8NFF4bAQ28OvQ2y9pWWLVS9Bn/C0Xou951yZM+vufPVZpX7+08Aw+ZdPQrmg+v9SxsvWElm/is0CMjsHxpEy1vpyyBlF/DhNpHgd+69nupyTuZP8bg3lirZexek0xNaccNpflmrUeRwE7yofVGMfrRhvm5kOniYI+sQl/Zwru9+hK2WaSzfX/ou4ENihiLDGo5gdWeYcyLbS61yQARsRn21cN6SA0iYVuVnAruHC3uoxRh7ty1H8s3aUJnPTnnBj5cnfP9pqOyZI8zFi54CujkEFbRVLlWfGjKtCScgFBwkpXS5aB6CBplulMrX3kz/jYXFgodXLsV10WD725WGJ2Jkb52PoT5i2GyA/Ao746s7+wPIEV/l8NAurcroSHOzr9PcAUG/CwdzgidSnLfwl+qplMCGaUHtdHkPaRHqJL9j4BmcqoGVMaU0a4mAXsrlJG/drT2PMMrREKChtnQPtWg3L9HHDHBIKuXZCIQ7G9n2Dz7lpWnyKZKjJTcFyZWbbnKHLXlE1KDBUiG9qqrYbpky+IEPUt4jZ1W8hx4tKGjNlNwjU=
-      gem: rails-assets-manifest
-      on:
-        tags: true
-        repo: jgraichen/rails-assets-manifest

data/gemfiles/rails-4-2.gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 4.2.0'
-gem 'railties', '~> 4.2.0'

data/gemfiles/rails-5-0.gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.0.0'
-gem 'railties', '~> 5.0.0'

data/gemfiles/rails-5-1.gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.1.0'
-gem 'railties', '~> 5.1.0'

data/gemfiles/rails-5-2.gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.2.0'
-gem 'railties', '~> 5.2.0'

data/gemfiles/rails-master.gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', git: 'https://github.com/rails/rails'
-gem 'railties', git: 'https://github.com/rails/rails'