sprockets-rails 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a7ec0aa2c5fd2bbddd32714dead301603b5755
-  data.tar.gz: ce9c1b85209963b5483a73309172012baa73942e
+  metadata.gz: 02d24e7c7f1fde95838d5eea5ac20f508b061246
+  data.tar.gz: 95a911c0f112ba5ea650bdd6df9c9a022c29f5ca
 SHA512:
-  metadata.gz: f5bdd1640fc69db3e648d8371ced294869835bb1d4d50207d4f92152ee1b751c2e0029d73dda06888acff3c6358fae2f6a977eae7de1530bc2582996e25ed9d7
-  data.tar.gz: 73361f7ff7c7b5307a8ce592a272fbc86ce7c780f527bdc8f06908693dc9def6c417d6895a2a02660b2cfe7fe2d61b9906434032e9d86d638cd29d924581f18b
+  metadata.gz: 55c9d95c9d462e5b4cadbbcc9b33f4ef438065807b6ca54f8705a11164bd717e8895d2c07d87dd0ebea22f00eac1864575ef58468760bec3d0c5b52f392b05c1
+  data.tar.gz: fbad182eb782c40bf89bbb0a3631b9a346b0fa0843f13ce20f17cf7f40e45ba49c4b232851f25191ee3bb0f2b99367951fb0f1478abe242777ea483db29fa76b

data/README.md

@@ -51,7 +51,7 @@ end
 
 Each asset task will invoke `assets:environment` first. By default this loads the Rails environment. You can override this task to add or remove dependencies for your specific compilation environment.
 
-Also see [Sprockets::Rails::Task](https://github.com/josh/sprockets-rails/blob/master/lib/sprockets/rails/task.rb) and [Rake::SprocketsTask](https://github.com/sstephenson/sprockets/blob/master/lib/rake/sprocketstask.rb).
+Also see [Sprockets::Rails::Task](https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/rails/task.rb) and [Rake::SprocketsTask](https://github.com/sstephenson/sprockets/blob/master/lib/rake/sprocketstask.rb).
 
 
 ### Initializer options
@@ -85,7 +85,7 @@ Defaults to `/assets`. Changes the directory to compile assets to.
 
 **`config.assets.manifest`**
 
-Defines the full path to be used for the asset precompiler's manifest file. Defaults to using the `config.assets.prefix` directory within the public folder.
+Defines the full path to be used for the asset precompiler's manifest file. Defaults to a randomly-generated filename in the `config.assets.prefix` directory within the public folder.
 
 **`config.assets.digest`**
 
@@ -134,6 +134,7 @@ The following plugins provide some extras for the Sprockets Asset Pipeline.
 * Unmanaged asset paths and urls fallback to linking to public/. This should make it easier to work with both compiled assets and simple static assets. As a side effect, there will never be any "asset not precompiled errors" when linking to missing assets. They will just link to a public file which may or may not exist.
 * 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 = :uglify` 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.
 
 

data/lib/sprockets/rails/helper.rb

@@ -30,6 +30,14 @@ module Sprockets
         end
       end
 
+      class AbsoluteAssetPathError < ArgumentError
+        def initialize(bad_path, good_path, prefix)
+          msg = "Asset names passed to helpers should not include the #{prefix.inspect} prefix. " <<
+                "Instead of #{bad_path.inspect}, use #{good_path.inspect}"
+          super(msg)
+        end
+      end
+
       if defined? ActionView::Helpers::AssetUrlHelper
         include ActionView::Helpers::AssetUrlHelper
         include ActionView::Helpers::AssetTagHelper
@@ -77,17 +85,12 @@ module Sprockets
       # Computes the full URL to a asset in the public directory. This
       # method checks for errors before returning path.
       def asset_path(source, options = {})
-        check_errors_for(source, options)
-        path_to_asset(source, options)
-      end
-      alias :path_to_asset_with_errors :asset_path
-
-      # Computes the full URL to a asset in the public directory. This
-      # will use +asset_path+ internally, so most of their behaviors
-      # will be the same.
-      def asset_url(source, options = {})
-        path_to_asset_with_errors(source, options.merge(:protocol => :request))
+        unless options[:debug]
+          check_errors_for(source, options)
+        end
+        super(source, options)
       end
+      alias :path_to_asset :asset_path
 
       # Get digest for asset path.
       #
@@ -173,17 +176,30 @@ module Sprockets
         def check_dependencies!(dep)
           depend_on(dep)
           depend_on_asset(dep)
+        rescue Sprockets::FileNotFound
         end
 
-        # Raise errors when source does not exist or is not in the precompiled list
+        # Raise errors when source is not in the precompiled list, or
+        # incorrectly contains the assets_prefix.
         def check_errors_for(source, options)
+          return unless self.raise_runtime_errors
+
           source = source.to_s
-          return source if !self.raise_runtime_errors || source.blank? || source =~ URI_REGEXP
+          return if source.blank? || source =~ URI_REGEXP
+
           asset = lookup_asset_for_path(source, options)
 
           if asset && asset_needs_precompile?(asset.logical_path, asset.pathname.to_s)
             raise AssetFilteredError.new(asset.logical_path)
           end
+
+          full_prefix = File.join(self.assets_prefix || "/", '')
+          if !asset && source.start_with?(full_prefix)
+            short_path = source[full_prefix.size, source.size]
+            if lookup_asset_for_path(short_path, options)
+              raise AbsoluteAssetPathError.new(source, short_path, full_prefix)
+            end
+          end
         end
 
         # Returns true when an asset will not be available after precompile is run

data/lib/sprockets/rails/legacy_asset_url_helper.rb

@@ -34,6 +34,10 @@ module Sprockets
       end
       alias_method :path_to_asset, :asset_path
 
+      def asset_url(source, options = {})
+        path_to_asset(source, options.merge(:protocol => :request))
+      end
+
       ASSET_EXTENSIONS = {
         :javascript => '.js',
         :stylesheet => '.css'

data/lib/sprockets/rails/task.rb

@@ -1,6 +1,7 @@
 require 'rake'
 require 'rake/sprocketstask'
 require 'sprockets'
+require 'action_view'
 require 'action_view/base'
 
 module Sprockets
@@ -37,6 +38,14 @@ module Sprockets
         end
       end
 
+      def manifest
+        if app
+          Sprockets::Manifest.new(index, output, app.config.assets.manifest)
+        else
+          super
+        end
+      end
+
       def cache_path
         if app
           "#{app.config.root}/tmp/cache/assets"

data/lib/sprockets/rails/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Rails
-    VERSION = "2.1.3"
+    VERSION = "2.1.4"
   end
 end

data/lib/sprockets/railtie.rb

@@ -66,7 +66,7 @@ module Sprockets
     config.after_initialize do |app|
       config = app.config
 
-      manifest_path = config.assets.manifest || File.join(config.paths['public'].first, config.assets.prefix)
+      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
 
       # Configuration options that should invalidate
       # the Sprockets cache when changed.
@@ -74,8 +74,8 @@ module Sprockets
         app.assets.version,
         config.assets.version,
         config.action_controller.relative_url_root,
-        config.action_controller.asset_host,
-        Sprockets::Rails::VERSION,
+        (config.action_controller.asset_host unless config.action_controller.asset_host.respond_to?(:call)),
+        Sprockets::Rails::VERSION
       ].compact.join('-')
 
       # Copy config.assets.paths to Sprockets
@@ -99,9 +99,9 @@ module Sprockets
 
         if config.assets.compile
           self.assets_environment = app.assets
-          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_path)
+          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_assets_path, config.assets.manifest)
         else
-          self.assets_manifest = Sprockets::Manifest.new(manifest_path)
+          self.assets_manifest = Sprockets::Manifest.new(manifest_assets_path, config.assets.manifest)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -120,3 +120,4 @@ signing_key:
 specification_version: 4
 summary: Sprockets Rails integration
 test_files: []
+has_rdoc: