turbo-sprockets-rails3 0.1.7 → 0.1.8

data/README.md

@@ -31,8 +31,9 @@ Just drop the gem in your `Gemfile`:
 gem 'turbo-sprockets-rails3'
 ```
 
-Run `bundle`, and you're done!
+Warning: Don't add this gem to the `:assets` group. It must be available in the production environment, since it overrides path helpers and alters the manifest format. This is a common cause of `**** isn't precompiled` errors in production.
 
+Run `bundle` to install the gem, and you're done!
 
 Test it out by running `rake assets:precompile`. When it's finished, your `public/assets/manifest.yml` file should include a `:source_digests` hash for your assets.
 

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

@@ -58,12 +58,11 @@ if defined?(Sprockets::StaticCompiler)
           end
         end
 
-        # Encode all keys and values as UTF-8 for Ruby 1.9, otherwise YAML stores them as !binary
+        # Encode all filenames & digests as UTF-8 for Ruby 1.9,
+        # otherwise YAML dumps other string encodings as !binary
         if RUBY_VERSION.to_f >= 1.9
-          utf8_sources, utf8_digests = {}, {}
-          @source_digests.each { |k, v| utf8_sources[k.encode("UTF-8")] = v.encode("UTF-8") }
-          @digest_files.each   { |k, v| utf8_digests[k.encode("UTF-8")] = v.encode("UTF-8") }
-          @source_digests, @digest_files = utf8_sources, utf8_digests
+          @source_digests = encode_hash_as_utf8 @source_digests
+          @digest_files   = encode_hash_as_utf8 @digest_files
         end
 
         if @manifest
@@ -78,6 +77,12 @@ if defined?(Sprockets::StaticCompiler)
         elapsed_time = ((Time.now.to_f - start_time) * 1000).to_i
         env.logger.debug "Processed #{'non-' unless @digest}digest assets in #{elapsed_time}ms"
       end
+
+      private
+
+      def encode_hash_as_utf8(hash)
+        Hash[*hash.map {|k,v| [k.encode("UTF-8"), v.encode("UTF-8")] }.flatten]
+      end
     end
   end
-end
+end

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

@@ -1,9 +1,12 @@
 require "fileutils"
 
-# Clear all assets tasks from sprockets railtie
+# Clear all assets tasks from sprockets railtie,
+# but preserve any extra actions added via 'enhance'
+task_enhancements = {}
 Rake::Task.tasks.each do |task|
   if task.name.match '^assets:'
-    task.clear_prerequisites.clear_actions
+    task_enhancements[task.name] = task.actions[1..-1] if task.actions.size > 1
+    task.clear
   end
 end
 
@@ -80,7 +83,14 @@ namespace :assets do
 
     task :all => ["assets:cache:clean"] do
       internal_precompile
-      internal_precompile(false) if ::Rails.application.config.assets.digest
+      if ::Rails.application.config.assets.digest
+        internal_precompile(false)
+
+        # Other gems may add hooks to run after the 'assets:precompile:nondigest' task.
+        # Since we aren't running separate rake tasks anymore,
+        # we need to manually invoke those extra actions now.
+        Rake::Task["assets:precompile:nondigest"].actions[1..-1].each &:call
+      end
     end
 
     task :primary => ["assets:cache:clean"] do
@@ -120,3 +130,11 @@ namespace :assets do
     end
   end
 end
+
+
+# Append previous task enhancements to new Rake tasks.
+task_enhancements.each do |task_name, actions|
+  actions.each do |proc|
+    Rake::Task[task_name].enhance &proc
+  end
+end

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

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