sass 3.3.0.alpha.93 → 3.3.0.alpha.101

data/lib/sass/util/multibyte_string_scanner.rb

@@ -3,23 +3,44 @@ require 'strscan'
 if Sass::Util.ruby1_8?
   Sass::Util::MultibyteStringScanner = StringScanner
 else
+  if Sass::Util.rbx?
+    # Rubinius's StringScanner class implements some of its methods in terms of
+    # others, which causes us to double-count bytes in some cases if we do
+    # straightforward inheritance. To work around this, we use a delegate class.
+    require 'delegate'
+    class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
+      def initialize(str)
+        super(StringScanner.new(str))
+        @mb_pos = 0
+        @mb_matched_size = nil
+        @mb_last_pos = nil
+      end
+
+      def is_a?(klass)
+        __getobj__.is_a?(klass) || super
+      end
+    end
+  else
+    class Sass::Util::MultibyteStringScanner < StringScanner
+      def initialize(str)
+        super
+        @mb_pos = 0
+        @mb_matched_size = nil
+        @mb_last_pos = nil
+      end
+    end
+  end
+
   # A wrapper of the native StringScanner class that works correctly with
   # multibyte character encodings. The native class deals only in bytes, not
   # characters, for methods like [#pos] and [#matched_size]. This class deals
   # only in characters, instead.
-  class Sass::Util::MultibyteStringScanner < StringScanner
+  class Sass::Util::MultibyteStringScanner
     def self.new(str)
       return StringScanner.new(str) if str.ascii_only?
       super
     end
 
-    def initialize(str)
-      super
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-    end
-
     alias_method :byte_pos, :pos
     alias_method :byte_matched_size, :matched_size
 

data/test/sass/engine_test.rb

@@ -143,13 +143,13 @@ MSG
     '+foo(1 + 1: 2)' => 'Invalid CSS after "(1 + 1": expected comma, was ": 2)"',
     '+foo($var: )' => 'Invalid CSS after "($var: ": expected mixin argument, was ")"',
     '+foo($var: a, $var: b)' => 'Keyword argument "$var" passed more than once',
-    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var-var" passed more than once',
-    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var_var" passed more than once',
+    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var_var" passed more than once',
+    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var-var" passed more than once',
     "a\n  b: foo(1 + 1: 2)" => 'Invalid CSS after "foo(1 + 1": expected comma, was ": 2)"',
     "a\n  b: foo($var: )" => 'Invalid CSS after "foo($var: ": expected function argument, was ")"',
     "a\n  b: foo($var: a, $var: b)" => 'Keyword argument "$var" passed more than once',
-    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var-var" passed more than once',
-    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var_var" passed more than once',
+    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var_var" passed more than once',
+    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var-var" passed more than once',
     "@if foo\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
     "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
@@ -2416,6 +2416,22 @@ SASS
 
   # Regression tests
 
+  def test_supports_bubbles
+    assert_equal <<CSS, render(<<SASS)
+parent {
+  background: orange; }
+  @supports (perspective: 10px) or (-moz-perspective: 10px) {
+    parent child {
+      background: blue; } }
+CSS
+parent
+  background: orange
+  @supports (perspective: 10px) or (-moz-perspective: 10px)
+    child
+      background: blue
+SASS
+  end
+
   def test_line_numbers_with_dos_line_endings
     assert_equal <<CSS, render(<<SASS, :line_comments => true)
 /* line 5, test_line_numbers_with_dos_line_endings_inline.sass */

data/test/sass/extend_test.rb

@@ -1130,6 +1130,21 @@ SCSS
 
   # Regression Tests
 
