haml 3.1.3 → 3.1.4

data/vendor/sass/vendor/fssm/spec/monitor_spec.rb

@@ -0,0 +1,202 @@
+require 'spec_helper'
+
+require 'count_down_latch'
+require 'fileutils'
+require 'tempfile'
+
+module FSSM::MonitorSpecHelpers
+  def create_tmp_dir
+    @tmp_dir = FSSM::Pathname.for(Dir.mktmpdir).realpath.to_s
+    FileUtils.cp_r File.join(File.dirname(__FILE__), 'root'), @tmp_dir
+    # Because git does not track empty directories, create one ourselves.
+    FileUtils.mkdir_p @tmp_dir + '/root/yawn'
+    @tmp_dir
+  end
+
+  def remove_tmp_dir
+    FileUtils.remove_entry @tmp_dir
+  end
+
+  def create_handler(type, latch)
+    lambda do |*args|
+      @handler_results[type] << args
+      latch.count_down
+    end
+  end
+
+  def run_monitor(num_events_to_expect=0, options={})
+    event_latch      = CountDownLatch.new(num_events_to_expect)
+    @handler_results = Hash.new { |hash, key| hash[key] = [] }
+    thread           = Thread.new do
+      monitor = FSSM::Monitor.new(options)
+      monitor.path(@tmp_dir) do |p|
+        p.create(&create_handler(:create, event_latch))
+        p.update(&create_handler(:update, event_latch))
+        p.delete(&create_handler(:delete, event_latch))
+      end
+      monitor.run
+    end
+    sleep 1 # give time for monitor to start up
+    yield if block_given?
+    event_latch.wait
+    thread.kill
+  end
+end
+
+describe "The File System State Monitor" do
+  describe "monitor" do
+    include FSSM::MonitorSpecHelpers
+
+    before do
+      create_tmp_dir
+    end
+
+    after do
+      remove_tmp_dir
+    end
+
+    describe "with default options" do
+      it "should call create callback upon file creation" do
+        run_monitor(1) do
+          file = @tmp_dir + "/newfile.rb"
+          File.exists?(file).should be_false
+          FileUtils.touch file
+        end
+        @handler_results[:create].should == [[@tmp_dir, 'newfile.rb']]
+      end
+
+      it "should call update callback upon file modification" do
+        run_monitor(1) do
+          FileUtils.touch @tmp_dir + '/root/file.rb'
+        end
+        @handler_results[:update].should == [[@tmp_dir, 'root/file.rb']]
+      end
+
+      it "should call delete callback upon file deletion" do
+        run_monitor(1) do
+          FileUtils.rm @tmp_dir + "/root/file.rb"
+        end
+        @handler_results[:delete].should == [[@tmp_dir, 'root/file.rb']]
+      end
+
+      it "should call create and delete callbacks upon file renaming in the same directory" do
+        run_monitor(2) do
+          FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/root/old_file.rb"
+        end
+        @handler_results[:create].should == [[@tmp_dir, 'root/old_file.rb']]
+        @handler_results[:delete].should == [[@tmp_dir, 'root/file.rb']]
+        @handler_results[:update].should == []
+      end
+
+      it "should call create and delete callbacks upon file moving to another directory" do
+        run_monitor(2) do
+          FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/old_file.rb"
+        end
+        @handler_results[:create].should == [[@tmp_dir, 'old_file.rb']]
+        @handler_results[:delete].should == [[@tmp_dir, 'root/file.rb']]
+        @handler_results[:update].should == []
+      end
+
+      it "should not call callbacks upon directory operations" do
+        run_monitor do
+          FileUtils.mkdir @tmp_dir + "/another_yawn"
+          FileUtils.rmdir @tmp_dir + "/root/yawn"
+        end
+        @handler_results[:create].should == []
+        @handler_results[:delete].should == []
+      end
+    end
+
+    describe "when configured to consider files and directories" do
+      it "should call create callback upon directory creation" do
+        run_monitor(1, :directories => true) do
+          FileUtils.mkdir @tmp_dir + "/another_yawn"
+        end
+        @handler_results[:create].should include([@tmp_dir, 'another_yawn', :directory])
+      end
+
+      it "should call delete callback upon directory deletion" do
+        run_monitor(1, :directories => true) do
+          FileUtils.rmdir @tmp_dir + "/root/yawn"
+        end
+        @handler_results[:delete].should include([@tmp_dir, 'root/yawn', :directory])
+      end
+
+      it "should call create, update, and delete callbacks upon directory renaming in the same directory" do
+        run_monitor(3, :directories => true) do
+          FileUtils.mv @tmp_dir + "/root/yawn", @tmp_dir + "/root/old_yawn"
+        end
+        @handler_results[:create].should include([@tmp_dir, 'root/old_yawn', :directory])
+        @handler_results[:delete].should include([@tmp_dir, 'root/yawn', :directory])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
+      end
+
+      it "should call create, update, and delete callbacks upon directory moving to another directory" do
+        run_monitor(3, :directories => true) do
+          FileUtils.mv @tmp_dir + "/root/yawn", @tmp_dir + "/old_yawn"
+        end
+        @handler_results[:create].should include([@tmp_dir, 'old_yawn', :directory])
+        @handler_results[:delete].should include([@tmp_dir, 'root/yawn', :directory])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
+      end
+
+      it "should call create, update, and delete callbacks upon file renaming in the same directory" do
+        run_monitor(3, :directories => true) do
+          FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/root/old_file.rb"
+        end
+        @handler_results[:create].should include([@tmp_dir, 'root/old_file.rb', :file])
+        @handler_results[:delete].should include([@tmp_dir, 'root/file.rb', :file])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
+      end
+
+      it "should call create, update, and delete callbacks upon file moving to another directory" do
+        run_monitor(3, :directories => true) do
+          FileUtils.mv @tmp_dir + "/root/file.rb", @tmp_dir + "/old_file.rb"
+        end
+        @handler_results[:create].should include([@tmp_dir, 'old_file.rb', :file])
+        @handler_results[:delete].should include([@tmp_dir, 'root/file.rb', :file])
+        @handler_results[:update].should include([@tmp_dir, 'root', :directory])
+      end
+
+      it "should call delete callbacks upon directory structure deletion, in reverse order" do
+        expected_delete_events = [
+            ['root/yawn', :directory],
+            ['root/moo/cow.txt', :file],
+            ['root/moo', :directory],
+            ['root/file.yml', :file],
+            ['root/file.rb', :file],
+            ['root/file.css', :file],
+            ['root/duck/quack.txt', :file],
+            ['root/duck', :directory],
+            ['root', :directory]
+        ]
+        run_monitor(expected_delete_events.size, :directories => true) do
+          FileUtils.rm_rf @tmp_dir + '/.'
+        end
+        @handler_results[:create].should == []
+        @handler_results[:delete].should == expected_delete_events.map { |(file, type)| [@tmp_dir, file, type] }
+        @handler_results[:update].should == []
+      end
+
+      it "should call create callbacks upon directory structure creation, in order" do
+        expected_create_events = [
+            ['new_root', :directory],
+            ['new_root/duck', :directory],
+            ['new_root/duck/quack.txt', :file],
+            ['new_root/file.css', :file],
+            ['new_root/file.rb', :file],
+            ['new_root/file.yml', :file],
+            ['new_root/moo', :directory],
+            ['new_root/moo/cow.txt', :file],
+            ['new_root/yawn', :directory]
+        ]
+        run_monitor(expected_create_events.size, :directories => true) do
+          FileUtils.cp_r @tmp_dir + '/root/.', @tmp_dir + '/new_root'
+        end
+        @handler_results[:create].should == expected_create_events.map { |(file, type)| [@tmp_dir, file, type] }
+        @handler_results[:delete].should == []
+        @handler_results[:update].should == []
+      end
+    end
+  end
+end

