sprockets-rails 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34dd7537c5ed9dee4b17260193bc69074c771fa5
-  data.tar.gz: ed01267c0b8ddb70be68e5ee283d5057f8357032
+  metadata.gz: d8df5417e91af9477da6beeceb415ae8b75481d3
+  data.tar.gz: 91005ca8206986ceaa780399d62b919a80fefcce
 SHA512:
-  metadata.gz: 0a6258042fc29461c1386fa1239226d6f1357a4e8760d2481bbf6a26fbc9d13de5064e703502f41662cbcd39c441bc444e872e91a9699d491b6b1c580736f673
-  data.tar.gz: ff8c7f7ead3abd74174fe67339a935227634dd77c9b65c8a86c82c4370ae1d9b9ef1b8f2355a53260256c19882d08e10518f61c2f0ad6707151e3e5758513b9e
+  metadata.gz: 85b55263f24cd3625b00fb0cb5bd1676c20936154318fec45cd5eb8c9c28091e61433097d1fa57465f3ee444cd3bff18f0475c518b23db3b456782309aa3fa0c
+  data.tar.gz: 50fa24117b9a42a736b17ab322485fc0e44f2f24dc6559abc785a385c696fdcd06c2ff46b2a915207a4bbbf6903fd6d39d9c36d6e8e50e346e6f83f46d1b037d

data/lib/sprockets/rails.rb

@@ -1,3 +1,4 @@
+require 'sprockets/rails/version'
 if defined? Rails::Railtie
   require 'sprockets/railtie'
 end

data/lib/sprockets/rails/helper.rb

@@ -21,19 +21,11 @@ module Sprockets
         Sprockets::Rails::Helper.raise_runtime_errors
       end
 
-      class DependencyError < StandardError
-        def initialize(path, dep)
-          msg = "Asset depends on '#{dep}' to generate properly but has not declared the dependency\n"
-          msg << "Please add: `//= depend_on_asset \"#{dep}\"` to '#{path}'"
-          super msg
-        end
-      end
-
       class AssetFilteredError < StandardError
         def initialize(source)
           msg = "Asset filtered out and will not be served: " <<
-                "add `config.assets.precompile += %w( #{source} )` " <<
-                "to `config/application.rb` and restart your server"
+                "add `Rails.application.config.assets.precompile += %w( #{source} )` " <<
+                "to `config/initializers/assets.rb` and restart your server"
           super(msg)
         end
       end
@@ -71,7 +63,7 @@ module Sprockets
 
       def compute_asset_path(path, options = {})
         # Check if we are inside Sprockets context before calling check_dependencies!.
-        check_dependencies!(path) if defined?(_dependency_assets)
+        check_dependencies!(path) if defined?(depend_on)
 
         if digest_path = asset_digest_path(path)
           path = digest_path if digest_assets
@@ -85,7 +77,7 @@ 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)
+        check_errors_for(source, options)
         path_to_asset(source, options)
       end
       alias :path_to_asset_with_errors :asset_path
@@ -139,7 +131,7 @@ module Sprockets
 
         if options["debug"] != false && request_debug_assets?
           sources.map { |source|
-            check_errors_for(source)
+            check_errors_for(source, :type => :javascript)
             if asset = lookup_asset_for_path(source, :type => :javascript)
               asset.to_a.map do |a|
                 super(path_to_javascript(a.logical_path, :debug => true), options)
@@ -161,7 +153,7 @@ module Sprockets
         options = sources.extract_options!.stringify_keys
         if options["debug"] != false && request_debug_assets?
           sources.map { |source|
-            check_errors_for(source)
+            check_errors_for(source, :type => :stylesheet)
             if asset = lookup_asset_for_path(source, :type => :stylesheet)
               asset.to_a.map do |a|
                 super(path_to_stylesheet(a.logical_path, :debug => true), options)
@@ -177,21 +169,20 @@ module Sprockets
       end
 
       protected
-        # Checks if the asset is included in the dependencies list.
+        # Ensures the asset is included in the dependencies list.
         def check_dependencies!(dep)
-          if raise_runtime_errors && !_dependency_assets.detect { |asset| asset.include?(dep) }
-            raise DependencyError.new(self.pathname, dep)
-          end
+          depend_on(dep)
+          depend_on_asset(dep)
         end
 
         # Raise errors when source does not exist or is not in the precompiled list
-        def check_errors_for(source)
+        def check_errors_for(source, options)
           source = source.to_s
           return source if !self.raise_runtime_errors || source.blank? || source =~ URI_REGEXP
-          asset = lookup_asset_for_path(source)
+          asset = lookup_asset_for_path(source, options)
 
-          if asset && asset_needs_precompile?(source, asset.pathname.to_s)
-            raise AssetFilteredError.new(source)
+          if asset && asset_needs_precompile?(asset.logical_path, asset.pathname.to_s)
+            raise AssetFilteredError.new(asset.logical_path)
           end
         end
 

data/lib/sprockets/rails/version.rb

@@ -0,0 +1,5 @@
+module Sprockets
+  module Rails
+    VERSION = "2.1.2"
+  end
+end

data/lib/sprockets/railtie.rb

@@ -69,16 +69,14 @@ module Sprockets
 
       # Configuration options that should invalidate
       # the Sprockets cache when changed.
-      version_fragments = [
+      app.assets.version = [
+        app.assets.version,
         config.assets.version,
         config.action_controller.relative_url_root,
-        config.action_controller.asset_host
+        config.action_controller.asset_host,
+        Sprockets::Rails::VERSION,
       ].compact.join('-')
 
-      if version_fragments.present?
-        app.assets.version += "-#{version_fragments}"
-      end
-
       # Copy config.assets.paths to Sprockets
       config.assets.paths.each do |path|
         app.assets.append_path path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email: josh@joshpeek.com
 executables: []
@@ -79,6 +93,7 @@ files:
 - lib/sprockets/rails/legacy_asset_tag_helper.rb
 - lib/sprockets/rails/legacy_asset_url_helper.rb
 - lib/sprockets/rails/task.rb
+- lib/sprockets/rails/version.rb
 - lib/sprockets/railtie.rb
 homepage: https://github.com/rails/sprockets-rails
 licenses: