turbo-sprockets-rails3 0.1.16 → 0.1.17

data/README.md

@@ -5,9 +5,6 @@
 * Speeds up your Rails 3 `rake assets:precompile` by only recompiling changed assets, based on a hash of their source files
 * Only compiles once to generate both fingerprinted and non-fingerprinted assets
 
-This is a backport of the work I've done for Rails 4.0.0, released as
-a gem for Rails 3.2.x. (See [sprockets-rails #21](https://github.com/rails/sprockets-rails/pull/21) and [sprockets #367](https://github.com/sstephenson/sprockets/pull/367) for the Rails 4 pull requests.)
-
 
 ### Disclaimer
 
@@ -46,7 +43,11 @@ Enjoy your lightning fast deploys!
 ### [asset_sync](https://github.com/rumblelabs/asset_sync)
 
 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.
+[my asset_sync patch](https://github.com/rumblelabs/asset_sync/pull/110) has been merged. Alternatively, you can use my patched `asset_sync` with the following line in your `Gemfile`:
+
+```ruby
+gem "asset_sync", :github => "ndbroadbent/asset_sync", :branch => "new_manifest_support"
+```
 
 
 ### [wicked_pdf](https://github.com/mileszs/wicked_pdf)
@@ -67,6 +68,12 @@ Please let me know if you have any problems with other gems, and I will either f
 
 `turbo-sprockets-rails3` should work out of the box with Capistrano.
 
+You may also like to take a look at my [Capistrano Pull Request](https://github.com/capistrano/capistrano/pull/281) that attempts to solve the problems of asset rollback and invalidation. You can try out this solution by adding the following to your Gemfile:
+
+```ruby
+gem "capistrano", :github => "ndbroadbent/capistrano", :branch => "assets_rollback_and_expiry"
+```
+
 ### Heroku
 
 You won't be able to do an 'incremental update' on heroku, since your `public/assets`

data/lib/sprockets/unprocessed_asset.rb

@@ -1,44 +1,26 @@
 module Sprockets
   class UnprocessedAsset < AssetWithDependencies
-    def replace_imports(template_with_leading_underscore = true)
-      @source.gsub!(/^@import ["']([^"']+)["'];?/) do |match|
-        begin
-          if template_with_leading_underscore
-            template = "_#{$1}"
-          else
-            template = $1
-          end
-          pathname = @environment.resolve(template)
-          asset = UnprocessedAsset.new @environment, template, 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
 
       # Remove all engine processors except ERB to return unprocessed source file
-      processors -= (attributes.engines - [Tilt::ERBTemplate])
+      allowed_engines = [Tilt::ERBTemplate]
+      processors = attributes.processors - (attributes.engines - allowed_engines)
 
       @source = context.evaluate(pathname, :processors => processors)
 
-      # Include SASS imports
-      if defined?(Sass::Rails::ScssTemplate) && attributes.processors.include?(Sass::Rails::ScssTemplate)
-        replace_imports(true)  # Template has leading underscore
-      end
-      # Include Less imports
-      if defined?(Less::Rails::LessTemplate) && attributes.processors.include?(Less::Rails::LessTemplate)
-        replace_imports(false)  # Template has no leading underscore
+      # If the source contains any '@import' directives, add Sass and Less processors.
+      # (@import is quite difficult to handle properly without processing.)
+      if @source.include?("@import")
+        # Process Sass and Less files, since @import is too tricky to handle properly.
+        allowed_engines << Sass::Rails::ScssTemplate if defined?(Sass::Rails::ScssTemplate)
+        allowed_engines << Less::Rails::LessTemplate if defined?(Less::Rails::LessTemplate)
+        processors = attributes.processors - (attributes.engines - allowed_engines)
+        @source = context.evaluate(pathname, :processors => processors)
       end
 
       build_required_assets(environment, context,  :process => false)

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

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