sprockets-rails 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79800fc588c2c61e6edab3f2eba4a305753f3d1d
-  data.tar.gz: 38604ce2a233554c6c5562b9640468d0235d8dba
+  metadata.gz: f7cda4acb26f13dcaf19f3e20a80a993ce94a51d
+  data.tar.gz: 13edbe84e222532d684dd604c704b924ec112dd6
 SHA512:
-  metadata.gz: d74ea9be777f07327e05acf7031245bd913d35b1b99afa287196170809e48b79fac6961289ec8cb39243285a74759ddb5b3d0b0c1c3a9fb73c2b0efdb71a07a2
-  data.tar.gz: 695ebd483f3e8e8a87eb58cf0d429442223090e688a3ca2d66ce16b74fc6310e07cb42b52f44b8b5e1895d88f8e03a0383e0043ebad972a6754a70469954da77
+  metadata.gz: 4469943e88ac45ffa9063b0bfa5db8c8875029b9d72a9482b5dbd5b0a9eca6659ea3c295bc5c5835ec698c8586641889d7876c30b882c189eef868590a9b786c
+  data.tar.gz: afe0a6f3db89ab3a79b0d2f5f1163ae96a61023b0297c9239d63cd14be6d2b882bc05d1e9908aaa5cea6b3949b1945502d10750e5ccaae60a1ddc21df98c23c2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Joshua Peek
+Copyright (c) 2012-2014 Joshua Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -37,7 +37,12 @@ You can also redefine the task with the built in task generator.
 
 ``` ruby
 require 'sprockets/rails/task'
-Sprockets::Rails::Task.new do |t|
+# clean the old tasks
+Rake::Task["assets:environment"].clear
+Rake::Task["assets:precompile"].clear
+Rake::Task["assets:clean"].clear
+Rake::Task["assets:clobber"].clear
+Sprockets::Rails::Task.new(Rails.application) do |t|
   t.environment = lambda { Rails.application.assets }
   t.assets = %w( application.js application.css )
   t.keep = 5
@@ -55,9 +60,14 @@ Also see [Sprockets::Rails::Task](https://github.com/josh/sprockets-rails/blob/m
 
 Add additional assets to compile on deploy. Defaults to `application.js`, `application.css` and any other non-js/css file under `app/assets`.
 
+**`config.assets.raise_runtime_errors`**
+
+Set to `true` to enable additional runtime error checking. Recommended in the `development` environment to minimize unexpected behavior when deploying to `production`.
+
 **`config.assets.paths`**
 
-Add additional load paths to this Array. Rails includes `app/assets` and `vendor/assets` for you already. Plugins might want to add their custom paths to to this.
+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.version`**
 
@@ -73,6 +83,10 @@ config.assets.version = 'v2'
 
 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.
+
 **`config.assets.digest`**
 
 Link to undigest asset filenames. This option will eventually go away. Unless when `compile` is disabled.

data/lib/sprockets/rails/helper.rb

@@ -5,6 +5,39 @@ require 'active_support/core_ext/class/attribute'
 module Sprockets
   module Rails
     module Helper
+      class << self
+        attr_accessor :precompile, :assets, :raise_runtime_errors
+      end
+
+      def precompile
+        Sprockets::Rails::Helper.precompile
+      end
+
+      def assets
+        Sprockets::Rails::Helper.assets
+      end
+
+      def raise_runtime_errors
+        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"
+          super(msg)
+        end
+      end
+
       if defined? ActionView::Helpers::AssetUrlHelper
         include ActionView::Helpers::AssetUrlHelper
         include ActionView::Helpers::AssetTagHelper
@@ -37,6 +70,9 @@ module Sprockets
       end
 
       def compute_asset_path(path, options = {})
+        # Check if we are inside Sprockets context before calling check_dependencies!.
+        check_dependencies!(path) if defined?(_dependency_assets)
+
         if digest_path = asset_digest_path(path)
           path = digest_path if digest_assets
           path += "?body=1" if options[:debug]
@@ -46,6 +82,21 @@ module Sprockets
         end
       end
 
+      # 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)
+        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))
+      end
+
       # Get digest for asset path.
       #
       # path    - String path
