sprockets-rails 2.0.0.rc1 → 2.0.0.rc2

data/README.md

@@ -31,7 +31,7 @@ Nuke `public/assets` and clear the Sprockets file system cache.
 
 #### Customize
 
-If the basic tasks don't do all that you need, its straight forward to redefined them and replace them with something more specific to your app.
+If the basic tasks don't do all that you need, it's straight forward to redefine them and replace them with something more specific to your app.
 
 You can also redefine the task with the built in task generator.
 
@@ -44,6 +44,8 @@ Sprockets::Rails::Task.new do |t|
 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 [Sprockest::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).
 
 

data/lib/sprockets/rails/helper.rb

@@ -1,6 +1,5 @@
 require 'action_view'
 require 'sprockets'
-
 require 'active_support/core_ext/class/attribute'
 
 module Sprockets
@@ -95,7 +94,7 @@ module Sprockets
             else
               super(source, options)
             end
-          }.join("\n").html_safe
+          }.flatten.uniq.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)
@@ -117,7 +116,7 @@ module Sprockets
             else
               super(source, options)
             end
-          }.join("\n").html_safe
+          }.flatten.uniq.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)

data/lib/sprockets/rails/task.rb

@@ -9,6 +9,13 @@ module Sprockets
 
       def define
         namespace :assets do
+          # Override this task change the loaded dependencies
+          desc "Load asset compile environment"
+          task :environment do
+            # Load full Rails environment by default
+            Rake::Task['environment'].invoke
+          end
+
           desc "Compile all the assets named in config.assets.precompile"
           task :precompile => :environment do
             with_logger do

data/lib/sprockets/railtie.rb

@@ -1,6 +1,7 @@
 require 'rails'
 require 'rails/railtie'
 require 'action_controller/railtie'
+require 'active_support/core_ext/module/remove_method'
 require 'sprockets'
 require 'sprockets/rails/helper'
 
@@ -9,46 +10,29 @@ module Rails
     # Hack: We need to remove Rails' built in config.assets so we can
     # do our own thing.
     class Configuration
-      if instance_methods.map(&:to_sym).include?(:assets)
-        undef_method :assets
-      end
+      remove_possible_method :assets
     end
 
+    # Undefine Rails' assets method before redefining it, to avoid warnings.
+    remove_possible_method :assets
+    remove_possible_method :assets=
+
     # Returns Sprockets::Environment for app config.
     def assets
       return @assets if defined? @assets
 
       @assets = Sprockets::Environment.new(root.to_s) do |env|
-        env.version = ::Rails.env + "-#{config.assets.version}"
+        env.version = ::Rails.env
 
         path = "#{config.root}/tmp/cache/assets/#{::Rails.env}"
         env.cache = Sprockets::Cache::FileStore.new(path)
 
-        config.assets.paths.each do |path|
-          env.append_path(path)
-        end
-
-        env.js_compressor  = config.assets.js_compressor
-        env.css_compressor = config.assets.css_compressor
-
         env.context_class.class_eval do
           include ::Sprockets::Rails::Helper
         end
-        env.context_class.assets_prefix = config.assets.prefix
-        env.context_class.digest_assets = config.assets.digest
-        env.context_class.config        = config.action_controller
-
-        config.assets._blocks.each do |block|
-          block.call env
-        end
-      end
-
-      if config.cache_classes
-        @assets = @assets.index
       end
-
-      @assets
     end
+    attr_writer :assets
   end
 end
 
@@ -69,7 +53,7 @@ module Sprockets
     config.assets.paths      = []
     config.assets.prefix     = "/assets"
     config.assets.precompile = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
-    config.assets.version    = ''
+    config.assets.version    = ""
     config.assets.debug      = false
     config.assets.compile    = true
     config.assets.digest     = false
@@ -86,16 +70,34 @@ module Sprockets
     end
 
     config.after_initialize do |app|
-      manifest_path = File.join(app.root, 'public', app.config.assets.prefix)
+      config = app.config
+
+      manifest_path = File.join(app.root, 'public', config.assets.prefix)
+
+      unless config.assets.version.blank?
+        app.assets.version += "-#{config.assets.version}"
+      end
+
+      # Copy config.assets.paths to Sprockets
+      config.assets.paths.each do |path|
+        app.assets.append_path path
+      end
 
       ActiveSupport.on_load(:action_view) do
         include Sprockets::Rails::Helper
 
-        self.debug_assets       = app.config.assets.debug
-        self.digest_assets      = app.config.assets.digest
-        self.assets_prefix      = app.config.assets.prefix
+        # Copy relevant config to AV context
+        self.debug_assets  = config.assets.debug
+        self.digest_assets = config.assets.digest
+        self.assets_prefix = config.assets.prefix
+
+        # Copy over to Sprockets as well
+        context = app.assets.context_class
+        context.assets_prefix = config.assets.prefix
+        context.digest_assets = config.assets.digest
+        context.config        = config.action_controller
 
-        if app.config.assets.compile
+        if config.assets.compile
           self.assets_environment = app.assets
           self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_path)
         else
@@ -103,10 +105,26 @@ module Sprockets
         end
       end
 
-      if app.config.assets.compile
+      app.assets.js_compressor  = config.assets.js_compressor
+      app.assets.css_compressor = config.assets.css_compressor
+
+      # Run app.assets.configure blocks
+      config.assets._blocks.each do |block|
+        block.call app.assets
+      end
+
+      # No more configuration changes at this point.
+      # With cache classes on, Sprockets won't check the FS when files
+      # change. Preferable in production when the FS only changes on
+      # deploys when the app restarts.
+      if config.cache_classes
+        app.assets = app.assets.index
+      end
+
+      if config.assets.compile
         if app.routes.respond_to?(:prepend)
           app.routes.prepend do
-            mount app.assets => app.config.assets.prefix
+            mount app.assets => config.assets.prefix
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -88,7 +88,7 @@ files:
 - lib/sprockets/rails/task.rb
 - lib/sprockets/rails.rb
 - lib/sprockets/railtie.rb
-homepage: https://github.com/josh/sprockets-rails
+homepage: https://github.com/rails/sprockets-rails
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sprockets Rails integration