turbo-sprockets-rails3 0.1.10 → 0.1.11

data/README.md

@@ -48,6 +48,15 @@ Enjoy your lightning fast deploys!
 Fully compatible. Just don't use the experimental `AssetSync.config.manifest = true` configuration option until
 [my asset_sync patch](https://github.com/rumblelabs/asset_sync/pull/110) has been merged.
 
+
+### [wicked_pdf](https://github.com/mileszs/wicked_pdf)
+
+Some users have reported that their production server was attempting to compile assets. To solve this, you will need to use the latest code on the `wicked_pdf` master branch by adding the following line to your `Gemfile`:
+
+```ruby
+gem 'wicked_pdf', :github => "mileszs/wicked_pdf"
+```
+
 <hr/>
 
 Please let me know if you have any problems with other gems, and I will either fix it, or make a note of the problem here.

data/lib/sprockets/unprocessed_asset.rb

@@ -1,10 +1,23 @@
-require 'sprockets/asset_with_dependencies'
-
 module Sprockets
   class UnprocessedAsset < AssetWithDependencies
+    def replace_scss_imports
+      @source.gsub!(/^@import ["']([^"']+)["']/) do |match|
+        begin
+          template = "_#{$1}"
+          pathname = @environment.resolve(template)
+          asset = UnprocessedAsset.new @environment, '_changeme2', pathname
+          # Replace imported template with the unprocessed asset contents.
+          asset.to_s
+        rescue Sprockets::FileNotFound
+          match
+        end
+      end
+    end
+
     def initialize(environment, logical_path, pathname)
       super
 
+      @environment = environment
       context = environment.context_class.new(environment, logical_path, pathname)
       attributes = environment.attributes_for(pathname)
       processors = attributes.processors
@@ -14,6 +27,11 @@ module Sprockets
 
       @source = context.evaluate(pathname, :processors => processors)
 
+      # Manually include files that are @imported from SCSS
+      if defined?(Sass::Rails::ScssTemplate) && attributes.processors.include?(Sass::Rails::ScssTemplate)
+        replace_scss_imports
+      end
+
       build_required_assets(environment, context,  :process => false)
       build_dependency_paths(environment, context, :process => false)
 

data/lib/turbo-sprockets/railtie.rb

@@ -21,7 +21,8 @@ module TurboSprockets
 
       if File.exist?(manifest_path)
         manifest = YAML.load_file(manifest_path)
-        config.assets.digest_files   = manifest[:digest_files]   || {}
+        # Set both digest keys for backwards compatibility
+        config.assets.digests = config.assets.digest_files = manifest[:digest_files]   || {}
         config.assets.source_digests = manifest[:source_digests] || {}
       end
     end

data/lib/turbo-sprockets/sprockets_overrides/base.rb

@@ -1,5 +1,4 @@
 require 'sprockets/base'
-require 'sprockets/unprocessed_asset'
 
 module Sprockets
   Base.class_eval do

data/lib/turbo-sprockets/sprockets_overrides/processed_asset.rb

@@ -1,5 +1,4 @@
 require 'sprockets/processed_asset'
-require 'sprockets/asset_with_dependencies'
 
 module Sprockets
 

data/lib/turbo-sprockets/tasks/assets.rake

@@ -82,16 +82,14 @@ namespace :assets do
     end
 
     task :all => ["assets:cache:clean"] do
+      # Other gems may want to add hooks to run after the 'assets:precompile:***' tasks.
+      # Since we aren't running separate rake tasks anymore, we manually invoke the extra actions.
       internal_precompile
+      Rake::Task["assets:precompile:primary"].actions[1..-1].each &:call
+
       if ::Rails.application.config.assets.digest
         internal_precompile(false)
-
-        # Other gems may want to add hooks to run after the 'assets:precompile:***' tasks.
-        # Since we aren't running separate rake tasks anymore,
-        # we need to manually invoke the extra actions.
-        %w(primary nondigest).each do |asset_type|
-          Rake::Task["assets:precompile:#{asset_type}"].actions[1..-1].each &:call
-        end
+        Rake::Task["assets:precompile:nondigest"].actions[1..-1].each &:call
       end
     end
 

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/turbo-sprockets-rails3.rb

@@ -1,7 +1,14 @@
+require 'sprockets/railtie'
+require 'sprockets/helpers'
+
+module Sprockets
+  # Assets
+  autoload :UnprocessedAsset,      "sprockets/unprocessed_asset"
+  autoload :AssetWithDependencies, "sprockets/asset_with_dependencies"
+end
+
 Dir[File.expand_path('../turbo-sprockets/sprockets_overrides/**/*.rb', __FILE__)].each do |f|
   require f
 end
 
-require 'sprockets/railtie'
-require 'sprockets/helpers'
 require 'turbo-sprockets/railtie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets