sass 3.2.0.alpha.104 → 3.2.0.alpha.236

data/vendor/listen/spec/listen/listener_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Listen::Listener do
   let(:adapter)           { mock(Listen::Adapter, :start => true).as_null_object }
-  let(:watched_directory) { Dir.tmpdir }
+  let(:watched_directory) { File.dirname(__FILE__) }
 
   subject { described_class.new(watched_directory) }
 
@@ -20,21 +20,25 @@ describe Listen::Listener do
         subject.directory.should eq watched_directory
       end
 
+      it 'converts the passed path into an absolute path - #21' do
+        described_class.new(File.join(watched_directory, '..')).directory.should eq File.expand_path('..', watched_directory)
+      end
+
       it 'sets the option for using relative paths in the callback to the default one' do
         subject.instance_variable_get(:@use_relative_paths).should eq described_class::DEFAULT_TO_RELATIVE_PATHS
       end
     end
 
     context 'with custom options' do
-      subject { described_class.new(watched_directory, :ignore => '.ssh', :filter => [/.*\.rb/,/.*\.md/],
+      subject { described_class.new(watched_directory, :ignore => /\.ssh/, :filter => [/.*\.rb/,/.*\.md/],
                                     :latency => 0.5, :force_polling => true, :relative_paths => true) }
 
       it 'passes the custom ignored paths to the directory record' do
-        subject.directory_record.ignored_paths.should =~ %w[.bundle .git .DS_Store log tmp vendor .ssh]
+        subject.directory_record.ignoring_patterns.should include /\.ssh/
       end
 
       it 'passes the custom filters to the directory record' do
-        subject.directory_record.filters.should =~  [/.*\.rb/,/.*\.md/]
+        subject.directory_record.filtering_patterns.should =~  [/.*\.rb/,/.*\.md/]
       end
 
       it 'sets the cutom option for using relative paths in the callback' do

data/vendor/listen/spec/listen/multi_listener_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Listen::MultiListener do
   let(:adapter)             { mock(Listen::Adapter, :start => true).as_null_object }
-  let(:watched_directories) { [File.dirname(__FILE__), Dir.tmpdir] }
+  let(:watched_directories) { [File.dirname(__FILE__), File.expand_path('../..', __FILE__)] }
 
   subject { described_class.new(*watched_directories) }
 
@@ -19,23 +19,28 @@ describe Listen::MultiListener do
       it 'sets the directories' do
         subject.directories.should =~ watched_directories
       end
+
+      it 'converts the passed paths into absolute paths - #21' do
+        paths = watched_directories.map { |d| File.join(d, '..') }
+        described_class.new(*paths).directories.should =~ watched_directories.map{ |d| File.expand_path('..', d) }
+      end
     end
 
     context 'with custom options' do
       subject do
-        args = watched_directories << {:ignore => '.ssh', :filter => [/.*\.rb/,/.*\.md/], :latency => 0.5, :force_polling => true}
+        args = watched_directories << {:ignore => /\.ssh/, :filter => [/.*\.rb/,/.*\.md/], :latency => 0.5, :force_polling => true}
         described_class.new(*args)
       end
 
       it 'passes the custom ignored paths to each directory record' do
         subject.directories_records.each do |r|
-          r.ignored_paths.should =~ %w[.bundle .git .DS_Store log tmp vendor .ssh]
+          r.ignoring_patterns.should include /\.ssh/
         end
       end
 
       it 'passes the custom filters to each directory record' do
         subject.directories_records.each do |r|
-          r.filters.should =~  [/.*\.rb/,/.*\.md/]
+          r.filtering_patterns.should =~  [/.*\.rb/,/.*\.md/]
         end
       end
 

data/vendor/listen/spec/support/adapter_helper.rb

@@ -43,6 +43,31 @@ shared_examples_for 'a filesystem adapter' do
       end
     end
   end
+
+  describe '#started?' do
+    context 'with a new adapter' do
+      it 'returns false' do
+        subject.should_not be_started
+      end
+    end
+
+    context 'with a stopped adapter' do
+      before { subject.start(false); subject.stop }
+
+      it 'returns false' do
+        subject.should_not be_started
+      end
+    end
+
+    context 'with a started adapter' do
+      before { subject.start(false) }
+      after { subject.start }
+
+      it 'returns true' do
+        subject.should be_started
+      end
+    end
+  end
 end
 
 shared_examples_for 'an adapter that call properly listener#on_change' do |*args|
@@ -66,6 +91,24 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the added file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'new_file.rb'
+
+            watch(listener, path) do
+              ln_s 'new_file.rb', 'new_file_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given a new created directory' do
         it 'detects the added file' do
           fixtures do |path|
@@ -104,6 +147,24 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
           end
         end
       end
+
+      context 'given a directory with subdirectories' do
+        it 'detects the added file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            end
+
+            mkdir_p 'a_directory/subdirectory'
+
+            watch(listener, path) do
+              touch 'a_directory/subdirectory/new_file.rb'
+            end
+          end
+        end
+      end
     end
 
     context 'when a file is modified' do
@@ -123,6 +184,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the modified file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'existing_file.rb'
+            ln_s  'existing_file.rb', 'existing_file_symlink.rb'
+
+            watch(listener, path) do
+              touch 'existing_file.rb'
+            end
+          end
+        end
+      end
+
       context 'given a hidden file' do
         it 'detects the modified file' do
           fixtures do |path|
@@ -179,6 +259,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
           end
         end
       end
+
+      context 'given a directory with subdirectories' do
+        it 'detects the modified file' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            end
+
+            mkdir_p 'a_directory/subdirectory'
+            touch   'a_directory/subdirectory/existing_file.txt'
+
+            watch(listener, path) do
+              touch 'a_directory/subdirectory/new_file.rb'
+            end
+          end
+        end
+      end
     end
 
     context 'when a file is moved' do
@@ -198,6 +297,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the file move' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'move_me.rb'
+            ln_s  'move_me.rb', 'move_me_symlink.rb'
+
+            watch(listener, path) do
+              mv 'move_me_symlink.rb', 'new_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given an existing directory' do
         it 'detects the file move into the directory' do
           fixtures do |path|
@@ -257,6 +375,28 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
           end
         end
       end
+
+      context 'given a directory with subdirectories' do
+        it 'detects files movements between subdirectories' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ ["#{path}/a_directory/subdirectory", "#{path}/b_directory/subdirectory"]
+              end
+            end
+
+            mkdir_p 'a_directory/subdirectory'
+            mkdir_p 'b_directory/subdirectory'
+            touch   'a_directory/subdirectory/move_me.txt'
+
+            watch(listener, path) do
+              mv 'a_directory/subdirectory/move_me.txt', 'b_directory/subdirectory'
+            end
+          end
+        end
+      end
     end
 
     context 'when a file is deleted' do
@@ -276,6 +416,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         end
       end
 
+      context 'given a symlink' do
+        it 'detects the file removal' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
+            end
+
+            touch 'unnecessary.rb'
+            ln_s  'unnecessary.rb', 'unnecessary_symlink.rb'
+
+            watch(listener, path) do
+              rm 'unnecessary_symlink.rb'
+            end
+          end
+        end
+      end
+
       context 'given an existing directory' do
         it 'detects the file removal' do
           fixtures do |path|
@@ -294,6 +453,25 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
           end
         end
       end
+
+      context 'given a directory with subdirectories' do
+        it 'detects the file removal' do
+          fixtures do |path|
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            end
+
+            mkdir_p 'a_directory/subdirectory'
+            touch   'a_directory/subdirectory/do_not_use.rb'
+
+            watch(listener, path) do
+              rm 'a_directory/subdirectory/do_not_use.rb'
+            end
+          end
+        end
+      end
     end
   end
 

data/vendor/listen/spec/support/directory_record_helper.rb

@@ -12,12 +12,14 @@
 def changes(root_path, options = {})
   unless @record || options[:use_last_record]
     @record = Listen::DirectoryRecord.new(root_path)
-    @record.build
     @record.filter(options.delete(:filter)) if options[:filter]
     @record.ignore(options.delete(:ignore)) if options[:ignore]
+
+    # Build the record after adding the filtering and ignoring patterns
+    @record.build
   end
 
-  yield
+  yield if block_given?
 
   paths = options.delete(:paths) || [root_path]
   options[:recursive] = true if options[:recursive].nil?
@@ -27,9 +29,27 @@ def changes(root_path, options = {})
   [changes[:modified], changes[:added], changes[:removed]]
 end
 
+# Generates a small time difference before performing a time sensitive
+# task (like comparing mtimes of files).
+#
+# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2,
+#   that's why we generate a difference that's greater than 1 second.
+#
+def small_time_difference
+  t = Time.now
+  diff = t.to_f - t.to_i
+
+  sleep( 1.5 - (diff < 0.5 ? diff : 0.4) )
+end
+
+# Ensures that the test runs at almost the same second at which
+# changes are being checked.
+#
 def ensure_same_second
   t = Time.now
-  if t.to_f - t.to_i > 0.1
-    sleep 1.5 - (t.to_f - t.to_i)
+  diff = t.to_f - t.to_i
+
+  if diff > 0.1 # We are not at the beginning of a second
+    sleep 1.1 - diff # 1.1 is used instead of 1 to account for the processing time (estimated at 0.1 sec)
   end
 end

data/vendor/listen/spec/support/listeners_helper.rb

@@ -115,6 +115,17 @@ shared_examples_for 'a listener to changes on a file-system' do
     end
   end
 
+  describe '#relative_paths' do
+    it 'sets the relative paths option for paths in the callback' do
+      subject.relative_paths(true)
+      subject.instance_variable_get(:@use_relative_paths).should be_true
+    end
+
+    it 'returns the same listener to allow chaining' do
+      subject.relative_paths(true).should equal subject
+    end
+  end
+
   describe '#polling_fallback_message' do
     it 'sets custom polling fallback message to @adapter_options' do
       subject.polling_fallback_message('custom message')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303053
+  hash: 592302789
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 104
-  version: 3.2.0.alpha.104
+  - 236
+  version: 3.2.0.alpha.236
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 -04:00
+date: 2012-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,6 @@ files:
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
 - lib/sass/plugin/generic.rb
-- lib/sass/plugin/listener.rb
 - lib/sass/plugin/merb.rb
 - lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
@@ -111,6 +110,7 @@ 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
@@ -136,19 +136,19 @@ files:
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/directive_node.rb
-- lib/sass/tree/media_node.rb
+- lib/sass/tree/extend_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/each_node.rb
-- lib/sass/tree/extend_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/rule_node.rb
-- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/prop_node.rb
+- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/rule_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/content_node.rb