@@ -88,6 +139,7 @@ module Sprockets
 
         if options["debug"] != false && request_debug_assets?
           sources.map { |source|
+            check_errors_for(source)
             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)
@@ -107,9 +159,9 @@ module Sprockets
       # Eventually will be deprecated and replaced by source maps.
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
-
         if options["debug"] != false && request_debug_assets?
           sources.map { |source|
+            check_errors_for(source)
             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)
@@ -125,6 +177,33 @@ module Sprockets
       end
 
       protected
+        # Checks if 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
+        end
+
+        # Raise errors when source does not exist or is not in the precompiled list
+        def check_errors_for(source)
+          source = source.to_s
+          return source if !self.raise_runtime_errors || source.blank? || source =~ URI_REGEXP
+          asset = lookup_asset_for_path(source)
+
+          if asset && asset_needs_precompile?(source, asset.pathname.to_s)
+            raise AssetFilteredError.new(source)
+          end
+        end
+
+        # Returns true when an asset will not be available after precompile is run
+        def asset_needs_precompile?(source, filename)
+          if assets_environment && assets_environment.send(:matches_filter, precompile || [], source, filename)
+            false
+          else
+            true
+          end
+        end
+
         # Enable split asset debugging. Eventually will be deprecated
         # and replaced by source maps in Sprockets 3.x.
         def request_debug_assets?

data/lib/sprockets/rails/legacy_asset_url_helper.rb

@@ -21,8 +21,7 @@ module Sprockets
           source = compute_asset_path(source, options)
         end
 
-        relative_url_root = (defined?(config.relative_url_root) && config.relative_url_root) ||
-          (respond_to?(:request) && request.try(:script_name))
+        relative_url_root = defined?(config.relative_url_root) && config.relative_url_root
         if relative_url_root
           source = "#{relative_url_root}#{source}" unless source.starts_with?("#{relative_url_root}/")
         end

data/lib/sprockets/rails/task.rb

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

data/lib/sprockets/railtie.rb

@@ -50,6 +50,7 @@ module Sprockets
     config.assets._blocks    = []
     config.assets.paths      = []
     config.assets.prefix     = "/assets"
+    config.assets.manifest   = nil
     config.assets.precompile = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
     config.assets.version    = ""
     config.assets.debug      = false
@@ -64,10 +65,18 @@ module Sprockets
     config.after_initialize do |app|
       config = app.config
 
-      manifest_path = File.join(app.root, 'public', config.assets.prefix)
+      manifest_path = config.assets.manifest || File.join(config.paths['public'].first, config.assets.prefix)
 
-      unless config.assets.version.blank?
-        app.assets.version += "-#{config.assets.version}"
+      # Configuration options that should invalidate
+      # the Sprockets cache when changed.
+      version_fragments = [
+        config.assets.version,
+        config.action_controller.relative_url_root,
+        config.action_controller.asset_host
+      ].compact.join('-')
+
+      if version_fragments.present?
+        app.assets.version += "-#{version_fragments}"
       end
 
       # Copy config.assets.paths to Sprockets
@@ -75,7 +84,7 @@ module Sprockets
         app.assets.append_path path
       end
 
-      ActionView::Base.instance_eval do
+      ActiveSupport.on_load(:action_view) do
         include Sprockets::Rails::Helper
 
         # Copy relevant config to AV context
@@ -113,6 +122,11 @@ module Sprockets
         app.assets = app.assets.index
       end
 
+
+      Sprockets::Rails::Helper.precompile         ||= app.config.assets.precompile
+      Sprockets::Rails::Helper.assets             ||= app.assets
+      Sprockets::Rails::Helper.raise_runtime_errors = app.config.assets.raise_runtime_errors
+
       if config.assets.compile
         if app.routes.respond_to?(:prepend)
           app.routes.prepend do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -72,14 +72,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
+- lib/sprockets/rails.rb
 - lib/sprockets/rails/helper.rb
 - lib/sprockets/rails/legacy_asset_tag_helper.rb
 - lib/sprockets/rails/legacy_asset_url_helper.rb
 - lib/sprockets/rails/task.rb
-- lib/sprockets/rails.rb
 - lib/sprockets/railtie.rb
-- LICENSE
 homepage: https://github.com/rails/sprockets-rails
 licenses:
 - MIT
@@ -90,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sprockets Rails integration