data/vendor/sass/vendor/fssm/spec/path_spec.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "spec_helper"
 
 describe "The File System State Monitor" do
   describe "paths" do
     it "should accept a valid filesystem directory" do
-      lambda {FSSM::Path.new("#{@watch_root}")}.should_not raise_error
+      lambda { FSSM::Path.new("#{@watch_root}") }.should_not raise_error
     end
 
     it "should not accept an invalid filesystem directory" do
-      lambda {FSSM::Path.new('/does/not/exist/kthxbye')}.should raise_error
+      lambda { FSSM::Path.new('/does/not/exist/kthxbye') }.should raise_error
     end
 
     it "should default the path to the current directory" do
@@ -27,38 +27,42 @@ describe "The File System State Monitor" do
       path.glob.should == ['**/*.yml']
     end
 
+    it "should accept an optional option parameter" do
+      lambda { FSSM::Path.new('.', '**/*.yml', :foo => :bar) }.should_not raise_error
+    end
+
     it "should default the glob to ['**/*']" do
       path = FSSM::Path.new
       path.glob.should == ['**/*']
     end
 
     it "should accept a callback for update events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
-      path.update(callback)
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
+      path.update(&callback)
       (path.update).should == callback
     end
 
     it "should accept a callback for delete events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
-      path.delete(callback)
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
+      path.delete(&callback)
       (path.delete).should == callback
     end
 
     it "should accept a callback for create events" do
-      path = FSSM::Path.new
-      callback = lambda {|base, relative| return true}
-      path.create(callback)
+      path     = FSSM::Path.new
+      callback = lambda { |base, relative| return true }
+      path.create(&callback)
       (path.create).should == callback
     end
 
     it "should accept a configuration block" do
       path = FSSM::Path.new "#{@watch_root}" do
         glob '**/*.yml'
-        update {|base, relative| 'success'}
-        delete {|base, relative| 'success'}
-        create {|base, relative| 'success'}
+        update { |base, relative| 'success' }
+        delete { |base, relative| 'success' }
+        create { |base, relative| 'success' }
       end
 
       "#{path}".should == "#{@watch_root}"
@@ -71,5 +75,22 @@ describe "The File System State Monitor" do
       path.create.call('', '').should == 'success'
     end
 
+    it "should pass file type to callbacks as the third argument if :directories option is used" do
+      path = FSSM::Path.new "#{@watch_root}", nil, :directories => true do
+        glob '**/*.yml'
+        update { |base, relative, type| [base, relative, type] }
+        delete { |base, relative, type| [base, relative, type] }
+        create { |base, relative, type| [base, relative, type] }
+      end
+
+      "#{path}".should == "#{@watch_root}"
+      path.glob.should == ['**/*.yml']
+      path.update.should be_a_kind_of(Proc)
+      path.delete.should be_a_kind_of(Proc)
+      path.create.should be_a_kind_of(Proc)
+      path.update.call('b', 'r', 't').should == ['b', 'r', 't']
+      path.delete.call('b', 'r', 't').should == ['b', 'r', 't']
+      path.create.call('b', 'r', 't').should == ['b', 'r', 't']
+    end
   end
 end

data/vendor/sass/vendor/fssm/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
-require 'pathname'
+require 'rubygems'
+require 'bundler/setup'
 require 'fssm'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before :all do
-    @watch_root = Pathname.new(__FILE__).dirname.join('root').expand_path
+    @watch_root = FSSM::Pathname.new(__FILE__).dirname.join('root').expand_path
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  version: 3.1.4
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -07:00
+date: 2011-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,20 @@ files:
 - lib/sass/plugin.rb
 - bin/html2haml
 - bin/haml
+- test/gemfiles/Gemfile.rails-2.1.x.lock
+- test/gemfiles/Gemfile.rails-xss-2.3.x.lock
+- test/gemfiles/Gemfile.rails-3.0.x
+- test/gemfiles/Gemfile.rails-2.0.x
+- test/gemfiles/Gemfile.rails-2.2.x
+- test/gemfiles/Gemfile.rails-2.3.x.lock
+- test/gemfiles/Gemfile.rails-2.3.x
+- test/gemfiles/Gemfile.rails-3.0.x.lock
+- test/gemfiles/Gemfile.rails-2.1.x
+- test/gemfiles/Gemfile.rails-2.2.x.lock
+- test/gemfiles/Gemfile.rails-3.1.x.lock
+- test/gemfiles/Gemfile.rails-2.0.x.lock
+- test/gemfiles/Gemfile.rails-xss-2.3.x
+- test/gemfiles/Gemfile.rails-3.1.x
 - test/linked_rails.rb
 - test/benchmark.rb
 - test/test_helper.rb
@@ -205,6 +219,8 @@ files:
 - vendor/sass/lib/sass/tree/visitors/perform.rb
 - vendor/sass/lib/sass/tree/visitors/to_css.rb
 - vendor/sass/lib/sass/tree/visitors/check_nesting.rb
+- vendor/sass/lib/sass/tree/visitors/deep_copy.rb
+- vendor/sass/lib/sass/tree/visitors/set_options.rb
 - vendor/sass/lib/sass/tree/visitors/cssize.rb
 - vendor/sass/lib/sass/tree/visitors/convert.rb
 - vendor/sass/lib/sass/tree/visitors/base.rb
@@ -217,6 +233,7 @@ files:
 - vendor/sass/lib/sass/plugin.rb
 - vendor/sass/lib/sass/root.rb
 - vendor/sass/lib/sass/importers.rb
