sprockets-rails 3.0.4 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7cb5a6b14d9c7bb706dad33e5d930e8f528d212
-  data.tar.gz: 76221e850d34d167aa5a26d7653248d0197482c5
+SHA256:
+  metadata.gz: 801a6cbc13340fb4c74ecf9b7aa2d5c6c563605e3462512e0073f268e269fe8d
+  data.tar.gz: facde95b73f355f987059128c7f6d852b5b8845d26f2eca5214b4fc37ded168d
 SHA512:
-  metadata.gz: 9fec7c6db539f43f5527edb868e65a1a73530be359faa79854cf12a8702b9ec9fb3b0a6a99706664bc6662d2b09a3420dbfb65c98c64df2d7a00b00403618cbe
-  data.tar.gz: b7e049037095f8f7890236d0dc08f4bdbea922b2b50ed7155a498b8f0cd2195a3f1eb076acf932f34fe93fb2398700321fb70e7a1ff8aeaad1a6162c3e593f88
+  metadata.gz: 7f6c2f179ba5b3294ad0b49357c4a7a50c207f221d6cbb5d9cad406b1143ee5ff9d5a71897f3f6a2bd9709eda8d5e5bad5380e4defa1e135700cc3edd9669749
+  data.tar.gz: cbd34277b1e2e89c5ddded1b616ce179a269e384f1781b7032972c966737803e725440f5a23951383adf6b4a8705b50a307eb94a2bd6055ab42dcfc505aa468c

data/README.md

@@ -48,9 +48,12 @@ Each asset task will invoke `assets:environment` first. By default this loads th
 
 Also see [Sprockets::Rails::Task](https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/rails/task.rb) and [Rake::SprocketsTask](https://github.com/rails/sprockets/blob/master/lib/rake/sprocketstask.rb).
 
-
 ### Initializer options
 
+**`config.assets.unknown_asset_fallback`**
+
+When set to a truthy value, a result will be returned even if the requested asset is not found in the asset pipeline. When set to a falsey value it will raise an error when no asset is found in the pipeline. Defaults to `true`.
+
 **`config.assets.precompile`**
 
 Add additional assets to compile on deploy. Defaults to `application.js`, `application.css` and any other non-js/css file under `app/assets`.
@@ -59,6 +62,9 @@ Add additional assets to compile on deploy. Defaults to `application.js`, `appli
 
 Add additional load paths to this Array. Rails includes `app/assets`, `lib/assets` and `vendor/assets` for you already. Plugins might want to add their custom paths to this.
 
+**`config.assets.quiet`**
+
+Suppresses logger output for asset requests. Uses the `config.assets.prefix` path to match asset requests. Defaults to `false`.
 
 **`config.assets.version`**
 
@@ -121,6 +127,10 @@ is not enabled, then we check the environment if compiling is enabled:
 ```
 If the resolver list is empty (e.g. if debug is true and compile is false), the standard rails public path resolution will be used.
 
+**`config.assets.check_precompiled_asset`**
+
+When enabled, an exception is raised for missing assets. This option is enabled by default.
+
 ## Complementary plugins
 
 The following plugins provide some extras for the Sprockets Asset Pipeline.
@@ -128,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
@@ -138,7 +148,16 @@ The following plugins provide some extras for the Sprockets Asset Pipeline.
 * JS and CSS compressors must be explicitly set. Magic detection has been removed to avoid loading compressors in environments where you want to avoid loading any of the asset libraries. Assign `config.assets.js_compressor = :uglifier` or `config.assets.css_compressor = :sass` for the standard compressors.
 * The manifest file is now in a JSON format. Since it lives in public/ by default, the initial filename is also randomized to obfuscate public access to the resource.
 * `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 and clears your filesystem cache. The clean task allows for rolling deploys that may still be linking to an old asset while the new assets are being built.
+* 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
 
@@ -151,6 +170,8 @@ javascript_include_tag :application, integrity: true
 # => "<script src="/assets/application.js" integrity="sha256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs="></script>"
 ```
 
+Note that sprockets-rails only adds integrity hashes to assets when served in a secure context (over an HTTPS connection or localhost).
+
 
 ## Contributing to Sprockets Rails
 
@@ -175,6 +196,5 @@ 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)
+* [![Travis CI](https://travis-ci.org/rails/sprockets-rails.svg?branch=master)](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/context.rb

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

data/lib/sprockets/rails/helper.rb

@@ -6,19 +6,18 @@ require 'sprockets/rails/utils'
 module Sprockets
   module Rails
     module Helper
-      class AssetNotPrecompiled < StandardError
+      class AssetNotFound < StandardError; end
+      class AssetNotPrecompiled < StandardError; end
+
+      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 `assets/config/manifest.js`.\n" +
-            "Examples:\n" +
-            "`//= link ../javascripts/application.js`\n" +
-            "`//= link_directory ../javascripts .js`\n" +
-            "`//= link_directory ../stylesheets .css`\n" +
-            "`//= link_tree ../javascripts .js`\n" +
-            "`//= link_tree ../images`\n"
+            "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\n" +
+            "and restart your server"
           else
             "Asset was not declared to be precompiled in production.\n" +
             "Add `Rails.application.config.assets.precompile += " +
@@ -37,7 +36,8 @@ module Sprockets
         :assets_environment, :assets_manifest,
         :assets_precompile, :precompiled_asset_checker,
         :assets_prefix, :digest_assets, :debug_assets,
-        :resolve_assets_with
+        :resolve_assets_with, :check_precompiled_asset,
+        :unknown_asset_fallback
       ]
 
       def self.included(klass)
@@ -58,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
@@ -72,12 +72,26 @@ module Sprockets
         end
       end
 
+      # Writes over the built in ActionView::Helpers::AssetUrlHelper#compute_asset_path
+      # to use the asset pipeline.
       def compute_asset_path(path, options = {})
         debug = options[:debug]
 
         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.\n"
+          raise AssetNotFound, message unless unknown_asset_fallback
+
+          if respond_to?(:public_compute_asset_path)
+            message << "Falling back to an asset that may be in the public folder.\n"
+            message << "This behavior is deprecated and will be removed.\n"
+            message << "To bypass the asset pipeline and preserve this behavior,\n"
+            message << "use the `skip_pipeline: true` option.\n"
+
+            call_stack = Kernel.respond_to?(:caller_locations) && ::Rails::VERSION::MAJOR >= 5 ? caller_locations : caller
+            ActiveSupport::Deprecation.warn(message, call_stack)
+          end
           super
         end
       end
@@ -196,7 +210,7 @@ module Sprockets
         # Only serve integrity metadata for HTTPS requests:
         #   http://www.w3.org/TR/SRI/#non-secure-contexts-remain-non-secure
         def secure_subresource_integrity_context?
-          respond_to?(:request) && self.request && self.request.ssl?
+          respond_to?(:request) && self.request && (self.request.local? || self.request.ssl?)
         end
 
         # Enable split asset debugging. Eventually will be deprecated
@@ -303,6 +317,7 @@ module Sprockets
           raise ArgumentError, 'config.assets.resolve_with includes :environment, but app.assets is nil' unless view.assets_environment
           @env = view.assets_environment
           @precompiled_asset_checker = view.precompiled_asset_checker
+          @check_precompiled_asset = view.check_precompiled_asset
         end
 
         def asset_path(path, digest, allow_non_precompiled = false)
@@ -337,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)
@@ -346,7 +369,7 @@ module Sprockets
           end
 
           def raise_unless_precompiled_asset(path)
-            raise Helper::AssetNotPrecompiled.new(path) unless precompiled?(path)
+            raise Helper::AssetNotPrecompiled.new(path) if @check_precompiled_asset && !precompiled?(path)
           end
       end
     end

data/lib/sprockets/rails/quiet_assets.rb