+  def test_extend_in_double_nested_media_query
+    assert_equal <<CSS, render(<<SCSS)
+@media all and (orientation: landscape) {
+  .bar {
+    color: blue; } }
+CSS
+@media all {
+  @media (orientation: landscape) {
+    %foo {color: blue}
+    .bar {@extend %foo}
+  }
+}
+SCSS
+  end
+
   def test_partially_failed_extend
     assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
 .rc, test {

data/test/sass/functions_test.rb

@@ -1103,14 +1103,17 @@ MSG
   def test_zip
     assert_equal("1 3 5, 2 4 6", evaluate("zip(1 2, 3 4, 5 6)"))
     assert_equal("1 4 7, 2 5 8", evaluate("zip(1 2 3, 4 5 6, 7 8)"))
+    assert_equal("1 2 3", evaluate("zip(1, 2, 3)"))
   end
 
   def test_index
     assert_equal("1", evaluate("index(1px solid blue, 1px)"))
     assert_equal("2", evaluate("index(1px solid blue, solid)"))
     assert_equal("3", evaluate("index(1px solid blue, #00f)"))
+    assert_equal("1", evaluate("index(1px, 1px)"))
     assert_equal("false", evaluate("index(1px solid blue, 1em)"))
     assert_equal("false", evaluate("index(1px solid blue, notfound)"))
+    assert_equal("false", evaluate("index(1px, #00f)"))
   end
 
   def test_if
@@ -1179,21 +1182,37 @@ MSG
   end
 
   def test_assert_unit
-    ctx = Sass::Script::Functions::EvaluationContext.new({})
+    ctx = Sass::Script::Functions::EvaluationContext.new(Sass::Environment.new(nil, {}))
     ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), "px"
     ctx.assert_unit Sass::Script::Number.new(10, [], []), nil
+
     begin
       ctx.assert_unit Sass::Script::Number.new(10, [], []), "px"
       fail
     rescue ArgumentError => e
       assert_equal "Expected 10 to have a unit of px", e.message
     end
+
     begin
       ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), nil
       fail
     rescue ArgumentError => e
       assert_equal "Expected 10px to be unitless", e.message
     end
+
+    begin
+      ctx.assert_unit Sass::Script::Number.new(10, [], []), "px", "arg"
+      fail
+    rescue ArgumentError => e
+      assert_equal "Expected $arg to have a unit of px but got 10", e.message
+    end
+
+    begin
+      ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), nil, "arg"
+      fail
+    rescue ArgumentError => e
+      assert_equal "Expected $arg to be unitless but got 10px", e.message
+    end
   end
 
   ## Regression Tests

data/test/sass/script_test.rb

@@ -493,7 +493,9 @@ SASS
     # argument errors caused by programming errors in a function and
     # argument errors explicitly thrown within that function.
     return if RUBY_PLATFORM =~ /java/
-    assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
+
+    # Don't validate the message; it's different on Rubinius.
+    assert_raise(ArgumentError) {resolve("arg-error()")}
   end
 
   def test_shallow_argument_error_unwrapped
@@ -544,6 +546,8 @@ SASS
     assert Sass::Script::Number.new(10, "px").is_unit?("px")
     assert Sass::Script::Number.new(10).is_unit?(nil)
     assert !Sass::Script::Number.new(10, "px", "em").is_unit?("px")
+    assert !Sass::Script::Number.new(10, [], "em").is_unit?("em")
+    assert !Sass::Script::Number.new(10, ["px", "em"]).is_unit?("px")
   end
 
   private

data/vendor/listen/CHANGELOG.md

@@ -1,3 +1,62 @@
+## 0.7.2 - January 11, 2013
+
+### Bug fix
+
+- [#76] Exception on filename which is not in UTF-8. (fixed by [@piotr-sokolowski][])
+
+## 0.7.1 - January 6, 2013
+
+### Bug fix
+
+- [#75] Default high precision off if the mtime call fails. (fixed by [@zanker][])
+
+## 0.7.0 - December 29, 2012
+
+### Bug fixes
+
+- [#73] Rescue Errno::EOPNOTSUPP on sha1_checksum generation. (fixed by [@thibaudgg][])
+
+### New feature
+
+- Add support for *BSD with rb-kqueue. ([@mat813][])
+
+## 0.6.0 - November 21, 2012
+
+### New feature
+
+- Add bang versions for filter and ignore listener methods. ([@tarsolya][])
+
+## 0.5.3 - October 3, 2012
+
+### Bug fixes
+
+- [#65] Fix ruby warning in adapter.rb. (fixed by [@vongruenigen][])
+- [#64] ENXIO raised when hashing UNIX domain socket file. (fixed by [@sunaku][])
+
+## 0.5.2 - Septemper 23, 2012
+
+### Bug fix
+
+- [#62] Fix double change callback with polling adapter. (fixed by [@thibaudgg][])
+
+## 0.5.1 - Septemper 18, 2012
+
+### Bug fix
+
+- [#61] Fix a synchronisation bug that caused constant fallback to polling. (fixed by [@Maher4Ever][])
+
+## 0.5.0 - Septemper 1, 2012
+
+### New features
+
+- Add a dependency manager to handle platform-specific gems. So there is no need anymore to install
+  extra gems which will never be used on the user system. ([@Maher4Ever][])
+- Add a manual reporting mode to the adapters. ([@Maher4Ever][])
+
+### Improvements
+
+- [#28] Enhance the speed of detecting changes on Windows by using the [WDM][] library. ([@Maher4Ever][])
+
 ## 0.4.7 - June 27, 2012
 
 ### Bug fixes
@@ -128,8 +187,16 @@
 [#21]: https://github.com/guard/listen/issues/21
 [#24]: https://github.com/guard/listen/issues/24
 [#27]: https://github.com/guard/listen/issues/27
+[#28]: https://github.com/guard/listen/issues/28
 [#32]: https://github.com/guard/listen/issues/32
-[#39]: https://github.com/guard/listen/issues/39
+[#41]: https://github.com/guard/listen/issues/41
+[#61]: https://github.com/guard/listen/issues/61
+[#62]: https://github.com/guard/listen/issues/62
+[#64]: https://github.com/guard/listen/issues/64
+[#65]: https://github.com/guard/listen/issues/65
+[#73]: https://github.com/guard/listen/issues/73
+[#75]: https://github.com/guard/listen/issues/75
+[#76]: https://github.com/guard/listen/issues/76
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@dkubb]: https://github.com/dkubb
 [@ebroder]: https://github.com/ebroder
@@ -138,10 +205,17 @@
 [@daemonza]: https://github.com/daemonza
 [@fny]: https://github.com/fny
 [@markiz]: https://github.com/markiz
+[@mat813]: https://github.com/mat813
 [@napcs]: https://github.com/napcs
 [@netzpirat]: https://github.com/netzpirat
 [@nex3]: https://github.com/nex3
+[@piotr-sokolowski]: https://github.com/piotr-sokolowski
 [@rymai]: https://github.com/rymai
 [@scottdavis]: https://github.com/scottdavis
+[@sunaku]: https://github.com/sunaku
 [@textgoeshere]: https://github.com/textgoeshere
-[@thibaudgg]: https://github.com/thibaudgg
+[@thibaudgg]: https://github.com/thibaudgg
+[@tarsolya]: https://github.com/tarsolya
+[@vongruenigen]: https://github.com/vongruenigen
+[@zanker]: https://github.com/zanker
+[WDM]: https://github.com/Maher4Ever/wdm

data/vendor/listen/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+Contribute to Listen
+===================
+
+File an issue
+-------------
+
+You can report bugs and feature requests to [GitHub Issues](https://github.com/guard/listen/issues).
+
+**Please don't ask question in the issue tracker**, instead ask them in our
+[Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
+
+Try to figure out where the issue belongs to: Is it an issue with Listen itself or with Guard?
+
+When you file a bug, please try to follow these simple rules if applicable:
+
+* Make sure you run Listen with `bundle exec` first.
+* Add your `Guardfile` (if used) and `Gemfile` to the issue.
+* Make sure that the issue is reproducible with your description.
+
+**It's most likely that your bug gets resolved faster if you provide as much information as possible!**
+
+Development
+-----------
+
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/listen/master/frames).
+* Source hosted at [GitHub](https://github.com/guard/listen).
+
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+
+* Please create a topic branch for every separate change you make.
+* Make sure your patches are well tested. All specs run with `rake spec` must pass.
+* Update the [Yard](http://yardoc.org/) documentation.
+* Update the [README](https://github.com/guard/listen/blob/master/README.md).
+* Update the [CHANGELOG](https://github.com/guard/listen/blob/master/CHANGELOG.md) for noteworthy changes.
+* Please **do not change** the version number.
+
+For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
+`#guard` (irc.freenode.net).

data/vendor/listen/Gemfile

@@ -1,9 +1,16 @@
+require 'rbconfig'
+
 source :rubygems
 
 gemspec
 
 gem 'rake'
 
+gem 'rb-kqueue', '~> 0.2' if RbConfig::CONFIG['target_os'] =~ /freebsd/i
+gem 'rb-fsevent', '~> 0.9.1' if RbConfig::CONFIG['target_os'] =~ /darwin(1.+)?$/i
+gem 'rb-inotify', '~> 0.8.8', :github => 'mbj/rb-inotify' if RbConfig::CONFIG['target_os'] =~ /linux/i
+gem 'wdm',        '~> 0.0.3' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+
 group :development do
   platform :ruby do
     gem 'coolline'
@@ -20,4 +27,4 @@ end
 
 group :test do
   gem 'rspec'
-end
+end

data/vendor/listen/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --format doc' do
+guard :rspec, :all_on_start => false, :all_after_pass => false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/support/adapter_helper.rb')  { "spec/listen/adapters" }

data/vendor/listen/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Thibaud Guillaume-Gentil
+Copyright (c) 2013 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/vendor/listen/README.md

@@ -6,10 +6,10 @@ The Listen gem listens to file modifications and notifies you about the changes.
 
 * Works everywhere!
 * Supports watching multiple directories from a single listener.
-* OS-specific adapters for Mac OS X 10.6+, Linux and Windows.
+* OS-specific adapters for Mac OS X 10.6+, Linux, *BSD and Windows.
 * Automatic fallback to polling if OS-specific adapter doesn't work.
-* Detects files modification, addidation and removal.
-* Checksum comparaison for modifications made under the same second.
+* Detects file modification, addition and removal.
+* Checksum comparison for modifications made under the same second.
 * Allows supplying regexp-patterns to ignore and filter paths for better results.
 * Tested on all Ruby environments via [travis-ci](http://travis-ci.org/guard/listen).
 
@@ -215,6 +215,8 @@ with a directory-separator, otherwise they won't work as expected.
 As an example: to ignore the `build` directory in a C-project, use `%r{build/}`
 and not `%r{/build/}`.
 
+Use `#filter!` and `#ignore!` methods to overwrites default patterns.
+
 ### Non-blocking listening to changes
 
 Starting a listener blocks the current thread by default. That means any code after the
@@ -240,7 +242,7 @@ block execution. See the "Block API" section for an example.
 ## Listen adapters
 
 The Listen gem has a set of adapters to notify it when there are changes.
-There are 3 OS-specific adapters to support Mac, Linux and Windows. These adapters are fast
+There are 3 OS-specific adapters to support Mac, Linux, *BSD and Windows. These adapters are fast
 as they use some system-calls to implement the notifying function.
 
 There is also a polling adapter which is a cross-platform adapter and it will
@@ -251,7 +253,6 @@ want to force the use of the polling adapter, either use the `:force_polling` op
 while initializing the listener or call the `force_polling` method on your listener
 before starting it.
 
-<a name="fallback"/>
 ## Polling fallback
 
 When a OS-specific adapter doesn't work the Listen gem automatically falls back to the polling adapter.
@@ -286,6 +287,7 @@ For questions please join us in our [Google group](http://groups.google.com/grou
 * [Michael Kessler (netzpirat)][] for having written the [initial specs](https://github.com/guard/listen/commit/1e457b13b1bb8a25d2240428ce5ed488bafbed1f).
 * [Travis Tilley (ttilley)][] for this awesome work on [fssm][] & [rb-fsevent][].
 * [Nathan Weizenbaum (nex3)][] for [rb-inotify][], a thorough inotify wrapper.
+* [Mathieu Arnold (mat813)][] for [rb-kqueue][], a simple kqueue wrapper.
 * [stereobooster][] for [rb-fchange][], windows support wouldn't exist without him.
 * [Yehuda Katz (wycats)][] for [vigilo][], that has been a great source of inspiration.
 
@@ -304,6 +306,7 @@ For questions please join us in our [Google group](http://groups.google.com/grou
 [Travis Tilley (ttilley)]: https://github.com/ttilley
 [fssm]: https://github.com/ttilley/fssm
 [rb-fsevent]: https://github.com/thibaudgg/rb-fsevent
+[Mathieu Arnold (mat813)]: https://github.com/mat813
 [Nathan Weizenbaum (nex3)]: https://github.com/nex3
 [rb-inotify]: https://github.com/nex3/rb-inotify
 [stereobooster]: https://github.com/stereobooster

data/vendor/listen/lib/listen.rb

@@ -1,14 +1,16 @@
 module Listen
 
-  autoload :Turnstile,       'listen/turnstile'
-  autoload :Listener,        'listen/listener'
-  autoload :MultiListener,   'listen/multi_listener'
-  autoload :DirectoryRecord, 'listen/directory_record'
-  autoload :Adapter,         'listen/adapter'
+  autoload :Turnstile,         'listen/turnstile'
+  autoload :Listener,          'listen/listener'
+  autoload :MultiListener,     'listen/multi_listener'
+  autoload :DirectoryRecord,   'listen/directory_record'
+  autoload :DependencyManager, 'listen/dependency_manager'
+  autoload :Adapter,           'listen/adapter'
 
   module Adapters
     autoload :Darwin,  'listen/adapters/darwin'
     autoload :Linux,   'listen/adapters/linux'
+    autoload :BSD,     'listen/adapters/bsd'
     autoload :Windows, 'listen/adapters/windows'
     autoload :Polling, 'listen/adapters/polling'
   end

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

@@ -10,8 +10,15 @@ module Listen
     # The default delay between checking for changes.
     DEFAULT_LATENCY = 0.25
 
+    # The default warning message when there is a missing dependency.
+    MISSING_DEPENDENCY_MESSAGE = <<-EOS.gsub(/^\s*/, '')
+      For a better performance, it's recommended that you satisfy the missing dependency.
+    EOS
+
     # 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."
+    POLLING_FALLBACK_MESSAGE = <<-EOS.gsub(/^\s*/, '')
+      Listen will be polling changes. Learn more at https://github.com/guard/listen#polling-fallback.
+    EOS
 
     # Selects the appropriate adapter implementation for the
     # current OS and initializes it.
@@ -31,18 +38,28 @@ module Listen
     def self.select_and_initialize(directories, options = {}, &callback)
       return Adapters::Polling.new(directories, options, &callback) if options.delete(:force_polling)
 
-      if Adapters::Darwin.usable_and_works?(directories, options)
-        Adapters::Darwin.new(directories, options, &callback)
-      elsif Adapters::Linux.usable_and_works?(directories, options)
-        Adapters::Linux.new(directories, options, &callback)
-      elsif Adapters::Windows.usable_and_works?(directories, options)
-        Adapters::Windows.new(directories, options, &callback)
-      else
-        unless options[:polling_fallback_message] == false
-          Kernel.warn(options[:polling_fallback_message] || POLLING_FALLBACK_MESSAGE)
+      warning = ''
+
+      begin
+        if Adapters::Darwin.usable_and_works?(directories, options)
+          return Adapters::Darwin.new(directories, options, &callback)
+        elsif Adapters::Linux.usable_and_works?(directories, options)
+          return Adapters::Linux.new(directories, options, &callback)
+        elsif Adapters::BSD.usable_and_works?(directories, options)
+          return Adapters::BSD.new(directories, options, &callback)
+        elsif Adapters::Windows.usable_and_works?(directories, options)
+          return Adapters::Windows.new(directories, options, &callback)
         end
-        Adapters::Polling.new(directories, options, &callback)
+      rescue DependencyManager::Error => e
+        warning += e.message + "\n" + MISSING_DEPENDENCY_MESSAGE
+      end
+
+      unless options[:polling_fallback_message] == false
+        warning += options[:polling_fallback_message] || POLLING_FALLBACK_MESSAGE
+        Kernel.warn "[Listen warning]:\n" + warning.gsub(/^(.*)/, '  \1')
       end
+
+      Adapters::Polling.new(directories, options, &callback)
     end
 
     # Initializes the adapter.
@@ -50,6 +67,7 @@ module Listen
     # @param [String, Array<String>] directories the directories to watch
     # @param [Hash] options the adapter options
     # @option options [Float] latency the delay between checking for changes in seconds
+    # @option options [Boolean] report_changes whether or not to automatically report changes (run the callback)
     #
     # @yield [changed_dirs, options] callback Callback called when a change happens
     # @yieldparam [Array<String>] changed_dirs the changed directories
@@ -60,12 +78,13 @@ module Listen
     def initialize(directories, options = {}, &callback)
       @directories  = Array(directories)
       @callback     = callback
-      @latency    ||= DEFAULT_LATENCY
-      @latency      = options[:latency] if options[:latency]
       @paused       = false
       @mutex        = Mutex.new
       @changed_dirs = Set.new
       @turnstile    = Turnstile.new
+      @latency    ||= DEFAULT_LATENCY
+      @latency      = options[:latency] if options[:latency]
+      @report_changes = options[:report_changes].nil? ? true : options[:report_changes]
     end
 
     # Starts the adapter.
@@ -92,12 +111,37 @@ module Listen
     end
 
     # Blocks the main thread until the poll thread
-    # calls the callback.
+    # runs the callback.
     #
     def wait_for_callback
       @turnstile.wait unless @paused
     end
 
+    # Blocks the main thread until N changes are
+    # detected.
+    #
+    def wait_for_changes(goal = 0)
+      changes = 0
+
+      loop do
+        @mutex.synchronize { changes = @changed_dirs.size }
+
+        return if @paused || @stop
+        return if changes >= goal
+
+        sleep(@latency)
+      end
+    end
+
+    # Checks if the adapter is usable on the current OS.
+    #
+    # @return [Boolean] whether usable or not
+    #
+    def self.usable?
+      load_depenencies
+      dependencies_loaded?
+    end
+
     # Checks if the adapter is usable and works on the current OS.
     #
     # @param [String, Array<String>] directories the directories to watch
@@ -124,7 +168,7 @@ module Listen
     def self.works?(directory, options = {})
       work = false
       test_file = "#{directory}/.listen_test"
-      callback = lambda { |changed_dirs, options| work = true }
+      callback = lambda { |*| work = true }
       adapter  = self.new(directory, options, &callback)
       adapter.start(false)
 
@@ -140,27 +184,30 @@ module Listen
       adapter.stop if adapter && adapter.started?
     end
 
+    # Runs the callback and passes it the changes if there are any.
+    #
+    def report_changes
+      changed_dirs = nil
+
+      @mutex.synchronize do
+        return if @changed_dirs.empty?
+        changed_dirs = @changed_dirs.to_a
+        @changed_dirs.clear
+      end
+
+      @callback.call(changed_dirs, {})
+      @turnstile.signal
+    end
+
     private
 
     # Polls changed directories and reports them back
     # when there are changes.
     #
-    # @option [Boolean] recursive whether or not to pass the recursive option to the callback
-    #
-    def poll_changed_dirs(recursive = false)
+    def poll_changed_dirs
       until @stop
         sleep(@latency)
-        next if @changed_dirs.empty?
-
-        changed_dirs = []
-
-        @mutex.synchronize do
-          changed_dirs = @changed_dirs.to_a
-          @changed_dirs.clear
-        end
-
-        @callback.call(changed_dirs, recursive ? {:recursive => recursive} : {})
-        @turnstile.signal
+        report_changes
       end
     end
   end