turbo-sprockets-rails3 0.2.13 → 0.3.0

data/lib/sprockets/unprocessed_asset.rb

@@ -18,7 +18,6 @@ module Sprockets
       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 << Sass::Rails::SassTemplate if defined?(Sass::Rails::SassTemplate)
         allowed_engines << Less::Rails::LessTemplate if defined?(Less::Rails::LessTemplate)
         processors = attributes.processors - (attributes.engines - allowed_engines)
         @source = context.evaluate(pathname, :processors => processors)

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

@@ -1,4 +1,3 @@
-require 'sprockets'
 require 'sprockets/base'
 
 module Sprockets
@@ -31,9 +30,7 @@ module Sprockets
 
     def cache_key_for(path, options)
       options[:process] = true unless options.key?(:process)
-      key = "#{path}:#{options[:bundle] ? '1' : '0'}"
-      key << ":0" unless options[:process]
-      key
+      "#{path}:#{options[:bundle] ? '1' : '0'}:#{options[:process] ? '1' : '0'}"
     end
   end
 end

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

@@ -26,37 +26,33 @@ if defined?(Sprockets::StaticCompiler)
       def compile
         start_time = Time.now.to_f
 
-        env.each_logical_path do |logical_path|
-          if File.basename(logical_path)[/[^\.]+/, 0] == 'index'
-            logical_path.sub!(/\/index\./, '.')
-          end
-          next unless compile_path?(logical_path)
-
+        env.each_logical_path(paths) do |logical_path|
           # Fetch asset without any processing or compression,
           # to calculate a digest of the concatenated source files
-          if asset = env.find_asset(logical_path, :process => false)
-            @source_digests[logical_path] = asset.digest
-
-            # Recompile if digest has changed or compiled digest file is missing
-            current_digest_file = @current_digests[logical_path]
-
-            if @source_digests[logical_path] != @current_source_digests[logical_path] ||
-               !(current_digest_file && File.exists?("#{@target}/#{current_digest_file}"))
+          next unless asset = env.find_asset(logical_path, :process => false)
+          @source_digests[logical_path] = asset.digest
 
-              if asset = env.find_asset(logical_path)
-                @digests[logical_path] = write_asset(asset)
-                # Update current_digests with new hash, for future assets to reference
-                @current_digests[logical_path] = asset.digest_path
-              end
+          # Recompile if digest has changed or compiled digest file is missing
+          current_digest_file = @current_digests[logical_path]
 
-            else
-              # Set asset file from manifest.yml
-              digest_file = @current_digests[logical_path]
-              @digests[logical_path] = digest_file
+          if @source_digests[logical_path] != @current_source_digests[logical_path] ||
+             !(current_digest_file && File.exists?("#{@target}/#{current_digest_file}"))
 
-              env.logger.debug "Not compiling #{logical_path}, sources digest has not changed " <<
-                               "(#{@source_digests[logical_path][0...7]})"
+            if asset = env.find_asset(logical_path)
+              digest_path = write_asset(asset)
+              @digests[asset.logical_path] = digest_path
+              @digests[aliased_path_for(asset.logical_path)] = digest_path
+              # Update current_digests with new hash, for future assets to reference
+              @current_digests[asset.logical_path] = asset.digest_path
             end
+          else
+            # Set asset file from manifest.yml
+            digest_path = @current_digests[logical_path]
+            @digests[logical_path] = digest_path
+            @digests[aliased_path_for(logical_path)] = digest_path
+
+            env.logger.debug "Not compiling #{logical_path}, sources digest has not changed " <<
+                             "(#{@source_digests[logical_path][0...7]})"
           end
         end
 

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

@@ -77,9 +77,7 @@ namespace :assets do
         known_assets.each do |asset|
           full_path = File.join(target, asset)
           if File.exist?(full_path)
-            # File.utime raises 'Operation not permitted' unless user is owner of file.
-            # Non-owners have permission to update mtime to the current time using 'touch'.
-            `touch "#{full_path}"`
+            File.utime(Time.now, Time.now, full_path)
           end
         end
       end

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.2.13"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -32,23 +32,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.8
     - - <
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.8
     - - <
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.0
 description: Speeds up the Rails 3 asset pipeline by only recompiling changed assets
 email:
 - nathan.f77@gmail.com
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -456945734169101305
+      hash: -1656609350867516243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -456945734169101305
+      hash: -1656609350867516243
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24