+- vendor/sass/lib/sass/logger.rb
 - vendor/sass/lib/sass/util/subset_map.rb
 - vendor/sass/lib/sass/scss.rb
 - vendor/sass/lib/sass/scss/static_parser.rb
@@ -226,6 +243,8 @@ files:
 - vendor/sass/lib/sass/scss/rx.rb
 - vendor/sass/lib/sass/scss/script_parser.rb
 - vendor/sass/lib/sass/scss/css_parser.rb
+- vendor/sass/lib/sass/logger/log_level.rb
+- vendor/sass/lib/sass/logger/base.rb
 - vendor/sass/lib/sass/css.rb
 - vendor/sass/lib/sass/script.rb
 - vendor/sass/lib/sass/util.rb
@@ -264,11 +283,16 @@ files:
 - vendor/sass/init.rb
 - vendor/sass/Rakefile
 - vendor/sass/MIT-LICENSE
+- vendor/sass/test/Gemfile
+- vendor/sass/test/Gemfile.lock
 - vendor/sass/test/test_helper.rb
 - vendor/sass/test/sass/engine_test.rb
 - vendor/sass/test/sass/functions_test.rb
+- vendor/sass/test/sass/fixtures/test_staleness_check_across_importers.scss
+- vendor/sass/test/sass/fixtures/test_staleness_check_across_importers.css
 - vendor/sass/test/sass/data/hsl-rgb.txt
 - vendor/sass/test/sass/extend_test.rb
+- vendor/sass/test/sass/logger_test.rb
 - vendor/sass/test/sass/css2sass_test.rb
 - vendor/sass/test/sass/templates/basic.sass
 - vendor/sass/test/sass/templates/mixins.sass
@@ -288,6 +312,8 @@ files:
 - vendor/sass/test/sass/templates/line_numbers.sass
 - vendor/sass/test/sass/templates/expanded.sass
 - vendor/sass/test/sass/templates/bork3.sass
+- vendor/sass/test/sass/templates/bork5.sass
+- vendor/sass/test/sass/templates/nested_bork5.sass
 - vendor/sass/test/sass/templates/warn_imported.sass
 - vendor/sass/test/sass/templates/import_charset_ibm866.sass
 - vendor/sass/test/sass/templates/bork1.sass
@@ -374,6 +400,8 @@ files:
 - vendor/sass/sass.gemspec
 - vendor/sass/vendor/fssm/README.markdown
 - vendor/sass/vendor/fssm/example.rb
+- vendor/sass/vendor/fssm/Gemfile
+- vendor/sass/vendor/fssm/lib/fssm/version.rb
 - vendor/sass/vendor/fssm/lib/fssm/pathname.rb
 - vendor/sass/vendor/fssm/lib/fssm/state/file.rb
 - vendor/sass/vendor/fssm/lib/fssm/state/directory.rb
@@ -384,6 +412,7 @@ files:
 - vendor/sass/vendor/fssm/lib/fssm/backends/polling.rb
 - vendor/sass/vendor/fssm/lib/fssm/backends/inotify.rb
 - vendor/sass/vendor/fssm/lib/fssm/backends/fsevents.rb
+- vendor/sass/vendor/fssm/lib/fssm/backends/rbfsevent.rb
 - vendor/sass/vendor/fssm/lib/fssm/path.rb
 - vendor/sass/vendor/fssm/lib/fssm.rb
 - vendor/sass/vendor/fssm/profile/prof-plain-pathname.html
@@ -391,10 +420,12 @@ files:
 - vendor/sass/vendor/fssm/profile/prof.html
 - vendor/sass/vendor/fssm/profile/prof-cache.rb
 - vendor/sass/vendor/fssm/profile/prof-fssm-pathname.html
+- vendor/sass/vendor/fssm/profile/prof-pathname-rubinius.rb
 - vendor/sass/vendor/fssm/fssm.gemspec
 - vendor/sass/vendor/fssm/Rakefile
-- vendor/sass/vendor/fssm/VERSION.yml
 - vendor/sass/vendor/fssm/LICENSE
+- vendor/sass/vendor/fssm/spec/count_down_latch.rb
+- vendor/sass/vendor/fssm/spec/monitor_spec.rb
 - vendor/sass/vendor/fssm/spec/path_spec.rb
 - vendor/sass/vendor/fssm/spec/root/moo/cow.txt
 - vendor/sass/vendor/fssm/spec/root/file.yml

data/vendor/sass/vendor/fssm/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 0
-:minor: 1
-:patch: 4
-:build: