sass 3.1.20 → 3.1.21

data/Rakefile

@@ -24,7 +24,7 @@ end
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :submodules, :permissions] do
+task :package => [:revision_file, :date_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
@@ -63,8 +63,17 @@ task :revision_file do
   end
 end
 
+task :date_file do
+  File.open(scope('VERSION_DATE'), 'w') do |f|
+    f.puts Time.now.utc.strftime('%d %B %Y %T %Z')
+  end
+end
+
 # We also need to get rid of this file after packaging.
-at_exit { File.delete(scope('REVISION')) rescue nil }
+at_exit do
+  File.delete(scope('REVISION')) rescue nil
+  File.delete(scope('VERSION_DATE')) rescue nil
+end
 
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do

data/VERSION

@@ -1 +1 @@
-3.1.20
+3.1.21

data/VERSION_DATE

@@ -0,0 +1 @@
+11 August 2012 00:38:15 UTC

data/lib/sass/script/functions.rb

@@ -947,23 +947,22 @@ module Sass::Script
 
       Sass::Util.check_range("Weight", 0..100, weight, '%')
 
-      # This algorithm factors in both the user-provided weight
-      # and the difference between the alpha values of the two colors
-      # to decide how to perform the weighted average of the two RGB values.
+      # This algorithm factors in both the user-provided weight (w) and the
+      # difference between the alpha values of the two colors (a) to decide how
+      # to perform the weighted average of the two RGB values.
       #
       # It works by first normalizing both parameters to be within [-1, 1],
-      # where 1 indicates "only use color1", -1 indicates "only use color 0",
-      # and all values in between indicated a proportionately weighted average.
+      # where 1 indicates "only use color1", -1 indicates "only use color2", and
+      # all values in between indicated a proportionately weighted average.
       #
-      # Once we have the normalized variables w and a,
-      # we apply the formula (w + a)/(1 + w*a)
-      # to get the combined weight (in [-1, 1]) of color1.
+      # Once we have the normalized variables w and a, we apply the formula
+      # (w + a)/(1 + w*a) to get the combined weight (in [-1, 1]) of color1.
       # This formula has two especially nice properties:
       #
       #   * When either w or a are -1 or 1, the combined weight is also that number
       #     (cases where w * a == -1 are undefined, and handled as a special case).
       #
-      #   * When a is 0, the combined weight is w, and vice versa
+      #   * When a is 0, the combined weight is w, and vice versa.
       #
       # Finally, the weight of color1 is renormalized to be within [0, 1]
       # and the weight of color2 is given by 1 minus the weight of color1.

data/lib/sass/script/number.rb

@@ -422,12 +422,13 @@ module Sass::Script
     end
 
     # A hash of unit names to their index in the conversion table
-    CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4}
-    CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        ], # in
-                        [ nil,              1,            2.36220473,   10,          28.3464567], # cm
-                        [ nil,              nil,          1,            4.23333333,  12        ], # pc
-                        [ nil,              nil,          nil,          1,           2.83464567], # mm
-                        [ nil,              nil,          nil,          nil,         1         ]] # pt
+    CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4,  "px" => 5    }
+    CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        , 96          ], # in
+                        [ nil,              1,            2.36220473,   10,          28.3464567, 37.795275591], # cm
+                        [ nil,              nil,          1,            4.23333333,  12        , 16          ], # pc
+                        [ nil,              nil,          nil,          1,           2.83464567, 3.7795275591], # mm
+                        [ nil,              nil,          nil,          nil,         1         , 1.3333333333], # pt
+                        [ nil,              nil,          nil,          nil,         nil       , 1           ]] # px
 
     def conversion_factor(from_unit, to_unit)
       res = CONVERSION_TABLE[CONVERTABLE_UNITS[from_unit]][CONVERTABLE_UNITS[to_unit]]

data/lib/sass/selector/sequence.rb

@@ -47,15 +47,15 @@ module Sass
       # @return [Sequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_seq)
-        members = @members
+        members = @members.dup
         nl = (members.first == "\n" && members.shift)
         unless members.any? do |seq_or_op|
             seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
           end
-          members = []
+          old_members, members = members, []
           members << nl if nl
           members << SimpleSequence.new([Parent.new])
