non-digest-assets 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b93df0270935cdbe8ba8922096e751837547f208016155a29de165eb1f9d44
-  data.tar.gz: fe54746fafaaa49f88054d94c4226de043342ad1df2687e3aa7e03ba64781a6c
+  metadata.gz: 52ec82545e132f58fcccffc6919e17cb7458f293703039e64774824e0d115d42
+  data.tar.gz: b616bfa6fbcf8a8701db9f33ea27cdc9684cababfff96d9c96fe538067aa530e
 SHA512:
-  metadata.gz: bb7ffc2fa8215502b35c300aa964bd7238905f726ed9b9db8952c5b6dd2ce86a6e176a64c06501ec694223b4daa39f5269477e33916b351b74eaf47588293afb
-  data.tar.gz: 713d3227fc6444a26dfdba5f788d3d670cd7392783287b6608705c3e92e86582dbccb169d034fba8d91962abd80fbe5b8f542f8c191a74f72c82d26e890d7698
+  metadata.gz: 1d6653fd4f4538997715f6583ece7dbafa942a8990c0ed5b77f91004a4db1619b2291e9df24f58721709c08f87dc75c8e63e4240f2351e440ddefab890721888
+  data.tar.gz: bb926937f8faa5ca937faf754af3b1aaca51317617a288254e9bf15242633c3b7b324c1b1f721b50e292c8b5c7b8e1ed72b539fb3741259adf4124ca5e03556d

data/README.md

@@ -18,13 +18,13 @@ Just put it in your Gemfile
 gem "non-digest-assets"
 ```
 
-If you want to whitelist non-digest assets for only certain files, you can
-configure a whitelist like this:
+If you want to generate non-digest assets for only certain files, you can
+configure a list of asset selectors like this:
 
 ```ruby
 # config/initializers/non_digest_assets.rb
 
-NonDigestAssets.whitelist += [/tinymce\/.*/, "image.png"]
+NonDigestAssets.asset_selectors += [/tinymce\/.*/, "image.png"]
 ```
 
 Be sure to give either a regex that will match the right assets or the logical
@@ -72,7 +72,7 @@ The sprockets-rails developers do not want to support it.
 Which versions of Ruby and Rails are supported?
 --------------------------------------
 
-This gem is tested with Rails 5.0, 5.1, 5.2 and 6.0 and targets Ruby 2.4 and up.
+This gem is tested with Rails 5.2 and 6.0 and targets Ruby 2.5 and up.
 
 Who wrote this?
 ---------------

data/lib/non-digest-assets.rb

@@ -2,41 +2,55 @@
 
 require "sprockets/manifest"
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/deprecation"
 
 module NonDigestAssets
   mattr_accessor :whitelist
   @@whitelist = []
 
   class << self
-    def assets(assets)
-      return assets if whitelist.empty?
-
-      whitelisted_assets(assets)
-    end
-
-    private
-
-    def whitelisted_assets(assets)
-      assets.select do |logical_path, _digest_path|
-        whitelist.any? do |item|
-          item === logical_path
+    def filter_assets(asset_list)
+      if asset_selectors.empty?
+        asset_list
+      else
+        asset_list.select do |logical_path, _digest_path|
+          asset_selectors.any? do |item|
+            item === logical_path
+          end
         end
       end
     end
-  end
 
-  module CompileWithNonDigest
     # Copy an asset and preserve atime and mtime attributes. If the file exists
     # and is not owned by the calling user, the utime call will fail so we just
     # delete the target file first in any case.
     def copy_file(from, to)
+      return if from == to
+
       FileUtils.rm_f to
       FileUtils.copy_file from, to, :preserve_attributes
     end
 
+    def assets(asset_list)
+      filter_assets(asset_list)
+    end
+
+    alias asset_selectors whitelist
+    alias asset_selectors= whitelist=
+
+    ActiveSupport::Deprecation
+      .deprecate_methods(self,
+                         assets: "use filter_assets instead",
+                         whitelist: "use asset_selectors instead",
+                         "whitelist=": "use asset_selectors= instead",
+                         deprecator: ActiveSupport::Deprecation.new("2.0.0",
+                                                                    "non-digest-assets"))
+  end
+
+  module CompileWithNonDigest
     def compile(*args)
       paths = super
-      NonDigestAssets.assets(assets).each do |(logical_path, digest_path)|
+      NonDigestAssets.filter_assets(assets).each do |(logical_path, digest_path)|
         full_digest_path = File.join dir, digest_path
         full_digest_gz_path = "#{full_digest_path}.gz"
         full_non_digest_path = File.join dir, logical_path
@@ -44,13 +58,13 @@ module NonDigestAssets
 
         if File.exist? full_digest_path
           logger.debug "Writing #{full_non_digest_path}"
-          copy_file full_digest_path, full_non_digest_path
+          NonDigestAssets.copy_file full_digest_path, full_non_digest_path
         else
           logger.debug "Could not find: #{full_digest_path}"
         end
         if File.exist? full_digest_gz_path
           logger.debug "Writing #{full_non_digest_gz_path}"
-          copy_file full_digest_gz_path, full_non_digest_gz_path
+          NonDigestAssets.copy_file full_digest_gz_path, full_non_digest_gz_path
         else
           logger.debug "Could not find: #{full_digest_gz_path}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: non-digest-assets
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alex Speller
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -147,28 +147,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.18.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.4.0
 description: |2
       Rails provides no option to generate both digest and non-digest
       assets. Installing this gem automatically creates both digest and
@@ -194,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Make the Rails asset pipeline generate non-digest along with digest assets