haml-edge 2.3.100 → 2.3.148

data/test/sass/plugin_test.rb

@@ -7,6 +7,7 @@ class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{
     complex script parent_ref import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
+    options
   }
 
   def setup
@@ -14,10 +15,12 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mkdir tempfile_loc(nil,"more_")
     set_plugin_opts
     Sass::Plugin.update_stylesheets
+    reset_mtimes
   end
 
   def teardown
     clean_up_sassc
+    clear_callbacks
     FileUtils.rm_r tempfile_loc
     FileUtils.rm_r tempfile_loc(nil,"more_")
   end
@@ -30,25 +33,23 @@ class SassPluginTest < Test::Unit::TestCase
 
   def test_no_update
     File.delete(tempfile_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_needs_update 'basic'
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_modified
-    sleep 1
-    FileUtils.touch(template_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    touch 'basic'
+    assert_needs_update 'basic'
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_dependency_modified
-    sleep 1
-    FileUtils.touch(template_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
+    touch 'basic'
+    assert_needs_update 'import'
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_full_exception_handling
@@ -68,14 +69,13 @@ CSS
   end
 
   def test_nonfull_exception_handling
+    old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    Sass::Plugin.update_stylesheets
-    assert_equal("/* Internal stylesheet error */", File.read(tempfile_loc('bork1')))
-    File.delete(tempfile_loc('bork1'))
-
-    Sass::Plugin.options[:full_exception] = true
+    assert_raise(Sass::SyntaxError) {Sass::Plugin.update_stylesheets}
+  ensure
+    Sass::Plugin.options[:full_exception] = old_full_exception
   end
   
   def test_two_template_directories
@@ -116,7 +116,7 @@ CSS
     set_plugin_opts
 
     File.delete(tempfile_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_needs_update 'basic'
     
     if defined?(MerbHandler)
       MerbHandler.new('.').process nil, nil
@@ -124,22 +124,113 @@ CSS
       Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/'))
     end
 
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_doesnt_render_partials
     assert !File.exists?(tempfile_loc('_partial'))
   end
 
+  # Callbacks
+
+  def test_updating_stylesheets_callback
+    # Should run even when there's nothing to update
+    assert_callback :updating_stylesheets, []
+  end
+
+  def test_updating_stylesheets_callback_with_individual_files
+    files = [[template_loc("basic"), tempfile_loc("basic")]]
+    assert_callback(:updating_stylesheets, files) {Sass::Plugin.update_stylesheets(files)}
+  end
+
+  def test_updating_stylesheets_callback_with_never_update
+    Sass::Plugin.options[:never_update] = true
+    assert_no_callback :updating_stylesheets
+  end
+
+  def test_updating_stylesheet_callback_for_updated_template
+    Sass::Plugin.options[:always_update] = false
+    touch 'basic'
+    assert_no_callback :updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
+      assert_callbacks(
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
+    end
+  end
+
+  def test_updating_stylesheet_callback_for_fresh_template
+    Sass::Plugin.options[:always_update] = false
+    assert_no_callback :updating_stylesheet
+  end
+
+  def test_updating_stylesheet_callback_for_error_template
+    Sass::Plugin.options[:always_update] = false
+    touch 'bork1'
+    assert_no_callback :updating_stylesheet
+  end
+
+  def test_not_updating_stylesheet_callback_for_fresh_template
+    Sass::Plugin.options[:always_update] = false
+    assert_callback :not_updating_stylesheet, template_loc("basic"), tempfile_loc("basic")
+  end
+
+  def test_not_updating_stylesheet_callback_for_updated_template
+    Sass::Plugin.options[:always_update] = false
+    assert_callback :not_updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
+      assert_no_callbacks(
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
+    end
+  end
+
+  def test_not_updating_stylesheet_callback_with_never_update
+    Sass::Plugin.options[:never_update] = true
+    assert_no_callback :not_updating_stylesheet
+  end
+
+  def test_not_updating_stylesheet_callback_for_partial
+    Sass::Plugin.options[:always_update] = false
+    assert_no_callback :not_updating_stylesheet, template_loc("_partial"), tempfile_loc("_partial")
+  end
+
+  def test_not_updating_stylesheet_callback_for_error
+    Sass::Plugin.options[:always_update] = false
+    touch 'bork1'
+    assert_no_callback :not_updating_stylesheet, template_loc("bork1"), tempfile_loc("bork1")
+  end
+
+  def test_compilation_error_callback
+    Sass::Plugin.options[:always_update] = false
+    touch 'bork1'
+    assert_callback(:compilation_error,
+      lambda {|e| e.message == 'Undefined variable: "!bork".'},
+      template_loc("bork1"), tempfile_loc("bork1"))
+  end
+
+  def test_compilation_error_callback_for_file_access
+    Sass::Plugin.options[:always_update] = false
+    assert_callback(:compilation_error,
+      lambda {|e| e.is_a?(Errno::ENOENT)},
+      template_loc("nonexistent"), tempfile_loc("nonexistent")) do
+      Sass::Plugin.update_stylesheets([[template_loc("nonexistent"), tempfile_loc("nonexistent")]])
+    end
+  end
+
+  def test_creating_directory_callback
+    Sass::Plugin.options[:always_update] = false
+    dir = File.join(tempfile_loc, "subdir", "nested_subdir")
+    FileUtils.rm_r dir
+    assert_callback :creating_directory, dir
+  end
+
   ## Regression
 
   def test_cached_dependencies_update
     FileUtils.mv(template_loc("basic"), template_loc("basic", "more_"))
     set_plugin_opts :load_paths => [result_loc, template_loc(nil, "more_")]
 
-    sleep 1
-    FileUtils.touch(template_loc("basic", "more_"))
-    assert Sass::Plugin.stylesheet_needs_update?("import", template_loc, tempfile_loc)
+    touch 'basic', 'more_'
+    assert_needs_update "import"
     Sass::Plugin.update_stylesheets
     assert_renders_correctly("import")
   ensure
@@ -169,6 +260,87 @@ CSS
     end
   end
 
+  def assert_stylesheet_updated(name)
+    assert_doesnt_need_update name
+
+    # Make sure it isn't an exception
+    expected_lines = File.read(result_loc(name)).split("\n")
+    actual_lines = File.read(tempfile_loc(name)).split("\n")
+    if actual_lines.first == "/*" && expected_lines.first != "/*"
+      assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n"))
+    end
+  end
+
+  def assert_callback(name, *expected_args)
+    run = false
+    Sass::Plugin.send("on_#{name}") do |*args|
+      run ||= expected_args.zip(args).all? do |ea, a|
+        ea.respond_to?(:call) ? ea.call(a) : ea == a
+      end
+    end
+
+    if block_given?
+      yield
+    else
+      Sass::Plugin.update_stylesheets
+    end
+
+    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
+  end
+
+  def assert_no_callback(name, *unexpected_args)
+    Sass::Plugin.send("on_#{name}") do |*a|
+      next unless unexpected_args.empty? || a == unexpected_args
+
+      msg = "Expected #{name} callback not to be run"
+      if !unexpected_args.empty?
+        msg << " with arguments #{unexpected_args.inspect}"
+      elsif !a.empty?
+        msg << ",\n  was run with arguments #{a.inspect}"
+      end
+
+      flunk msg
+    end
+
+    if block_given?
+      yield
+    else
+      Sass::Plugin.update_stylesheets
+    end
+  end
+
+  def assert_callbacks(*args)
+    return Sass::Plugin.update_stylesheets if args.empty?
+    assert_callback(*args.pop) {assert_callbacks(*args)}
+  end
+
+  def assert_no_callbacks(*args)
+    return Sass::Plugin.update_stylesheets if args.empty?
+    assert_no_callback(*args.pop) {assert_no_callbacks(*args)}
+  end
+
+  def clear_callbacks
+    Sass::Plugin.instance_variable_set('@_sass_callbacks', {})
+  end
+
+  def assert_needs_update(name)
+    assert(Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+      "Expected #{template_loc(name)} to need an update.")
+  end
+
+  def assert_doesnt_need_update(name)
+    assert(!Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+      "Expected #{template_loc(name)} not to need an update.")
+  end
+
+  def touch(*args)
+    FileUtils.touch(template_loc(*args))
+  end
+
+  def reset_mtimes
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass}"].each {|f| File.utime(Time.now, Time.now - 1, f)}
+  end
+
   def template_loc(name = nil, prefix = nil)
     if name
       absolutize "#{prefix}templates/#{name}.sass"
@@ -204,13 +376,9 @@ CSS
       :style => :compact,
       :load_paths => [result_loc],
       :always_update => true,
+      :never_update => false,
     }.merge(overrides)
   end
-
-  def wait_a_tick
-    time = Time.now
-    loop {break if Time.now.sec != time.sec}
-  end
 end
 
 module Sass::Plugin

data/test/sass/results/options.css

@@ -0,0 +1 @@
+foo { style: compact; }

data/test/sass/script_test.rb

@@ -134,19 +134,19 @@ SASS
     assert_warning(<<WARN) {eval("foo")}
 DEPRECATION WARNING:
 On line 1, character 1 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {eval("1 + foo")}
 DEPRECATION WARNING:
 On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {render("@if 1 + foo")}
 DEPRECATION WARNING:
 On line 1, character 9 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
 
@@ -154,7 +154,7 @@ WARN
     assert_warning(<<WARN) {render("@if if")}
 DEPRECATION WARNING:
 On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'if' was not quoted. Please add double quotes (e.g. "if").
 WARN
   end
@@ -163,7 +163,7 @@ WARN
     assert_warning <<WARN do
 DEPRECATION WARNING:
 On line 2, character 6 of 'test_inaccessible_functions_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'to_s' was not quoted. Please add double quotes (e.g. "to_s").
 WARN
       assert_equal "send(to_s)", resolve("send(to_s)", :line => 2)

data/test/sass/templates/options.sass

@@ -0,0 +1,2 @@
+foo
+  style= option("style")

data/test/test_helper.rb

@@ -12,17 +12,24 @@ Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 module Sass::Script::Functions
   module UserFunctions; end
   include UserFunctions
+
+  def option(name)
+    Sass::Script::String.new(@options[name.value.to_sym].to_s)
+  end
 end
 
 class Test::Unit::TestCase
   def munge_filename(opts)
-    return if opts[:filename]
-    opts[:filename] = test_filename(caller[1])
+    return if opts.has_key?(:filename)
+    opts[:filename] = filename_for_test
   end
 
-  def test_filename(entry = caller.first)
-    test_name = Haml::Util.caller_info(entry)[2]
-    test_name.sub!(/^(block|rescue) in /, '')
+  def filename_for_test
+    test_name = caller.
+      map {|c| Haml::Util.caller_info(c)[2]}.
+      compact.
+      map {|c| c.sub(/^(block|rescue) in /, '')}.
+      find {|c| c =~ /^test_/}
     "#{test_name}_inline.sass"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.100
+  version: 2.3.148
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -05:00
+date: 2010-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
@@ -45,9 +45,9 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 - VERSION
+- CONTRIBUTING
 - REVISION
 - VERSION_NAME
-- CONTRIBUTING
 - MIT-LICENSE
 - EDGE_GEM_VERSION
 files: 
@@ -74,8 +74,8 @@ files:
 - lib/sass.rb
 - lib/sass/css.rb
 - lib/sass/engine.rb
-- lib/sass/environment.rb
 - lib/sass/error.rb
+- lib/sass/environment.rb
 - lib/sass/files.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/merb.rb
@@ -110,6 +110,7 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/callbacks.rb
 - bin/css2sass
 - bin/haml
 - bin/html2haml
@@ -122,6 +123,7 @@ files:
 - test/haml/erb/_av_partial_2.erb
 - test/haml/erb/action_view.erb
 - test/haml/erb/standard.erb
+- test/haml/html2haml/erb_tests.rb
 - test/haml/markaby/standard.mab
 - test/haml/mocks/article.rb
 - test/haml/results/content_for_layout.xhtml
@@ -142,6 +144,10 @@ files:
 - test/haml/results/tag_parsing.xhtml
 - test/haml/results/very_basic.xhtml
 - test/haml/results/whitespace_handling.xhtml
+- test/haml/spec/README.md
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/ruby_haml_test.rb
+- test/haml/spec/tests.json
 - test/haml/util_test.rb
 - test/haml/template_test.rb
 - test/haml/templates/_av_partial_1.haml
@@ -175,12 +181,12 @@ files:
 - test/haml/templates/tag_parsing.haml
 - test/haml/templates/very_basic.haml
 - test/haml/templates/whitespace_handling.haml
-- test/haml/html2haml/erb_tests.rb
 - test/haml/spec_test.rb
 - test/linked_rails.rb
 - test/sass/css2sass_test.rb
 - test/sass/engine_test.rb
 - test/sass/functions_test.rb
+- test/sass/plugin_test.rb
 - test/sass/data/hsl-rgb.txt
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
@@ -188,7 +194,7 @@ files:
 - test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
-- test/sass/plugin_test.rb
+- test/sass/script_test.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/compact.css
@@ -200,12 +206,12 @@ files:
 - test/sass/results/mixins.css
 - test/sass/results/multiline.css
 - test/sass/results/nested.css
+- test/sass/results/options.css
 - test/sass/results/parent_ref.css
 - test/sass/results/script.css
 - test/sass/results/subdir/nested_subdir/nested_subdir.css
 - test/sass/results/subdir/subdir.css
 - test/sass/results/units.css
-- test/sass/script_test.rb
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -229,12 +235,14 @@ files:
 - test/sass/templates/nested_bork3.sass
 - test/sass/templates/nested_bork4.sass
 - test/sass/templates/nested_mixin_bork.sass
+- test/sass/templates/options.sass
 - test/sass/templates/parent_ref.sass
 - test/sass/templates/script.sass
 - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/units.sass
+- test/sass/callbacks_test.rb
 - test/test_helper.rb
 - extra/haml-mode.el
 - extra/sass-mode.el
@@ -244,9 +252,9 @@ files:
 - .yardopts
 - README.md
 - VERSION
+- CONTRIBUTING
 - REVISION
 - VERSION_NAME
-- CONTRIBUTING
 - MIT-LICENSE
 - EDGE_GEM_VERSION
 has_rdoc: true
@@ -288,6 +296,7 @@ test_files:
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/util_test.rb
 - test/haml/template_test.rb
 - test/haml/spec_test.rb
@@ -296,3 +305,4 @@ test_files:
 - test/sass/functions_test.rb
 - test/sass/plugin_test.rb
 - test/sass/script_test.rb
+- test/sass/callbacks_test.rb