-          members += @members
+          members += old_members
         end
 
         Sequence.new(

data/lib/sass/tree/visitors/to_css.rb

@@ -59,9 +59,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     return if node.invisible?
     spaces = ('  ' * [@tabs - node.resolved_value[/^ */].size, 0].max)
 
-    content = node.resolved_value.gsub(/^/, spaces).gsub(%r{^(\s*)//(.*)$}) do |md|
-      "#{$1}/*#{$2} */"
-    end
+    content = node.resolved_value.gsub(/^/, spaces)
+    content.gsub!(%r{^(\s*)//(.*)$}) {|md| "#{$1}/*#{$2} */"} if node.silent
     content.gsub!(/\n +(\* *(?!\/))?/, ' ') if (node.style == :compact || node.style == :compressed) && !node.loud
     content
   end

data/lib/sass/version.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 # This is necessary for loading Sass when Haml is required in Rails 3.
 # Once the split is complete, we can remove it.
 require File.dirname(__FILE__) + '/../sass'
@@ -16,6 +18,7 @@ module Sass
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
+    # The `:date` key, which is not guaranteed to be defined, is the [DateTime] at which this release was cut.
     # If Sass is checked out from Git, the `:rev` key will have the revision hash.
     # For example:
     #
@@ -23,6 +26,7 @@ module Sass
     #       :string => "2.1.0.9616393",
     #       :rev    => "9616393b8924ef36639c7e82aa88a51a24d16949",
     #       :number => "2.1.0",
+    #       :date   => DateTime.parse("Apr 30 13:52:01 2009 -0700"),
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
@@ -36,6 +40,7 @@ module Sass
     #     {
     #       :string => "3.0.beta.1",
     #       :number => "3.0.beta.1",
+    #       :date   => DateTime.parse("Mar 31 00:38:04 2010 -0700"),
     #       :major => 3, :minor => 0, :teeny => -1,
     #       :prerelease => "beta",
     #       :prerelease_number => 1
@@ -55,6 +60,10 @@ module Sass
         :name => name
       }
 
+      if date = version_date
+        @@version[:date] = date
+      end
+
       if numbers[3].is_a?(String)
         @@version[:teeny] = -1
         @@version[:prerelease] = numbers[3]
@@ -101,6 +110,11 @@ module Sass
       end
       return nil
     end
+
+    def version_date
+      return unless File.exists?(scope('VERSION_DATE'))
+      return DateTime.parse(File.read(scope('VERSION_DATE')).strip)
+    end
   end
 
   extend Sass::Version

data/test/sass/functions_test.rb

@@ -865,7 +865,8 @@ MSG
     assert_equal(%Q{"px"}, evaluate("unit(100px)"))
     assert_equal(%Q{"em*px"}, evaluate("unit(10px * 5em)"))
     assert_equal(%Q{"em*px"}, evaluate("unit(5em * 10px)"))
-    assert_equal(%Q{"em*px/cm*rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
+    assert_equal(%Q{"em/rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
+    assert_equal(%Q{"em*vh/cm*rem"}, evaluate("unit(10vh * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"px"}, evaluate("unit($number: 100px)"))
     assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
   end

data/test/sass/results/units.css

@@ -8,4 +8,4 @@ b {
   pt: -72pt;
   inches: 2in;
   more-inches: 3.5in;
-  mixed: 6px; }
+  mixed: 2.042in; }

data/test/sass/script_test.rb

@@ -359,6 +359,7 @@ SASS
 
   def test_operator_unit_conversion
     assert_equal "1.1cm", resolve("1cm + 1mm")
+    assert_equal "2in", resolve("1in + 96px")
     assert_equal "true", resolve("2mm < 1cm")
     assert_equal "true", resolve("10mm == 1cm")
     assert_equal "true", resolve("1 == 1cm")

data/test/sass/scss/css_test.rb

@@ -962,6 +962,21 @@ bar {baz: bang}
 SCSS
   end
 
+  def test_single_line_comment_within_multiline_comment
+    assert_equal(<<CSS, render(<<SCSS))
+body {
+  /*
+  //comment here
+  */ }
+CSS
+body {
+  /*
+  //comment here
+  */
+}
+SCSS
+  end
+
   private
 
   def assert_selector_parses(selector)

data/test/sass/scss/scss_test.rb

@@ -1105,6 +1105,27 @@ SCSS
 
   # Regression
 
+  def test_newline_selector_rendered_multiple_times
+    assert_equal <<CSS, render(<<SCSS)
+form input,
+form select {
+  color: white; }
+
+form input,
+form select {
+  color: white; }
+CSS
+@for $i from 1 through 2 {
+  form {
+    input,
+    select {
+      color: white;
+    }
+  }
+}
+SCSS
+  end
+
   def test_prop_name_interpolation_after_hyphen
     assert_equal <<CSS, render(<<SCSS)
 a {

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'sass'
 require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
+Encoding.default_external = 'UTF-8' if defined?(Encoding)
 
 module Sass::Script::Functions
   def option(name)

data/vendor/listen/CHANGELOG.md

@@ -1,23 +1,63 @@
+## 0.4.7 - June 27, 2012
+
+### Bug fixes
+
+- Increase latency to 0.25, to avoid useless polling fallback. (fixed by [@thibaudgg][])
+- Change watched inotify events, to avoid duplication callback. (fixed by [@thibaudgg][])
+- [#41](https://github.com/guard/listen/issues/41) Use lstat instead of stat when calculating mtime. (fixed by [@ebroder][])
+
+## 0.4.6 - June 20, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Fix digest race condition. (fixed by [@dkubb][])
+
+## 0.4.5 - June 13, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Rescue Errno::ENOENT when path inserted doesn't exist. (reported by [@textgoeshere][], fixed by [@thibaudgg][] and [@rymai][])
+
+## 0.4.4 - June 8, 2012
+
+### Bug fixes
+
+- ~~[#39](https://github.com/guard/listen/issues/39) Non-existing path insertion bug. (reported by [@textgoeshere][], fixed by [@thibaudgg][])~~
+- Fix relative path for directories containing special characters. (reported by [@napcs][], fixed by [@netzpirat][])
+
+## 0.4.3 - June 6, 2012
+
+### Bug fixes
+
+- [#24](https://github.com/guard/listen/issues/24) Fail gracefully when the inotify limit is not enough for Listen to function. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+- [#32](https://github.com/guard/listen/issues/32) Fix a crash when trying to calculate the checksum of unreadable files. (reported by [@nex3][], fixed by [@Maher4Ever][])
+
+### Improvements
+
+- Add `#relative_paths` method to listeners. ([@Maher4Ever][])
+- Add `#started?` query-method to adapters. ([@Maher4Ever][])
+- Dynamically detect the mtime precision used on a system. ([@Maher4Ever][] with help from [@nex3][])
+
 ## 0.4.2 - May 1, 2012
 
 ### Bug fixes
 
-- [#21](https://github.com/guard/listen/issues/21): Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
-- [#27](https://github.com/guard/listen/issues/27): Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
+- [#21](https://github.com/guard/listen/issues/21) Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
+- [#27](https://github.com/guard/listen/issues/27) Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
 - Fix segmentation fault when profiling on Windows. ([@Maher4Ever][])
 - Fix redundant watchers on Windows. ([@Maher4Ever][])
 
 ### Improvements
 
-- [#17](https://github.com/guard/listen/issues/17): Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
+- [#17](https://github.com/guard/listen/issues/17) Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
 - Speed improvement when listening to changes in directories with ignored paths. ([@Maher4Ever][])
 - Added `.rbx` and `.svn` to ignored directories. ([@Maher4Ever][])
 
 ## 0.4.1 - April 15, 2012
 
-### Bug fixes
+### Bug fix
 
-- [#18]((https://github.com/guard/listen/issues/18): Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+- [#18](https://github.com/guard/listen/issues/18) Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
 
 ## 0.4.0 - April 9, 2012
 
@@ -37,19 +77,19 @@
 - Encapsulate thread spawning in the windows-adapter. ([@Maher4Ever][])
 - Fix linux-adapter bug where Listen would report file-modification events on the parent-directory. ([@Maher4Ever][])
 
-### Removals
+### Change
 
 - Remove `wait_until_listening` as adapters doesn't need to run inside threads anymore ([@Maher4Ever][])
 
 ## 0.3.3 - March 6, 2012
 
-### Improvements
+### Improvement
 
 - Improve pause/unpause. ([@thibaudgg][])
 
 ## 0.3.2 - March 4, 2012
 
-### New features
+### New feature
 
 - Add pause/unpause listener's methods. ([@thibaudgg][])
 
@@ -57,7 +97,7 @@
 
 ### Bug fix
 
-- [#9](https://github.com/guard/listen/issues/9): Ignore doesn't seem to work. (reported by [@markiz][], fixed by [@thibaudgg][])
+- [#9](https://github.com/guard/listen/issues/9) Ignore doesn't seem to work. (reported by [@markiz][], fixed by [@thibaudgg][])
 
 ## 0.3.0 - February 21, 2012
 
@@ -81,10 +121,27 @@
 
 - First version with only a polling adapter and basic features set (ignore & filter). ([@thibaudgg][])
 
-[@markiz]: https://github.com/markiz
-[@thibaudgg]: https://github.com/thibaudgg
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#9]: https://github.com/guard/listen/issues/9
+[#17]: https://github.com/guard/listen/issues/17
+[#18]: https://github.com/guard/listen/issues/18
+[#21]: https://github.com/guard/listen/issues/21
+[#24]: https://github.com/guard/listen/issues/24
+[#27]: https://github.com/guard/listen/issues/27
+[#32]: https://github.com/guard/listen/issues/32
+[#39]: https://github.com/guard/listen/issues/39
 [@Maher4Ever]: https://github.com/Maher4Ever
-[@daemonza]: https://github.com/daemonza
+[@dkubb]: https://github.com/dkubb
+[@ebroder]: https://github.com/ebroder
 [@akerbos]: https://github.com/akerbos
-[@fny]: https://github.com/fny
 [@cobychapple]: https://github.com/cobychapple
+[@daemonza]: https://github.com/daemonza
+[@fny]: https://github.com/fny
+[@markiz]: https://github.com/markiz
+[@napcs]: https://github.com/napcs
+[@netzpirat]: https://github.com/netzpirat
+[@nex3]: https://github.com/nex3
+[@rymai]: https://github.com/rymai
+[@scottdavis]: https://github.com/scottdavis
+[@textgoeshere]: https://github.com/textgoeshere
+[@thibaudgg]: https://github.com/thibaudgg

data/vendor/listen/Gemfile

@@ -6,23 +6,11 @@ gem 'rake'
 
 group :development do
   platform :ruby do
-    gem 'rb-readline'
+    gem 'coolline'
   end
 
-  require 'rbconfig'
-  case RbConfig::CONFIG['target_os']
-  when /darwin/i
-    # gem 'ruby_gntp',  '~> 0.3.4', :require => false
-    gem 'growl', :require => false
-  when /linux/i
-    gem 'libnotify',  '~> 0.7.1', :require => false
-  when /mswin|mingw/i
-    gem 'win32console', :require => false
-    gem 'rb-notifu', '>= 0.0.4', :require => false
-  end
-
-  gem 'guard',       '~> 1.0.0'
-  gem 'guard-rspec', '~> 0.7.0'
+  gem 'guard'
+  gem 'guard-rspec'
   gem 'yard'
   gem 'redcarpet'
   gem 'pry'
@@ -31,5 +19,5 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.9.0'
+  gem 'rspec'
 end

data/vendor/listen/README.md

@@ -32,12 +32,12 @@ Feel free to give your feeback via [Listen issues](https://github.com/guard/list
 
 ``` ruby
 # Listen to a single directory.
-Listen.to('dir/path/to/listen', filter: /\.rb$/, ignore: %r{ignored/path/}) do |modified, added, removed|
+Listen.to('dir/path/to/listen', :filter => /\.rb$/, :ignore => %r{ignored/path/}) do |modified, added, removed|
   # ...
 end
 
 # Listen to multiple directories.
-Listen.to('dir/to/awesome_app', 'dir/to/other_app', filter: /\.rb$/, latency: 0.1) do |modified, added, removed|
+Listen.to('dir/to/awesome_app', 'dir/to/other_app', :filter => /\.rb$/, :latency => 0.1) do |modified, added, removed|
   # ...
 end
 ```
@@ -191,7 +191,7 @@ These options can be set through `Listen.to` params or via methods (see the "Obj
                                                # default: See DEFAULT_IGNORED_DIRECTORIES and DEFAULT_IGNORED_EXTENSIONS in Listen::DirectoryRecord
 
 :latency => 0.5                                # Set the delay (**in seconds**) between checking for changes
-                                               # default: 0.1 sec (1.0 sec for polling)
+                                               # default: 0.25 sec (1.0 sec for polling)
 
 :relative_paths => true                        # Enable the use of relative paths in the callback.
                                                # default: false

data/vendor/listen/lib/listen/adapter.rb

@@ -8,7 +8,7 @@ module Listen
     attr_accessor :directories, :latency, :paused
 
     # The default delay between checking for changes.
-    DEFAULT_LATENCY = 0.1
+    DEFAULT_LATENCY = 0.25
 
     # The default warning message when falling back to polling adapter.
     POLLING_FALLBACK_MESSAGE = "WARNING: Listen has fallen back to polling, learn more at https://github.com/guard/listen#fallback."

data/vendor/listen/lib/listen/adapters/linux.rb

@@ -10,7 +10,7 @@ module Listen
       # @see http://www.tin.org/bin/man.cgi?section=7&topic=inotify
       # @see https://github.com/nex3/rb-inotify/blob/master/lib/rb-inotify/notifier.rb#L99-L177
       #
-      EVENTS = %w[recursive attrib close modify move create delete delete_self move_self]
+      EVENTS = %w[recursive attrib create delete move close_write]
 
       # The message to show when the limit of inotify watchers is not enough
       #

data/vendor/listen/lib/listen/directory_record.rb

@@ -163,7 +163,7 @@ module Listen
     #
     def relative_to_base(path)
       return nil unless path[@directory]
-      path.sub(%r{^#{@directory}#{File::SEPARATOR}?}, '')
+      path.sub(%r{^#{Regexp.quote(@directory)}#{File::SEPARATOR}?}, '')
     end
 
     private
@@ -239,8 +239,8 @@ module Listen
         elsif !ignored?(path) && filtered?(path) && !existing_path?(path)
           if File.file?(path)
             @changes[:added] << (options[:relative_paths] ? relative_to_base(path) : path)
+            insert_path(path)
           end
-          insert_path(path)
         end
       end
     end
@@ -253,11 +253,11 @@ module Listen
     def content_modified?(path)
       sha1_checksum = Digest::SHA1.file(path).to_s
       return false if @sha1_checksums[path] == sha1_checksum
-
-      had_no_checksum = @sha1_checksums[path].nil?
-      @sha1_checksums[path] = sha1_checksum
-
-      had_no_checksum ? false : true
+      @sha1_checksums.key?(path)
+    rescue Errno::EACCES, Errno::ENOENT
+      false
+    ensure
+      @sha1_checksums[path] = sha1_checksum if sha1_checksum
     end
 
     # Traverses the base directory looking for paths that should
@@ -292,6 +292,7 @@ module Listen
       meta_data.type = File.directory?(path) ? 'Dir' : 'File'
       meta_data.mtime = mtime_of(path) unless meta_data.type == 'Dir' # mtimes of dirs are not used yet
       @paths[File.dirname(path)][File.basename(path)] = meta_data
+    rescue Errno::ENOENT
     end
 
     # Returns whether or not a path exists in the paths hash.
@@ -311,7 +312,7 @@ module Listen
     # @return [Fixnum, Float] the mtime of the file
     #
     def mtime_of(file)
-      File.mtime(file).send(HIGH_PRECISION_SUPPORTED ? :to_f : :to_i)
+      File.lstat(file).mtime.send(HIGH_PRECISION_SUPPORTED ? :to_f : :to_i)
     end
   end
 end

data/vendor/listen/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '0.4.2'
+  VERSION = '0.4.7'
 end

data/vendor/listen/spec/listen/directory_record_spec.rb

@@ -193,6 +193,25 @@ describe Listen::DirectoryRecord do
     it 'returns nil when the passed path is not inside the base-directory' do
       subject.relative_to_base('/tmp/some_random_path').should be_nil
     end
+    
+    context 'when containing regexp characters in the base directory' do
+      before do
+        fixtures do |path|
+          mkdir 'a_directory$'
+          @dir = described_class.new(path + '/a_directory$')
+          @dir.build
+        end
+      end
+
+      it 'removes the path of the base-directory from the passed path' do
+        path = 'dir/to/app/file.rb'
+        @dir.relative_to_base(File.join(@dir.directory, path)).should eq path
+      end
+
+      it 'returns nil when the passed path is not inside the base-directory' do
+        @dir.relative_to_base('/tmp/some_random_path').should be_nil
+      end
+    end
   end
 
   describe '#fetch_changes' do
@@ -385,7 +404,7 @@ describe Listen::DirectoryRecord do
             end
           end
 
-          context '#27 - when a file is created and then checked for modifications at the same second' do
+          context 'when a file is created and then checked for modifications at the same second - #27' do
             # This issue was the result of checking a file for content changes when
             # the mtime and the checking time are the same. In this case there
             # is no checksum saved, so the file was reported as being changed.
@@ -1030,5 +1049,90 @@ describe Listen::DirectoryRecord do
         end
       end
     end
+
+    context 'within a directory containing unreadble paths - #32' do
+      it 'detects changes more than a second apart' do
+        fixtures do |path|
+          touch 'unreadable_file.txt'
+          chmod 000, 'unreadable_file.txt'
+
+          modified, added, removed = changes(path) do
+            sleep 1.1
+            touch 'unreadable_file.txt'
+          end
+
+          added.should be_empty
+          modified.should =~ %w(unreadable_file.txt)
+          removed.should be_empty
+        end
+      end
+
+      context 'with multiple changes within the same second' do
+        before { ensure_same_second }
+
+        it 'does not detect changes even if content changes', :unless => described_class::HIGH_PRECISION_SUPPORTED do
+          fixtures do |path|
+            touch 'unreadable_file.txt'
+
+            modified, added, removed = changes(path) do
+              open('unreadable_file.txt', 'w') { |f| f.write('foo') }
+              chmod 000, 'unreadable_file.txt'
+            end
+
+            added.should be_empty
+            modified.should be_empty
+            removed.should be_empty
+          end
+        end
+      end
+    end
+
+    context 'within a directory containing a removed file - #39' do
+      it 'does not raise an exception when hashing a removed file' do
+
+        # simulate a race condition where the file is removed after the
+        # change event is tracked, but before the hash is calculated
+        Digest::SHA1.should_receive(:file).and_raise(Errno::ENOENT)
+
+        lambda {
+          fixtures do |path|
+            file = 'removed_file.txt'
+            touch file
+            changes(path) { touch file }
+          end
+        }.should_not raise_error(Errno::ENOENT)
+      end
+    end
+
+    context 'with symlinks' do
+      it 'looks at symlinks not their targets' do
+        fixtures do |path|
+          touch 'target'
+          symlink 'target', 'symlink'
+
+          record = described_class.new(path)
+          record.build
+
+          sleep 1
+          touch 'target'
+
+          record.fetch_changes([path], :relative_paths => true)[:modified].should == ['target']
+        end
+      end
+
+      it 'handles broken symlinks' do
+        fixtures do |path|
+          symlink 'target', 'symlink'
+
+          record = described_class.new(path)
+          record.build
+
+          sleep 1
+          rm 'symlink'
+          symlink 'new-target', 'symlink'
+          record.fetch_changes([path], :relative_paths => true)
+        end
+      end
+    end
   end
 end

data/vendor/listen/spec/spec_helper.rb

@@ -1,14 +1,16 @@
 require 'listen'
 
-ENV["TEST_LATENCY"] ||= "0.1"
+ENV["TEST_LATENCY"] ||= "0.25"
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.color_enabled = true
+  config.order = :random
+  config.filter_run :focus => true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 end
 
 def test_latency

metadata

@@ -1,68 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sass
-version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: false
-  segments: 
-  - 3
-  - 1
-  - 20
-  version: 3.1.20
+version: !ruby/object:Gem::Version
+  version: 3.1.21
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nathan Weizenbaum
 - Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-29 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 5
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
-  version_requirements: *id002
-description: "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n      nested rules, variables, mixins, selector inheritance, and more.\n      It's translated to well-formatted, standard CSS using the\n      command line tool or a web-framework plugin.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.9
+description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n
+  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
+  translated to well-formatted, standard CSS using the\n      command line tool or
+  a web-framework plugin.\n"
 email: sass-lang@googlegroups.com
-executables: 
+executables:
 - sass
 - sass-convert
 - scss
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - rails/init.rb
 - lib/sass.rb
 - lib/sass/cache_stores.rb
@@ -313,47 +307,36 @@ files:
 - .yardopts
 - README.md
 - VERSION_NAME
+- VERSION_DATE
 - REVISION
 - MIT-LICENSE
 - VERSION
 - CONTRIBUTING
-has_rdoc: false
 homepage: http://sass-lang.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sass
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
-test_files: 
+test_files:
 - test/sass/engine_test.rb
 - test/sass/functions_test.rb
 - test/sass/extend_test.rb