sass 3.2.0.alpha.269 → 3.2.0.alpha.273

data/REVISION

@@ -1 +1 @@
-ce67165e9449e0a708282b04f163a3e8b8a8c370
+9b1820a2b092ba228eb20bea33b07ddd0793146f

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.269
+3.2.0.alpha.273

data/lib/sass/script/functions.rb

@@ -973,23 +973,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

@@ -36,7 +36,7 @@ module Sass::Script
     attr_accessor :original
 
     def self.precision
-      @precision ||= 3
+      @precision ||= 5
     end
 
     # Sets the number of digits of precision

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

@@ -73,20 +73,6 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
   end
 
-  def invalid_function_parent?(parent, child)
-    "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
-  end
-
-  VALID_FUNCTION_CHILDREN = [
-    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
-    Sass::Tree::VariableNode, Sass::Tree::WarnNode
-  ] + CONTROL_NODES
-  def invalid_function_child?(parent, child)
-    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
-      "Functions can only contain variable declarations and control directives."
-    end
-  end
-
   INVALID_IMPORT_PARENTS = CONTROL_NODES +
     [Sass::Tree::MixinDefNode, Sass::Tree::MixinNode]
   def invalid_import_parent?(parent, child)
@@ -95,10 +81,6 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
     return if parent.is_a?(Sass::Tree::RootNode)
     return "CSS import directives may only be used at the root of a document." if child.css_import?
-    # If this is a nested @import, we need to make sure it doesn't have anything
-    # that's legal at top-level but not in the current context (e.g. mixin defs).
-    child.imported_file.to_tree.children.each {|c| visit(c)}
-    nil
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:filename => child.imported_file.options[:filename])
     e.add_backtrace(:filename => child.filename, :line => child.line)
@@ -106,7 +88,25 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def invalid_mixindef_parent?(parent, child)
-    "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
+    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+      return "Mixins may not be defined within control directives or other mixins."
+    end
+  end
+
+  def invalid_function_parent?(parent, child)
+    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+      return "Functions may not be defined within control directives or other mixins."
+    end
+  end
+
+  VALID_FUNCTION_CHILDREN = [
+    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode
+  ] + CONTROL_NODES
+  def invalid_function_child?(parent, child)
+    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
+      "Functions can only contain variable declarations and control directives."
+    end
   end
 
   VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES

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

@@ -113,7 +113,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Loads the function into the environment.
   def visit_function(node)
