sprockets-rails 2.0.0.backport1 → 2.0.0.rc1

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, it's straight forward to redefine them and replace them with something more specific to your app.
+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.
 
 You can also redefine the task with the built in task generator.
 
@@ -44,8 +44,6 @@ 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,5 +1,6 @@
 require 'action_view'
 require 'sprockets'
+
 require 'active_support/core_ext/class/attribute'
 
 module Sprockets
@@ -94,7 +95,7 @@ module Sprockets
             else
               super(source, options)
             end
-          }.flatten.uniq.join("\n").html_safe
+          }.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)
@@ -116,7 +117,7 @@ module Sprockets
             else
               super(source, options)
             end
-          }.flatten.uniq.join("\n").html_safe
+          }.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)

data/lib/sprockets/rails/task.rb

@@ -5,55 +5,10 @@ require 'sprockets'
 module Sprockets
   module Rails
     class Task < Rake::SprocketsTask
-      attr_accessor :app
-
-      def initialize(app = nil)
-        self.app = app
-        super()
-      end
-
-      def environment
-        if app
-          app.assets
-        else
-          super
-        end
-      end
-
-      def output
-        if app
-          File.join(app.root, 'public', app.config.assets.prefix)
-        else
-          super
-        end
-      end
-
-      def assets
-        if app
-          app.config.assets.precompile
-        else
-          super
-        end
-      end
-
-      def cache_path
-        if app
-          "#{app.config.root}/tmp/cache/assets"
-        else
-          @cache_path
-        end
-      end
-      attr_writer :cache_path
+      attr_accessor :cache_path
 
       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,7 +1,6 @@
 require 'rails'
 require 'rails/railtie'
 require 'action_controller/railtie'
-require 'active_support/core_ext/module/remove_method'
 require 'sprockets'
 require 'sprockets/rails/helper'
 
@@ -10,27 +9,46 @@ module Rails
     # Hack: We need to remove Rails' built in config.assets so we can
     # do our own thing.
     class Configuration
-      remove_possible_method :assets
+      if instance_methods.map(&:to_sym).include?(:assets)
+        undef_method :assets
+      end
     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
-      @assets ||= Sprockets::Environment.new(root.to_s) do |env|
-        env.version = ::Rails.env
+      return @assets if defined? @assets
+
+      @assets = Sprockets::Environment.new(root.to_s) do |env|
+        env.version = ::Rails.env + "-#{config.assets.version}"
 
         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
 
@@ -51,45 +69,33 @@ 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
 
     rake_tasks do |app|
       require 'sprockets/rails/task'
-      Sprockets::Rails::Task.new(app)
-    end
 
-    config.after_initialize do |app|
-      config = app.config
-
-      manifest_path = File.join(app.root, 'public', config.assets.prefix)
-
-      unless config.assets.version.blank?
-        app.assets.version += "-#{config.assets.version}"
+      Sprockets::Rails::Task.new do |t|
+        t.environment = lambda { app.assets }
+        t.output      = File.join(app.root, 'public', app.config.assets.prefix)
+        t.assets      = app.config.assets.precompile
+        t.cache_path  = "#{app.config.root}/tmp/cache/assets"
       end
+    end
 
-      # Copy config.assets.paths to Sprockets
-      config.assets.paths.each do |path|
-        app.assets.append_path path
-      end
+    config.after_initialize do |app|
+      manifest_path = File.join(app.root, 'public', app.config.assets.prefix)
 
-      ActionView::Base.instance_eval do
+      ActiveSupport.on_load(:action_view) do
         include Sprockets::Rails::Helper
 
-        # 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
+        self.debug_assets       = app.config.assets.debug
+        self.digest_assets      = app.config.assets.digest
+        self.assets_prefix      = app.config.assets.prefix
 
-        if config.assets.compile
+        if app.config.assets.compile
           self.assets_environment = app.assets
           self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_path)
         else
@@ -97,26 +103,10 @@ module Sprockets
         end
       end
 
-      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.config.assets.compile
         if app.routes.respond_to?(:prepend)
           app.routes.prepend do
-            mount app.assets => config.assets.prefix
+            mount app.assets => app.config.assets.prefix
           end
         end
       end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.backport1
+  version: 2.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2.backport2
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2.backport2
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -79,27 +88,28 @@ files:
 - lib/sprockets/rails/task.rb
 - lib/sprockets/rails.rb
 - lib/sprockets/railtie.rb
-homepage: https://github.com/rails/sprockets-rails
+homepage: https://github.com/josh/sprockets-rails
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Sprockets Rails integration
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: b54d7de577eca6df5b44639df6929423a10b7311
-  data.tar.gz: 4df8d48affeec6bb7d1f1b4243a1c58c02642ef1
-SHA512:
-  metadata.gz: e28cb27742cf4e57dfdce771577f6040391935b70565c53e8740da42587417f44d15fbdd7d36e34b7cc8dfb986cf6411b150791879bb78de374d1d1696ef6800
-  data.tar.gz: 2192f3965ac0b09a84255e2532965be55b47daf504f996c5695b1fa509586957ac625ab48039e39c7854faf48cf2ba8518be43db75f9799b20b87bea95e265c4