sprockets-rails 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 233f747991d3fc5bd6219a99e3eedf0f04460ef2
-  data.tar.gz: 0398d6281cd9879088a43fa35707a09485c7bd4d
+SHA256:
+  metadata.gz: c96f2a174f4f2e80b8c853df88db8687d2aa25e3884dbfeb56509cee537b4c74
+  data.tar.gz: f6147fa621580ff55996a9c53dab30d26b0f5197b085779342271a801119ff8b
 SHA512:
-  metadata.gz: fb5fa5f828fac3bb652a1981134be5dc2983b936858da7ec8e336a70da0739df1a90c551ec6e80de45a8aec18c40f58a6ce5a885dc157c97c98d88291e57268c
-  data.tar.gz: 129def55fa022f362bc3280801a99fe7cd984470777015386ce3ecd9ecdb52d00aa1d5e35ab8f6d0b5f80907103bb32db96c99fe6a512b4faebfd16d8d90afb0
+  metadata.gz: c475cd351bc6ca97196cf0d98ef86db40f493f75eff770e6d6643bc3df85b01e304dcaa119d30400564186611ee52753fa73c3517b8a14f2152ed2c556329585
+  data.tar.gz: a3cb4867a60e31c591b3342d33602653b6b7c893698c3e754d33524b4f85e5c0dd98f5dcad4a8788fca40d94fcc28289dfac006439781277c20ecb6979e5d1e4

data/README.md

@@ -138,7 +138,7 @@ The following plugins provide some extras for the Sprockets Asset Pipeline.
 * [coffee-rails](https://github.com/rails/coffee-rails)
 * [sass-rails](https://github.com/rails/sass-rails)
 
-**NOTE** That these plugins are optional. The core coffee-script, sass, less, uglify, (any many more) features are built into Sprockets itself. Many of these plugins only provide generators and extra helpers. You can probably get by without them.
+**NOTE** That these plugins are optional. The core coffee-script, sass, less, uglify, (and many more) features are built into Sprockets itself. Many of these plugins only provide generators and extra helpers. You can probably get by without them.
 
 
 ## Changes from Rails 3.x
@@ -150,6 +150,15 @@ The following plugins provide some extras for the Sprockets Asset Pipeline.
 * `config.assets.manifest` (if used) must now include the manifest filename, e.g. `Rails.root.join('config/manifest.json')`. It cannot be a directory.
 * Two cleanup tasks: `rake assets:clean` is now a safe cleanup that only removes older assets that are no longer used, while `rake assets:clobber` nukes the entire `public/assets` directory. The clean task allows for rolling deploys that may still be linking to an old asset while the new assets are being built.
 
+### But what if I want sprockets to generate non-digest assets?
+
+You have several options:
+
+* Use the [non-digest-assets gem](https://github.com/mvz/non-digest-assets).
+* Use the [sprockets-redirect gem](https://github.com/sikachu/sprockets-redirect).
+* Use the [smart_assets gem](https://github.com/zarqman/smart_assets).
+* Create [a rake task](https://github.com/rails/sprockets-rails/issues/49#issuecomment-20535134) to pre-generate a non-digest version in `public/`.
+
 ## Experimental
 
 ### [SRI](http://www.w3.org/TR/SRI/) support
@@ -187,6 +196,4 @@ Sprockets Rails is released under the [MIT License](MIT-LICENSE).
 
 ## Code Status
 
-* [![Travis CI](https://api.travis-ci.org/rails/sprockets-rails.svg)](http://travis-ci.org/rails/sprockets-rails)
 * [![Gem Version](https://badge.fury.io/rb/sprockets-rails.svg)](http://badge.fury.io/rb/sprockets-rails)
-* [![Dependencies](https://gemnasium.com/rails/sprockets-rails.svg)](https://gemnasium.com/rails/sprockets-rails)

data/lib/sprockets/rails/asset_url_processor.rb

@@ -0,0 +1,15 @@
+module Sprockets
+  module Rails
+    # Rewrites urls in CSS files with the digested paths
+    class AssetUrlProcessor
+      REGEX = /url\(\s*["']?(?!(?:\#|data|http))([^"'\s)]+)\s*["']?\)/
+      
+      def self.call(input)
+        context = input[:environment].context_class.new(input)
+        data    = input[:data].gsub(REGEX) { |_match| "url(#{context.asset_path($1)})" }
+
+        { data: data }
+      end
+    end
+  end
+end

data/lib/sprockets/rails/context.rb

@@ -1,4 +1,4 @@
-require 'action_view'
+require 'action_view/helpers'
 require 'sprockets'
 
 module Sprockets

data/lib/sprockets/rails/helper.rb

@@ -7,15 +7,16 @@ module Sprockets
   module Rails
     module Helper
       class AssetNotFound < StandardError; end
+      class AssetNotPrecompiled < StandardError; end
 
-      class AssetNotPrecompiled < StandardError
+      class AssetNotPrecompiledError < AssetNotPrecompiled
         include Sprockets::Rails::Utils
         def initialize(source)
           msg =
           if using_sprockets4?
             "Asset `#{ source }` was not declared to be precompiled in production.\n" +
             "Declare links to your assets in `app/assets/config/manifest.js`.\n\n" +
-            "  //= link #{ source }\n" +
+            "  //= link #{ source }\n\n" +
             "and restart your server"
           else
             "Asset was not declared to be precompiled in production.\n" +
@@ -57,7 +58,7 @@ module Sprockets
       end
 
       def self.extended(obj)
-        obj.class_eval do
+        obj.singleton_class.class_eval do
           attr_accessor(*VIEW_ACCESSORS)
 
           remove_method :assets_environment
@@ -79,7 +80,7 @@ module Sprockets
         if asset_path = resolve_asset_path(path, debug)
           File.join(assets_prefix || "/", legacy_debug_path(asset_path, debug))
         else
-          message =  "The asset #{ path.inspect } is not present in the asset pipeline."
+          message =  "The asset #{ path.inspect } is not present in the asset pipeline.\n"
           raise AssetNotFound, message unless unknown_asset_fallback
 
           if respond_to?(:public_compute_asset_path)
@@ -88,7 +89,7 @@ module Sprockets
             message << "To bypass the asset pipeline and preserve this behavior,\n"
             message << "use the `skip_pipeline: true` option.\n"
 
-            call_stack = respond_to?(:caller_locations) ? caller_locations : caller
+            call_stack = Kernel.respond_to?(:caller_locations) && ::Rails::VERSION::MAJOR >= 5 ? caller_locations : caller
             ActiveSupport::Deprecation.warn(message, call_stack)
           end
           super
@@ -351,8 +352,16 @@ module Sprockets
         end
 
         private
-          def find_asset(path, options = {})
-            @env[path, options]
+          if RUBY_VERSION >= "2.7"
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def find_asset(path, options = {})
+                @env[path, **options]
+              end
+            RUBY
+          else
+            def find_asset(path, options = {})
+              @env[path, options]
+            end
           end
 
           def precompiled?(path)
@@ -360,7 +369,7 @@ module Sprockets
           end
 
           def raise_unless_precompiled_asset(path)
-            raise Helper::AssetNotPrecompiled.new(path) if @check_precompiled_asset && !precompiled?(path)
+            raise Helper::AssetNotPrecompiledError.new(path) if @check_precompiled_asset && !precompiled?(path)
           end
       end
     end

data/lib/sprockets/rails/sourcemapping_url_processor.rb

@@ -0,0 +1,22 @@
+module Sprockets
+  module Rails
+    # Rewrites source mapping urls with the digested paths and protect against semicolon appending with a dummy comment line
+    class SourcemappingUrlProcessor
+      REGEX = /\/\/# sourceMappingURL=(.*\.map)/
+
+      def self.call(input)
+        env     = input[:environment]
+        context = env.context_class.new(input)
+        data    = input[:data].gsub(REGEX) do |_match|
+          ensure_file_is_present = context.resolve($1)
+          "//# sourceMappingURL=#{context.asset_path($1)}\n//!\n"
+        rescue Sprockets::FileNotFound
+          env.logger.warn "Removed sourceMappingURL comment for missing asset '#{$1}' from #{input[:filename]}"
+          nil
+        end
+
+        { data: data }
+      end
+    end
+  end
+end

data/lib/sprockets/rails/task.rb

@@ -2,7 +2,6 @@ require 'rake'
 require 'rake/sprocketstask'
 require 'sprockets'
 require 'action_view'
-require 'action_view/base'
 
 module Sprockets
   module Rails

data/lib/sprockets/rails/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Rails
-    VERSION = "3.2.0"
+    VERSION = "3.4.0"
   end
 end

data/lib/sprockets/railtie.rb

@@ -4,6 +4,9 @@ require 'action_controller/railtie'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/numeric/bytes'
 require 'sprockets'
+
+require 'sprockets/rails/asset_url_processor'
+require 'sprockets/rails/sourcemapping_url_processor'
 require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
 require 'sprockets/rails/quiet_assets'
@@ -76,7 +79,8 @@ module Sprockets
         "  //= link_tree ../images\n"  +
         "  //= link_directory ../javascripts .js\n" +
         "  //= link_directory ../stylesheets .css\n"  +
-        "and restart your server"
+        "and restart your server\n\n" +
+        "For more information see: https://github.com/rails/sprockets/blob/070fc01947c111d35bb4c836e9bb71962a8e0595/UPGRADING.md#manifestjs"
         super msg
       end
     end
@@ -115,6 +119,14 @@ module Sprockets
       end
     end
 
+    initializer :asset_url_processor do |app|
+      Sprockets.register_postprocessor "text/css", ::Sprockets::Rails::AssetUrlProcessor
+    end
+
+    initializer :asset_sourcemap_url_processor do |app|
+      Sprockets.register_postprocessor "application/javascript", ::Sprockets::Rails::SourcemappingUrlProcessor
+    end
+
     config.assets.version     = ""
     config.assets.debug       = false
     config.assets.compile     = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Joshua Peek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: josh@joshpeek.com
 executables: []
 extensions: []
@@ -117,10 +117,12 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/sprockets/rails.rb
+- lib/sprockets/rails/asset_url_processor.rb
 - lib/sprockets/rails/context.rb
 - lib/sprockets/rails/helper.rb
 - lib/sprockets/rails/quiet_assets.rb
 - lib/sprockets/rails/route_wrapper.rb
+- lib/sprockets/rails/sourcemapping_url_processor.rb
 - lib/sprockets/rails/task.rb
 - lib/sprockets/rails/utils.rb
 - lib/sprockets/rails/version.rb
@@ -129,7 +131,7 @@ homepage: https://github.com/rails/sprockets-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,16 +139,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Sprockets Rails integration
 test_files: []