sass 3.1.0.alpha.39 → 3.1.0.alpha.40

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.39
+3.1.0.alpha.40

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.39
+3.1.0.alpha.40

data/lib/sass/importers/rails.rb

@@ -37,7 +37,7 @@ module Sass
         return unless template =
           find_template(uri, nil, !:partial) ||
           find_template(uri, nil, :partial)
-        template.updated_at.to_i
+        template.updated_at
       end
 
       # @see Base#to_s

data/lib/sass/plugin/rails.rb

@@ -49,20 +49,9 @@ unless defined?(Sass::RAILS_LOADED)
             :importer => rails_importer,
             :load_paths => [rails_importer] + Sass::Plugin.engine_options[:load_paths]))
 
-        # We need to serialize/deserialize the importers to make sure
-        # that each dependency is matched up to its proper importer
-        # for when importer#mtime is called.
-        dependencies = engine.dependencies
-        importers = Sass::Util.to_hash(
-          Sass::Util.enum_with_index(dependencies).map do |e, i|
-            importer = e.options[:importer]
-            [importer, {
-                :variable => "importer_#{i}",
-                :expression => (importer == rails_importer ?
-                  "Sass::Importers::Rails.new(lookup_context)" :
-                  "Sass::Util.load(#{Sass::Util.dump(importer)})")
-              }]
-          end)
+        template.data[:sass_importers] = engine.dependencies.map do |e|
+          [e.options[:filename], e.options[:importer]]
+        end
 
         stylesheet =
           begin
@@ -74,10 +63,8 @@ unless defined?(Sass::RAILS_LOADED)
 
         <<RUBY
 begin
-  #{importers.map {|_, val| "#{val[:variable]} = #{val[:expression]}"}.join("\n")}
   if Sass::Plugin::TemplateHandler.dependencies_changed?(
-      [#{dependencies.map {|e| "[#{e.options[:filename].inspect}, #{importers[e.options[:importer]][:variable]}]"}.join(',')}],
-      #{Time.now.to_i})
+      @_template.data[:sass_importers], #{Time.now.to_i})
     @_template.expire!
     @_template.rerender(self)
   else
@@ -92,7 +79,10 @@ RUBY
 
       def self.dependencies_changed?(deps, since)
         opts = Sass::Plugin.engine_options.merge(:cache => false)
-        deps.any? {|d, i| i.mtime(d, opts) > since}
+        deps.any? do |d, i|
+          return true unless time = i.mtime(d, opts)
+          time.to_i > since
+        end
       end
 
       def self.munge_exception(e, lookup_context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.39
+  version: 3.1.0.alpha.40
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -05:00
+date: 2010-11-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,8 +61,8 @@ files:
 - lib/sass/plugin/configuration.rb
 - lib/sass/plugin/merb.rb
 - lib/sass/plugin/generic.rb
-- lib/sass/plugin/rails.rb
 - lib/sass/plugin/rack.rb
+- lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/importers.rb