-    @environment.set_function(node.name,
+    @environment.set_local_function(node.name,
       Sass::Callable.new(node.name, node.args, @environment, node.children, !:has_content))
     []
   end
@@ -155,7 +155,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Loads a mixin into the environment.
   def visit_mixindef(node)
-    @environment.set_mixin(node.name,
+    @environment.set_local_mixin(node.name,
       Sass::Callable.new(node.name, node.args, @environment, node.children, node.has_content))
     []
   end

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.type == :silent
     content.gsub!(/\n +(\* *(?!\/))?/, ' ') if (node.style == :compact || node.style == :compressed) && node.type != :loud
     content
   end

data/test/sass/engine_test.rb

@@ -73,7 +73,7 @@ MSG
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     "=foo\n  :color red\n.bar\n  +bang_bop" => "Undefined mixin 'bang_bop'.",
     "=foo\n  :color red\n.bar\n  +bang-bop" => "Undefined mixin 'bang-bop'.",
-    ".bar\n  =foo\n    :color red\n" => ["Mixins may only be defined at the root of a document.", 2],
+    ".foo\n  =foo\n    :color red\n.bar\n  +foo" => "Undefined mixin 'foo'.",
     "    a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 1],
     " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
     "a\n  b: c\n b: c" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],
@@ -105,7 +105,6 @@ MSG
     "@function foo($)\n  @return 1" => ['Invalid CSS after "(": expected variable (e.g. $foo), was "$)"', 1],
     "@function foo()\n  @return" => 'Invalid @return: expected expression.',
     "@function foo()\n  @return 1\n    $var: val" => 'Illegal nesting: Nothing may be nested beneath return directives.',
-    "foo\n  @function bar()\n    @return 1" => ['Functions may only be defined at the root of a document.', 2],
     "@function foo($a)\n  @return 1\na\n  b: foo()" => 'Function foo is missing argument $a',
     "@function foo()\n  @return 1\na\n  b: foo(2)" => 'Wrong number of arguments (1 for 0) for `foo\'',
     "@function foo()\n  @return 1\na\n  b: foo($a: 1)" => "Function foo doesn't have an argument named $a",
@@ -274,7 +273,7 @@ SASS
   end
 
   def test_imported_exception
-    [1, 2, 3, 4, 5].each do |i|
+    [1, 2, 3, 4].each do |i|
       begin
         Sass::Engine.new("@import bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -296,7 +295,7 @@ SASS
   end
 
   def test_double_imported_exception
-    [1, 2, 3, 4, 5].each do |i|
+    [1, 2, 3, 4].each do |i|
       begin
         Sass::Engine.new("@import nested_bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -723,24 +722,6 @@ CSS
 SASS
   end
 
-  def test_nested_import_with_toplevel_constructs
-    Sass::Engine.new(".foo\n  @import importee", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
-  rescue Sass::SyntaxError => err
-    assert_equal(3, err.sass_line)
-    assert_match(/(\/|^)importee\.sass$/, err.sass_filename)
-
-    assert_hash_has(err.sass_backtrace.first,
-      :filename => err.sass_filename, :line => err.sass_line)
-
-    assert_nil(err.sass_backtrace[1][:filename])
-    assert_equal(2, err.sass_backtrace[1][:line])
-
-    assert_match(/(\/|^)importee\.sass:3$/, err.backtrace.first)
-    assert_equal("(sass):2", err.backtrace[1])
-  else
-    assert(false, "Exception not raised for importing mixins nested")
-  end
-
   def test_units
     renders_correctly "units"
   end

data/test/sass/scss/css_test.rb

@@ -1027,6 +1027,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

@@ -1073,17 +1073,83 @@ $domain: "sass-lang.com";
 SCSS
   end
 
+  def test_nested_mixin_def
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: b; }
+CSS
+foo {
+  @mixin bar {a: b}
+  @include bar; }
+SCSS
+  end
+
+  def test_nested_mixin_shadow
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  c: d; }
+
+baz {
+  a: b; }
+CSS
+@mixin bar {a: b}
+
+foo {
+  @mixin bar {c: d}
+  @include bar;
+}
+
+baz {@include bar}
+SCSS
+  end
+
+  def test_nested_function_def
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: 1; }
+
+bar {
+  b: foo(); }
+CSS
+foo {
+  @function foo() {@return 1}
+  a: foo(); }
+
+bar {b: foo()}
+SCSS
+  end
+
+  def test_nested_function_shadow
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: 2; }
+
+baz {
+  b: 1; }
+CSS
+@function foo() {@return 1}
+
+foo {
+  @function foo() {@return 2}
+  a: foo();
+}
+
+baz {b: foo()}
+SCSS
+  end
+
   ## Errors
 
-  def test_mixin_defs_only_at_toplevel
+  def test_nested_mixin_def_is_scoped
     render <<SCSS
 foo {
   @mixin bar {a: b}}
+bar {@include bar}
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal "Mixins may only be defined at the root of a document.", e.message
-    assert_equal 2, e.sass_line
+    assert_equal "Undefined mixin 'bar'.", e.message
+    assert_equal 3, e.sass_line
   end
 
   def test_rules_beneath_properties

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302343
+  hash: 592302399
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 269
-  version: 3.2.0.alpha.269
+  - 273
+  version: 3.2.0.alpha.273
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 -04:00
+date: 2012-07-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,10 +110,10 @@ files:
 - lib/sass/script/list.rb
 - lib/sass/script/literal.rb
 - lib/sass/script/node.rb
-- lib/sass/script/null.rb
 - lib/sass/script/number.rb
 - lib/sass/script/operation.rb
 - lib/sass/script/parser.rb
+- lib/sass/script/null.rb
 - lib/sass/script/string.rb
 - lib/sass/script/string_interpolation.rb
 - lib/sass/script/unary_operation.rb
@@ -154,6 +154,7 @@ files:
 - lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -163,7 +164,6 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/supports_node.rb
 - lib/sass/tree/trace_node.rb
@@ -275,7 +275,6 @@ files:
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass
 - test/sass/templates/bork4.sass
-- test/sass/templates/bork5.sass
 - test/sass/templates/compact.sass
 - test/sass/templates/complex.sass
 - test/sass/templates/compressed.sass
@@ -298,7 +297,6 @@ files:
 - test/sass/templates/nested_bork2.sass
 - test/sass/templates/nested_bork3.sass
 - test/sass/templates/nested_bork4.sass
-- test/sass/templates/nested_bork5.sass
 - test/sass/templates/nested_import.sass
 - test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/options.sass

data/test/sass/templates/bork5.sass

@@ -1,3 +0,0 @@
-foo
-  @function bar($a)
-    @return $a

data/test/sass/templates/nested_bork5.sass

@@ -1,2 +0,0 @@
-
-@import bork5