sass 3.1.0.alpha.246 → 3.1.0.alpha.249

data/REVISION

@@ -1 +1 @@
-7dc3a7bda300a9a18b37b58776ebe02915b49e82
+dfd6e2202bd9689c960fe89f45d0246b442c1207

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.246
+3.1.0.alpha.249

data/lib/sass/importers/filesystem.rb

@@ -44,6 +44,16 @@ module Sass
 
       protected
 
+      # If a full uri is passed, this removes the root from it
+      # otherwise returns the name unchanged
+      def remove_root(name)
+        if name.index(@root) == 0
+          name[@root.length..-1]
+        else
+          name
+        end
+      end
+
       # A hash from file extensions to the syntaxes for those extensions.
       # The syntaxes must be `:sass` or `:scss`.
       #
@@ -80,7 +90,7 @@ module Sass
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
       def find_real_file(dir, name)
-        for (f,s) in possible_files(name)
+        for (f,s) in possible_files(remove_root(name))
           path = (dir == ".") ? f : "#{dir}/#{f}"
           if full_path = Dir[path].first
             full_path.gsub!(REDUNDANT_DIRECTORY,File::SEPARATOR)

data/lib/sass/plugin/staleness_checker.rb

@@ -23,7 +23,6 @@ module Sass
     #   *WARNING*: It is important not to retain the instance for too long,
     #   as its instance-level caches are never explicitly expired.
     class StalenessChecker
-      DELETED             = 1.0/0.0 # positive Infinity
       @dependencies_cache = {}
 
       class << self
@@ -54,15 +53,13 @@ module Sass
       # @param template_file [String] The location of the Sass or SCSS template
       #   that is compiled to `css_file`.
       # @return [Boolean] Whether the stylesheet needs to be updated.
-      def stylesheet_needs_update?(css_file, template_file)
-        template_file = File.expand_path(template_file)
+      def stylesheet_needs_update?(css_file, template_file, importer = nil)
         begin
-          css_mtime = File.mtime(css_file).to_i
+          css_mtime = File.mtime(css_file)
         rescue Errno::ENOENT
           return true
         end
-
-        stylesheet_modified_since?(template_file, css_mtime)
+        stylesheet_modified_since?(template_file, css_mtime, importer)
       end
 
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
@@ -130,9 +127,9 @@ module Sass
             mtime = importer.mtime(uri, @options)
             if mtime.nil?
               @dependencies.delete([uri, importer])
-              DELETED
+              nil
             else
-              mtime.to_i
+              mtime
             end
           end
       end
@@ -150,7 +147,9 @@ module Sass
 
       def dependency_updated?(css_mtime)
         Proc.new do |uri, importer|
-          mtime(uri, importer) > css_mtime ||
+          sass_mtime = mtime(uri, importer)
+          !sass_mtime ||
+            sass_mtime > css_mtime ||
             dependencies_stale?(uri, importer, css_mtime)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.246
+  version: 3.1.0.alpha.249
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -04:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,8 @@ files:
 - lib/sass/script/operation.rb
 - lib/sass/script/parser.rb
 - lib/sass/script/string.rb
-- lib/sass/script/list.rb
 - lib/sass/script/string_interpolation.rb
+- lib/sass/script/list.rb
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
 - lib/sass/scss.rb