haml 2.2.24 → 3.0.0.beta.1

data/test/sass/more_results/more_import.css

@@ -24,6 +24,6 @@ body { font: Arial; background: blue; }
 
 @import url(basic.css);
 @import url(../results/complex.css);
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/more_templates/more_import.sass

@@ -1,4 +1,4 @@
-!preconst = "hello"
+$preconst: hello
 
 =premixin
   pre-mixin: here
@@ -6,6 +6,6 @@
 @import importee, basic, basic.css, ../results/complex.css, more_partial
 
 nonimported
-  :myconst = !preconst
-  :otherconst = !postconst
+  :myconst $preconst
+  :otherconst $postconst
   +postmixin

data/test/sass/plugin_test.rb

@@ -5,8 +5,9 @@ require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{
-    complex script parent_ref import alt
+    complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
+    options
   }
 
   def setup
@@ -19,6 +20,7 @@ class SassPluginTest < Test::Unit::TestCase
 
   def teardown
     clean_up_sassc
+    clear_callbacks
     FileUtils.rm_r tempfile_loc
     FileUtils.rm_r tempfile_loc(nil,"more_")
   end
@@ -48,22 +50,46 @@ class SassPluginTest < Test::Unit::TestCase
     assert_needs_update 'import'
     Sass::Plugin.update_stylesheets
     assert_stylesheet_updated 'basic'
+    assert_stylesheet_updated 'import'
+  end
+
+  def test_update_needed_when_scss_dependency_modified
+    touch 'scss_importee'
+    assert_needs_update 'import'
+    Sass::Plugin.update_stylesheets
+    assert_stylesheet_updated 'scss_importee'
+    assert_stylesheet_updated 'import'
+  end
+
+  def test_scss_update_needed_when_dependency_modified
+    touch 'basic'
+    assert_needs_update 'scss_import'
+    Sass::Plugin.update_stylesheets
+    assert_stylesheet_updated 'basic'
+    assert_stylesheet_updated 'scss_import'
   end
 
   def test_full_exception_handling
-    File.delete(tempfile_loc('bork'))
+    File.delete(tempfile_loc('bork1'))
     Sass::Plugin.update_stylesheets
-    File.open(tempfile_loc('bork')) do |file|
-      assert_equal("/*\nSass::SyntaxError: Undefined variable: \"!bork\".\non line 2 of #{template_loc('bork')}\n\n1: bork\n2:   :bork= !bork", file.read.split("\n")[0...6].join("\n"))
+    File.open(tempfile_loc('bork1')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
+/*
+Syntax error: Undefined variable: "$bork".
+        on line 2 of #{template_loc('bork1')}
+
+1: bork
+2:   :bork $bork
+CSS
     end
-    File.delete(tempfile_loc('bork'))
+    File.delete(tempfile_loc('bork1'))
   end
 
   def test_nonfull_exception_handling
     old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false
 
-    File.delete(tempfile_loc('bork'))
+    File.delete(tempfile_loc('bork1'))
     assert_raise(Sass::SyntaxError) {Sass::Plugin.update_stylesheets}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
@@ -122,6 +148,98 @@ class SassPluginTest < Test::Unit::TestCase
     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
@@ -170,13 +288,65 @@ class SassPluginTest < Test::Unit::TestCase
     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),
+    assert(Sass::Plugin.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
       "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),
+    assert(!Sass::Plugin.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
       "Expected #{template_loc(name)} not to need an update.")
   end
 
@@ -185,12 +355,15 @@ class SassPluginTest < Test::Unit::TestCase
   end
 
   def reset_mtimes
-    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass}"].each {|f| File.utime(Time.now, Time.now - 1, f)}
+    atime = Time.now
+    mtime = Time.now - 5
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}
   end
 
   def template_loc(name = nil, prefix = nil)
     if name
-      absolutize "#{prefix}templates/#{name}.sass"
+      scss = absolutize "#{prefix}templates/#{name}.scss"
+      File.exists?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
     else
       absolutize "#{prefix}templates"
     end
@@ -223,6 +396,7 @@ class SassPluginTest < Test::Unit::TestCase
       :style => :compact,
       :load_paths => [result_loc],
       :always_update => true,
+      :never_update => false,
     }.merge(overrides)
   end
 end

data/test/sass/results/compact.css

@@ -1,4 +1,4 @@
-#main { width: 15em; color: #0000ff; }
+#main { width: 15em; color: blue; }
 #main p { border-style: dotted; /* Nested comment More nested stuff */ border-width: 2px; }
 #main .cool { width: 100px; }
 

