sprockets_rails3_backport 0.0.1 → 0.0.2

data/README.markdown

@@ -27,15 +27,9 @@ Here are the various `config.assets` options and their defaults:
     config.assets.compile                  = true
     config.assets.digest                   = false
     config.assets.manifest                 = nil
-    config.assets.cache_store              = false
+    config.assets.cache_store              = [ :file_store, "#{root}/tmp/cache/assets/" ]
     config.assets.js_compressor            = nil
     config.assets.css_compressor           = nil
     config.assets.initialize_on_precompile = true
 
-
-## Differences from Rails 3.1.3
-
-* no `config.assets.enabled`
-* `config.assets.cache_store` defaults to false, so you probably want to set it yourself
-
-
+`config.assets.enabled` is not used.

data/lib/extensions/application_ext.rb

@@ -1,5 +1,46 @@
 module Rails
   class Application < Engine
+    class Configuration < ::Rails::Engine::Configuration
+      # we need to do this over again for Rails::Application::Configuration because
+      # the Rails 3.0 implementation squashes the paths.vendor that we made in
+      # application_ext.rb.
+      
+      def paths_with_vendor_assets
+        @paths ||= begin
+          paths = paths_without_vendor_assets
+          paths.vendor              "vendor",              :load_path => true
+          paths.vendor.assets       "vendor/assets",       :glob => "*"
+          paths.vendor.plugins      "vendor/plugins"
+          paths
+        end
+      end
+      
+      alias_method_chain :paths, :vendor_assets
+      
+      def initialize_with_assets(*args)
+        initialize_without_assets(*args)
+        @assets = ActiveSupport::OrderedOptions.new
+        # @assets.enabled                  = false
+        @assets.paths                    = []
+        @assets.precompile               = [ Proc.new{ |path| !['.js', '.css'].include?(File.extname(path)) },
+                                             /(?:\/|\\|\A)application\.(css|js)$/ ]
+        @assets.prefix                   = "/assets"
+        @assets.version                  = ''
+        @assets.debug                    = false
+        @assets.compile                  = true
+        @assets.digest                   = false
+        @assets.manifest                 = nil
+        @assets.cache_store              = [ :file_store, "#{root}/tmp/cache/assets/" ]
+        @assets.js_compressor            = nil
+        @assets.css_compressor           = nil
+        @assets.initialize_on_precompile = true
+      end
+      
+      alias_method_chain :initialize, :assets
+      
+      attr_accessor :assets
+    end
+    
     attr_accessor :assets
   end
-end
+end

data/lib/extensions/engine_ext.rb

@@ -0,0 +1,24 @@
+module Rails
+  class Engine < Railtie
+    class Configuration < ::Rails::Railtie::Configuration
+      def paths_with_assets
+        @paths ||= begin
+          paths = paths_without_assets
+          paths.app.assets          "app/assets",          :glob => "*"
+          paths.lib.assets          "lib/assets",          :glob => "*"
+          paths.vendor              "vendor",              :load_path => true
+          paths.vendor.assets       "vendor/assets",       :glob => "*"
+          paths
+        end
+      end
+      
+      alias_method_chain :paths, :assets
+    end
+    
+    initializer :append_assets_path, :group => :all do |app|
+      app.config.assets.paths.unshift(*paths.vendor.assets.paths)
+      app.config.assets.paths.unshift(*paths.lib.assets.paths)
+      app.config.assets.paths.unshift(*paths.app.assets.paths)
+    end
+  end
+end

data/lib/sprockets/assets.rake

@@ -35,14 +35,20 @@ namespace :assets do
       # Ensure that action view is loaded and the appropriate
       # sprockets hooks get executed
       _ = ActionView::Base
-
       config = Rails.application.config
       config.assets.compile = true
-      config.assets.digest  = digest unless digest.nil?
+      config.assets.compress = true
+      if digest.nil?
+        if ENV['ASSETS_DIGEST'].present?
+          config.assets.digest = (ENV['ASSETS_DIGEST'].to_s == 'true')
+        end
+      else
+        config.assets.digest = digest
+      end
       config.assets.digests = {}
 
       env      = Rails.application.assets
-      target   = File.join(Rails.public_path, config.assets.prefix)
+      target   = ENV['ASSETS_TARGET'] || File.join(Rails.public_path, config.assets.prefix)
       compiler = Sprockets::StaticCompiler.new(env,
                                                target,
                                                config.assets.precompile,
@@ -79,7 +85,7 @@ namespace :assets do
   namespace :clean do
     task :all => ["assets:environment", "tmp:cache:clear"] do
       config = Rails.application.config
-      public_asset_path = File.join(Rails.public_path, config.assets.prefix)
+      public_asset_path = ENV['ASSETS_TARGET'] || File.join(Rails.public_path, config.assets.prefix)
       rm_rf public_asset_path, :secure => true
     end
   end
@@ -88,7 +94,7 @@ namespace :assets do
     if Rails.application.config.assets.initialize_on_precompile
       Rake::Task["environment"].invoke
     else
-      Rails.application.initialize!(:assets)
+      Rails.application.initialize!
       Sprockets::Bootstrap.new(Rails.application).run
     end
   end

data/lib/sprockets/helpers/rails_helper.rb

@@ -57,10 +57,10 @@ module Sprockets
         options[:body] ? "#{path}?body=1" : path
       end
 
-      def image_path(source)
-        asset_path(source)
-      end
-      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
+      # def image_path(source)
+      #   asset_path(source)
+      # end
+      # alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
       def javascript_path(source)
         asset_path(source)

data/lib/sprockets/railtie.rb

@@ -1,5 +1,4 @@
 # require "action_controller/railtie"
-require "extensions/application_ext"
 
 module Sprockets
   autoload :Bootstrap,      "sprockets/bootstrap"
@@ -10,23 +9,6 @@ module Sprockets
 
   # TODO: Get rid of config.assets.enabled
   class Railtie < ::Rails::Railtie
-    # config.action_controller.default_asset_host_protocol = :relative
-    config.assets = ActiveSupport::OrderedOptions.new
-    # config.assets.enabled                  = false
-    config.assets.paths                    = []
-    config.assets.precompile               = [ Proc.new{ |path| !['.js', '.css'].include?(File.extname(path)) },
-                                               /(?:\/|\\|\A)application\.(css|js)$/ ]
-    config.assets.prefix                   = "/assets"
-    config.assets.version                  = ''
-    config.assets.debug                    = false
-    config.assets.compile                  = true
-    config.assets.digest                   = false
-    config.assets.manifest                 = nil
-    config.assets.cache_store              = false
-    config.assets.js_compressor            = nil
-    config.assets.css_compressor           = nil
-    config.assets.initialize_on_precompile = true
-
     rake_tasks do
       load "sprockets/assets.rake"
     end

data/lib/sprockets/static_compiler.rb

@@ -36,7 +36,7 @@ module Sprockets
         filename = File.join(target, path)
         FileUtils.mkdir_p File.dirname(filename)
         asset.write_to(filename)
-        asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
+        # asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
       end
     end
 

data/lib/sprockets_rails3_backport.rb

@@ -1 +1,4 @@
+require "extensions/engine_ext"
+require "extensions/application_ext"
+
 require "sprockets/railtie"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets_rails3_backport
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 -05:00
+date: 2011-12-13 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156849120 !ruby/object:Gem::Requirement
+  requirement: &2168815640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156849120
+  version_requirements: *2168815640
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2156848660 !ruby/object:Gem::Requirement
+  requirement: &2168815160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,7 +33,7 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156848660
+  version_requirements: *2168815160
 description: 
 email:
 - james@shopify.com
@@ -43,6 +43,7 @@ extra_rdoc_files: []
 files:
 - lib/action_view/asset_paths.rb
 - lib/extensions/application_ext.rb
+- lib/extensions/engine_ext.rb
 - lib/sprockets/assets.rake
 - lib/sprockets/bootstrap.rb
 - lib/sprockets/compressors.rb