@@ -0,0 +1,18 @@
+module Sprockets
+  module Rails
+    class QuietAssets
+      def initialize(app)
+        @app = app
+        @assets_regex = %r(\A/{0,2}#{::Rails.application.config.assets.prefix})
+      end
+
+      def call(env)
+        if env['PATH_INFO'] =~ @assets_regex
+          ::Rails.logger.silence { @app.call(env) }
+        else
+          @app.call(env)
+        end
+      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.0.4"
+    VERSION = "3.2.2"
   end
 end

data/lib/sprockets/railtie.rb

@@ -6,6 +6,7 @@ require 'active_support/core_ext/numeric/bytes'
 require 'sprockets'
 require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
+require 'sprockets/rails/quiet_assets'
 require 'sprockets/rails/route_wrapper'
 require 'sprockets/rails/version'
 require 'set'
@@ -66,9 +67,24 @@ module Sprockets
   class Railtie < ::Rails::Railtie
     include Sprockets::Rails::Utils
 
+    class ManifestNeededError < StandardError
+      def initialize
+        msg = "Expected to find a manifest file in `app/assets/config/manifest.js`\n" +
+        "But did not, please create this file and use it to link any assets that need\n" +
+        "to be rendered by your app:\n\n" +
+        "Example:\n" +
+        "  //= link_tree ../images\n"  +
+        "  //= link_directory ../javascripts .js\n" +
+        "  //= link_directory ../stylesheets .css\n"  +
+        "and restart your server\n\n" +
+        "For more information see: https://github.com/rails/sprockets/blob/070fc01947c111d35bb4c836e9bb71962a8e0595/UPGRADING.md#manifestjs"
+        super msg
+      end
+    end
+
     LOOSE_APP_ASSETS = lambda do |logical_path, filename|
-        filename.start_with?(::Rails.root.join("app/assets").to_s) &&
-        !['.js', '.css', ''].include?(File.extname(logical_path))
+      filename.start_with?(::Rails.root.join("app/assets").to_s) &&
+      !['.js', '.css', ''].include?(File.extname(logical_path))
     end
 
     class OrderedOptions < ActiveSupport::OrderedOptions
@@ -80,18 +96,34 @@ module Sprockets
     config.assets = OrderedOptions.new
     config.assets._blocks     = []
     config.assets.paths       = []
+    config.assets.precompile  = []
     config.assets.prefix      = "/assets"
     config.assets.manifest    = nil
-    if using_sprockets4?
-      config.assets.precompile  = %w( manifest.js )
-    else
-      config.assets.precompile  = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
+    config.assets.quiet       = false
+
+    initializer :set_default_precompile do |app|
+      if using_sprockets4?
+        raise ManifestNeededError unless ::Rails.root.join("app/assets/config/manifest.js").exist?
+        app.config.assets.precompile += %w( manifest.js )
+      else
+        app.config.assets.precompile += [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
+      end
     end
+
+    initializer :quiet_assets do |app|
+      if app.config.assets.quiet
+        app.middleware.insert_before ::Rails::Rack::Logger, ::Sprockets::Rails::QuietAssets
+      end
+    end
+
     config.assets.version     = ""
     config.assets.debug       = false
     config.assets.compile     = true
     config.assets.digest      = true
     config.assets.cache_limit = 50.megabytes
+    config.assets.gzip        = true
+    config.assets.check_precompiled_asset = true
+    config.assets.unknown_asset_fallback  = true
 
     config.assets.configure do |env|
       config.assets.paths.each { |path| env.append_path(path) }
@@ -124,6 +156,10 @@ module Sprockets
       env.version = config.assets.version
     end
 
+    config.assets.configure do |env|
+      env.gzip = config.assets.gzip if env.respond_to?(:gzip=)
+    end
+
     rake_tasks do |app|
       require 'sprockets/rails/task'
       Sprockets::Rails::Task.new(app)
@@ -210,6 +246,8 @@ module Sprockets
 
         self.resolve_assets_with = config.assets.resolve_with
 
+        self.check_precompiled_asset = config.assets.check_precompiled_asset
+        self.unknown_asset_fallback  = config.assets.unknown_asset_fallback
         # Expose the app precompiled asset check to the view
         self.precompiled_asset_checker = -> logical_path { app.asset_precompiled? logical_path }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.2.2
 platform: ruby
 authors:
 - Joshua Peek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: josh@joshpeek.com
 executables: []
 extensions: []
@@ -119,6 +119,7 @@ files:
 - lib/sprockets/rails.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/task.rb
 - lib/sprockets/rails/utils.rb
@@ -128,7 +129,7 @@ homepage: https://github.com/rails/sprockets-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Sprockets Rails integration
 test_files: []