data/test/sass/results/complex.css

@@ -1,10 +1,10 @@
-body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: #fff; background: url(/images/global_bg.gif); }
+body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: white; background: url(/images/global_bg.gif); }
 
 #page { width: 900px; margin: 0 auto; background: #440008; border-top-width: 5px; border-top-style: solid; border-top-color: #ff8500; }
 
 #header { height: 75px; padding: 0; }
 #header h1 { float: left; width: 274px; height: 75px; margin: 0; background-image: url(/images/global_logo.gif); /* Crazy nested comment */ background-repeat: no-repeat; text-indent: -9999px; }
-#header .status { float: right; padding-top: .5em; padding-left: .5em; padding-right: .5em; padding-bottom: 0; }
+#header .status { float: right; padding-top: 0.5em; padding-left: 0.5em; padding-right: 0.5em; padding-bottom: 0; }
 #header .status p { float: left; margin-top: 0; margin-right: 0.5em; margin-bottom: 0; margin-left: 0; }
 #header .status ul { float: left; margin: 0; padding: 0; }
 #header .status li { list-style-type: none; display: inline; margin: 0 5px; }
@@ -16,9 +16,9 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 #menu { clear: both; text-align: right; height: 20px; border-bottom: 5px solid #006b95; background: #00a4e4; }
 #menu .contests ul { margin: 0 5px 0 0; padding: 0; }
-#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: #fff; background: #00a4e4; }
+#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: white; background: #00a4e4; }
 #menu .contests ul li / This rule isn't a comment! { red: green; }
-#menu .contests a:link, #menu .contests a:visited { color: #fff; text-decoration: none; font-weight: bold; }
+#menu .contests a:link, #menu .contests a:visited { color: white; text-decoration: none; font-weight: bold; }
 #menu .contests a:hover { text-decoration: underline; }
 
 #content { clear: both; }
@@ -82,6 +82,6 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 img { border: none; }
 
-button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: #fff; border: none; background: url(/images/btn_short.gif) no-repeat; }
+button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: white; border: none; background: url(/images/btn_short.gif) no-repeat; }
 
 table { border-collapse: collapse; }

data/test/sass/results/compressed.css

@@ -1 +1 @@
-#main{width:15em;color:#0000ff}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}
+#main{width:15em;color:blue}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}

data/test/sass/results/expanded.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: #0000ff;
+  color: blue;
 }
 #main p {
   border-style: dotted;

data/test/sass/results/import.css

@@ -12,6 +12,8 @@ body { font: Arial; background: blue; }
 
 midrule { inthe: middle; }
 
+scss { imported: yes; }
+
 body { font: Arial; background: blue; }
 
 #page { width: 700px; height: 100; }
@@ -24,6 +26,6 @@ body { font: Arial; background: blue; }
 
 @import url(basic.css);
 @import url(../results/complex.css);
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/mixins.css

@@ -1,12 +1,12 @@
 #main {
   width: 15em;
-  color: #0000ff;
+  color: blue;
 }
 #main p {
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
   border-style: dotted;
   border-width: 2px;
@@ -19,7 +19,7 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
   font-size: 2em;
   font-weight: bold;
@@ -30,9 +30,9 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
-  color: #f00;
+  color: red;
   font-size: 20px;
   float: right;
 }
@@ -41,12 +41,12 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
 }
 
 .complex {
-  color: #f00;
+  color: red;
   font-size: 20px;
   text-decoration: none;
 }
@@ -59,12 +59,12 @@
 }
 * html .complex {
   height: 1px;
-  color: #f00;
+  color: red;
   font-size: 20px;
 }
 
 .more-complex {
-  color: #f00;
+  color: red;
   font-size: 20px;
   text-decoration: none;
   display: inline;
@@ -80,16 +80,16 @@
 }
 * html .more-complex {
   height: 1px;
-  color: #f00;
+  color: red;
   font-size: 20px;
 }
 .more-complex a:hover {
   text-decoration: underline;
-  color: #f00;
+  color: red;
   font-size: 20px;
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
 }

data/test/sass/results/nested.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: #0000ff; }
+  color: blue; }
   #main p {
     border-style: dotted;
     /* Nested comment

data/test/sass/results/options.css

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