rails-assets-manifest 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803f622685cadb160b0cf327865bf93587e178a4ffffead1f8605f9934cd6416
-  data.tar.gz: 5e41faf3bfb89d88005c3667d916ace976a4800c1b8336d1763e24b554b5dcd6
+  metadata.gz: 4486b5a02b2aea1cfdcc7afbd89a0748b6f746476175335a9af1d22afb0d4ffa
+  data.tar.gz: e2007d8ac77c1183d5d5f598b1b6442ec09abe36b139c93c5a693330ffc41001
 SHA512:
-  metadata.gz: dd37845719179bf39ec81db748348b6d761a7877d1a0e3ddc20eb74115f45f6c0992c014a3be9087b3cdc432ce91faf87f2fcacc0bcdc2bd4a3c6dacc1da64ef
-  data.tar.gz: 5741fd20f61a7bde1f5acd7db3aa440a9613e125edc24b088e52a9ad3e6e1dec3d01c32c754a8120aadad66f2fb1195e58748642b6e4bfae8d1c169ddd7ae128
+  metadata.gz: db93bb819d42cbb4771404d560d50c37c4cd97fe4cfabdf764a5b0efc49ccfc0bf6a1f644bc46204a4cabfb2bdbf6d77ddf100105a0231f796f41f0b940b1bf2
+  data.tar.gz: be4ebdfe6625038294029a2bf2916dff4488184716a69fcb8e7f18fc4db9375953ab501bdea59f933b4d6e1ca3357235b71544b4a236ebe239956a4ec07793f6

data/.github/workflows/test.yml

@@ -0,0 +1,61 @@
+---
+name: test
+on: push
+jobs:
+  rspec:
+    name: "Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}"
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+        rails:
+          - "6.1"
+          - "6.0"
+          - "5.2"
+          - master
+        exclude:
+          - ruby: "3.0"
+            rails: "5.2"
+          - ruby: "2.6"
+            rails: master
+          - ruby: "2.5"
+            rails: master
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - run: bundle exec rspec --color
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - 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,106 +1,18 @@
-require:
-  - rubocop-rspec
-
 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
+    - '**/*.rb'
+  TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/CaseIndentation:
   EnforcedStyle: end
+  IndentOneStep: true
   SupportedStyles:
     - case
     - end
-  IndentOneStep: true
 
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
 
 Layout/SpaceInsideBlockBraces:
   EnforcedStyle: space
@@ -111,101 +23,26 @@ 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
+    - spec/**/*_spec.rb
 
 Metrics/LineLength:
   Exclude:
-    - 'db/**/*'
-    - 'spec/**/*'
-    - 'config/**/*'
-
-Metrics/MethodLength:
-  Exclude:
-    - 'db/**/*'
-
-
-
-# -----------------------------------------------------------------------------
-#                                   Style
+    - spec/**/*_spec.rb
 
-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
-
+Style/TrivialAccessors:
+  AllowPredicates: true

data/Appraisals

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+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
+
+appraise 'rails-master' do
+  gem 'rails', github: 'rails/rails'
+end

data/CHANGELOG.md

@@ -17,6 +17,13 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Breaks
 
 
+## 2.1.1 - (2021-06-20)
+---
+
+### Fixes
+* Super method signature for keyword arguments
+
+
 ## 2.1.0 - (2019-09-11)
 ---
 

data/Gemfile

@@ -5,5 +5,15 @@ source 'https://rubygems.org'
 # Load gem's dependencies
 gemspec
 
-gem 'rake', '~> 12.0'
+gem 'rails'
+
+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

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,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "rake", "~> 12.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,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "rake", "~> 12.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,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "rake", "~> 12.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_master.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", github: "rails/rails"
+gem "rake", "~> 12.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.rb

@@ -13,8 +13,11 @@ 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
@@ -27,13 +30,14 @@ module Rails
             config = Rails.application.config
 
             Manifest.new \
-              files: config.assets.manifests,
+              files: config.assets.manifests.map {|path| Rails.root.join(path) },
               cache: config.cache_classes
           end
         end
 
         def eager_load!
           return unless @instance
+
           @instance.eager_load!
         end
 

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

@@ -2,17 +2,19 @@
 
 module Rails::Assets::Manifest
   module Helper
-    def compute_asset_path(name, **_kwargs)
+    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
 
@@ -42,9 +44,13 @@ module Rails::Assets::Manifest
 
     # http://www.w3.org/TR/SRI/#non-secure-contexts-remain-non-secure
     def secure_request_context?
-      respond_to?(:request) && self.request && (self.request.local? || self.request.ssl?)
+      respond_to?(:request) && request && (request.local? || request.ssl?)
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Style/IfUnlessModifier
     def with_integrity(sources, required, type, **kwargs)
       sources.map do |source|
         path = path_with_extname(source, type: type, **kwargs)
@@ -52,24 +58,24 @@ module Rails::Assets::Manifest
         # integrity hash passed directly
         if required.is_a?(String)
           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, 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)
+          if entry && entry.integrity
             next yield(source, integrity: entry.integrity, crossorigin: 'anonymous', **kwargs)
           end
         end
@@ -77,6 +83,10 @@ module Rails::Assets::Manifest
         yield(source, **kwargs)
       end.join.html_safe
     end
+    # rubocop:enable Style/IfUnlessModifier
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
 
     def path_with_extname(path, options)
       path = path.to_s

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

@@ -70,7 +70,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

@@ -8,9 +8,7 @@ module Rails
         # 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 = ::ActiveSupport::OrderedOptions.new unless config.respond_to?(:assets)
 
         # Path where the manifest files are loaded from.
         config.assets.manifests = ['public/assets/manifest.json']

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

@@ -6,7 +6,7 @@ module Rails
       module VERSION
         MAJOR = 2
         MINOR = 1
-        PATCH = 0
+        PATCH = 1
         STAGE = nil
 
         STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

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.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2021-06-20 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,17 +72,17 @@ 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_master.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:
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.15
 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'