haml 3.0.0.beta.1 → 3.0.0.beta.2

data/test/sass/functions_test.rb

@@ -505,6 +505,37 @@ The #options attribute is not set on this Sass::Script::String.
 MSG
   end
 
+  def test_type_of
+    assert_equal("string", evaluate("type-of(\"asdf\")"))
+    assert_equal("string", evaluate("type-of(asdf)"))
+    assert_equal("number", evaluate("type-of(1px)"))
+    assert_equal("bool", evaluate("type-of(true)"))
+    assert_equal("color", evaluate("type-of(#fff)"))
+  end
+
+  def test_unit
+    assert_equal(%Q{""}, evaluate("unit(100)"))
+    assert_equal(%Q{"px"}, evaluate("unit(100px)"))
+    assert_equal(%Q{"em*px"}, evaluate("unit(10px * 5em)"))
+    assert_equal(%Q{"em*px"}, evaluate("unit(5em * 10px)"))
+    assert_equal(%Q{"em*px/cm*rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
+    assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
+  end
+
+  def test_unitless
+    assert_equal(%Q{true}, evaluate("unitless(100)"))
+    assert_equal(%Q{false}, evaluate("unitless(100px)"))
+    assert_error_message("#ff0000 is not a number for `unitless'", "unitless(#f00)")
+  end
+
+  def test_comparable
+    assert_equal(%Q{true}, evaluate("comparable(2px, 1px)"))
+    assert_equal(%Q{true}, evaluate("comparable(10cm, 3mm)"))
+    assert_equal(%Q{false}, evaluate("comparable(100px, 3em)"))
+    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
+    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
+  end
+
   private
 
   def evaluate(value)

data/test/sass/plugin_test.rb

@@ -14,7 +14,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mkdir tempfile_loc
     FileUtils.mkdir tempfile_loc(nil,"more_")
     set_plugin_opts
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     reset_mtimes
   end
 
@@ -34,21 +34,21 @@ class SassPluginTest < Test::Unit::TestCase
   def test_no_update
     File.delete(tempfile_loc('basic'))
     assert_needs_update 'basic'
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_modified
     touch 'basic'
     assert_needs_update 'basic'
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'import'
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'import'
   end
@@ -56,7 +56,7 @@ class SassPluginTest < Test::Unit::TestCase
   def test_update_needed_when_scss_dependency_modified
     touch 'scss_importee'
     assert_needs_update 'import'
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_stylesheet_updated 'scss_importee'
     assert_stylesheet_updated 'import'
   end
@@ -64,14 +64,14 @@ class SassPluginTest < Test::Unit::TestCase
   def test_scss_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'scss_import'
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'scss_import'
   end
 
   def test_full_exception_handling
     File.delete(tempfile_loc('bork1'))
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
@@ -90,7 +90,7 @@ CSS
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    assert_raise(Sass::SyntaxError) {Sass::Plugin.update_stylesheets}
+    assert_raise(Sass::SyntaxError) {update_all_stylesheets!}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
   end
@@ -100,7 +100,7 @@ CSS
       template_loc => tempfile_loc,
       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
     }
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     ['more1', 'more_import'].each { |name| assert_renders_correctly(name, :prefix => 'more_') }
   end
 
@@ -111,7 +111,7 @@ CSS
                       template_loc => tempfile_loc,
                       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
                     }
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_renders_correctly('more1_with_line_comments', 'more1', :prefix => 'more_')
   end
 
@@ -157,7 +157,7 @@ CSS
 
   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)}
+    assert_callback(:updating_stylesheets, files) {Haml::Util.silence_haml_warnings{Sass::Plugin.update_stylesheets(files)}}
   end
 
   def test_updating_stylesheets_callback_with_never_update
@@ -248,7 +248,7 @@ CSS
 
     touch 'basic', 'more_'
     assert_needs_update "import"
-    Sass::Plugin.update_stylesheets
+    update_all_stylesheets!
     assert_renders_correctly("import")
   ensure
     FileUtils.mv(template_loc("basic", "more_"), template_loc("basic"))
@@ -299,7 +299,7 @@ CSS
     if block_given?
       yield
     else
-      Sass::Plugin.update_stylesheets
+      update_all_stylesheets!
     end
 
     assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
@@ -322,17 +322,17 @@ CSS
     if block_given?
       yield
     else
-      Sass::Plugin.update_stylesheets
+      update_all_stylesheets!
     end
   end
 
   def assert_callbacks(*args)
-    return Sass::Plugin.update_stylesheets if args.empty?
+    return update_all_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?
+    return update_all_stylesheets! if args.empty?
     assert_no_callback(*args.pop) {assert_no_callbacks(*args)}
   end
 
@@ -340,13 +340,19 @@ CSS
     Sass::Plugin.instance_variable_set('@_sass_callbacks', {})
   end
 
+  def update_all_stylesheets!
+    Haml::Util.silence_haml_warnings do
+      Sass::Plugin.update_stylesheets
+    end
+  end
+
   def assert_needs_update(name)
-    assert(Sass::Plugin.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
+    assert(Sass::Plugin::StalenessChecker.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?(tempfile_loc(name), template_loc(name)),
+    assert(!Sass::Plugin::StalenessChecker.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
       "Expected #{template_loc(name)} not to need an update.")
   end
 
@@ -355,6 +361,7 @@ CSS
   end
 
   def reset_mtimes
+    Sass::Plugin::StalenessChecker.dependencies_cache = {}
     atime = Time.now
     mtime = Time.now - 5
     Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}
@@ -401,12 +408,6 @@ CSS
   end
 end
 
-module Sass::Plugin
-  class << self
-    public :stylesheet_needs_update?
-  end
-end
-
 class Sass::Engine
   alias_method :old_render, :render
 

data/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello!; qstr: 'Quo"ted"!'; hstr: Hyph-en!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar(9 hi there "boom"); con2: "noquo" quo; }
-#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 +12; many: 6; order: 7; complex: #4c9db1hi16; }
+#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar(9 hi there "boom"); con2: "noquo" quo; }
+#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 \+12; many: 6; order: 7; complex: #4c9db1hi16; }
 
-#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
+#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi\ there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
 
 #minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
@@ -11,6 +11,6 @@
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
-#const { escaped-quote: $foo !bar; default: Hello! !important; }
+#const { escaped-quote: \$foo \!bar; default: Hello\! !important; }
 
 #regression { a: 4; }

data/test/sass/script_conversion_test.rb

@@ -140,6 +140,46 @@ RUBY
     assert_equal 'not (true or false)', render('not (true or false)')
   end
 
+  def test_interpolation
+    assert_renders "$foo\#{$bar}$baz"
+    assert_renders "$foo\#{$bar} $baz"
+    assert_renders "$foo \#{$bar}$baz"
+    assert_renders "$foo \#{$bar} $baz"
+    assert_renders "$foo \#{$bar}\#{$bang} $baz"
+    assert_renders "$foo \#{$bar} \#{$bang} $baz"
+    assert_renders "\#{$bar}$baz"
+    assert_renders "$foo\#{$bar}"
+    assert_renders "\#{$bar}"
+  end
+
+  def test_string_interpolation
+    assert_renders '"foo#{$bar}baz"'
+    assert_renders '"foo #{$bar}baz"'
+    assert_renders '"foo#{$bar} baz"'
+    assert_renders '"foo #{$bar} baz"'
+    assert_renders '"foo #{$bar}#{$bang} baz"'
+    assert_renders '"foo #{$bar} #{$bang} baz"'
+    assert_renders '"#{$bar}baz"'
+    assert_renders '"foo#{$bar}"'
+    assert_equal '#{$bar}', render('"#{$bar}"')
+
+    assert_equal '"foo#{$bar}baz"', render("'foo\#{$bar}baz'")
+  end
+
+  def test_sass2_string_interpolation
+    assert_equal 'foo#{$bar}baz', render('"foo#{$bar}baz"', :context => :equals)
+    assert_equal '#{$bar}baz', render('"#{$bar}baz"', :context => :equals)
+    assert_equal 'foo#{$bar}', render('"foo#{$bar}"', :context => :equals)
+
+    assert_equal 'unquote(".foo#{$bar}.bar")', render('".foo#{$bar}.bar"', :context => :equals)
+    assert_equal 'unquote(".foo#{$bar}")', render('".foo#{$bar}"', :context => :equals)
+    assert_equal 'unquote("#{$bar}.bar")', render('"#{$bar}.bar"', :context => :equals)
+
+    assert_equal "unquote(\"f'o\#{$bar}b'z\")", render("'f\\'o\#{$bar}b\\'z'", :context => :equals)
+    assert_equal "unquote('f\"o\#{$bar}b\"z')", render("'f\\\"o\#{$bar}b\\\"z'", :context => :equals)
+    assert_equal "unquote(\"f'o\#{$bar}b\\\"z\")", render("'f\\'o\#{$bar}b\\\"z'", :context => :equals)
+  end
+
   private
 
   def assert_renders(script, options = {})
@@ -148,6 +188,8 @@ RUBY
 
   def render(script, options = {})
     munge_filename(options)
-    Sass::Script.parse(script, 1, 0, options).to_sass
+    node = Sass::Script.parse(script, 1, 0, options)
+    node.context = options[:context] if options[:context]
+    node.to_sass
   end
 end

data/test/sass/script_test.rb

@@ -25,12 +25,12 @@ class SassScriptTest < Test::Unit::TestCase
   def test_string_escapes
     assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
-    assert_equal "\\", resolve("\"\\\\\"")
+    assert_equal "\\\\", resolve("\"\\\\\"")
     assert_equal "\\02fa", resolve("\"\\02fa\"")
 
     assert_equal "'", resolve("'\\''")
     assert_equal '"', resolve("'\"'")
-    assert_equal "\\", resolve("'\\\\'")
+    assert_equal "\\\\", resolve("'\\\\'")
     assert_equal "\\02fa", resolve("'\\02fa'")
   end
 
@@ -290,7 +290,7 @@ SASS
     assert_equal "teal(12)", resolve("teal(12)")
     assert_equal "tealbang(12)", resolve("tealbang(12)")
     assert_equal "teal-bang(12)", resolve("teal-bang(12)")
-    assert_equal "teal+bang(12)", resolve("teal\\+bang(12)")
+    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
   def test_interpolation_after_hash

data/test/sass/scss/css_test.rb

@@ -320,7 +320,7 @@ foo {
 SCSS
   end
 
-  def test_ms_filter_syntax
+  def test_ms_long_filter_syntax
     assert_equal <<CSS, render(<<SCSS)
 foo {
   filter: progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr=#c0ff3300, endColorstr=#ff000000);
@@ -332,6 +332,15 @@ foo {
 SCSS
   end
 
+  def test_ms_short_filter_syntax
+    assert_parses <<SCSS
+foo {
+  filter: alpha(opacity=20);
+  filter: alpha(opacity=20, enabled=true);
+  filter: blaznicate(foo=bar, baz=bang bip, bart=#fa4600); }
+SCSS
+  end
+
   def test_declaration_hacks
     assert_parses <<SCSS
 foo {
@@ -339,10 +348,20 @@ foo {
   *name: val;
   :name: val;
   .name: val;
+  #name: val;
   name: val; }
 SCSS
   end
 
+  def test_trailing_hash_hack
+    assert_parses <<SCSS
+foo {
+  foo: bar;
+  #baz: bang;
+  #bip: bop; }
+SCSS
+  end
+
   def test_zero_arg_functions
     assert_parses <<SCSS
 foo {
@@ -381,6 +400,28 @@ foo {
 SCSS
   end
 
+  def test_css_string_escapes
+    assert_parses <<SCSS
+foo {
+  a: "\\foo bar";
+  b: "foo\\ bar";
+  c: "\\2022 \\0020";
+  d: "foo\\\\bar";
+  e: "foo\\"'bar"; }
+SCSS
+  end
+
+  def test_css_ident_escapes
+    assert_parses <<SCSS
+foo {
+  a: \\foo bar;
+  b: foo\\ bar;
+  c: \\2022 \\0020;
+  d: foo\\\\bar;
+  e: foo\\"\\'bar; }
+SCSS
+  end
+
   ## Directives
 
   def test_charset_directive
@@ -717,12 +758,12 @@ SCSS
   end
 
   def test_invalid_classes
-    assert_not_parses("identifier", 'p.<err> foo {a: b}')
-    assert_not_parses("identifier", 'p.<err>1foo {a: b}')
+    assert_not_parses("class name", 'p.<err> foo {a: b}')
+    assert_not_parses("class name", 'p.<err>1foo {a: b}')
   end
 
   def test_invalid_ids
-    assert_not_parses('"{"', 'p<err># foo {a: b}')
+    assert_not_parses("id name", 'p#<err> foo {a: b}')
   end
 
   def test_no_properties_at_toplevel
@@ -771,7 +812,7 @@ SCSS
 
   def test_no_nested_rules
     assert_not_parses('":"', 'foo {bar <err>{a: b}}')
-    assert_not_parses('"}"', 'foo {<err>#bar {a: b}}')
+    assert_not_parses('"}"', 'foo {<err>[bar=baz] {a: b}}')
   end
 
   def test_no_nested_properties

data/test/sass/scss/scss_test.rb

@@ -113,6 +113,27 @@ SCSS
     end
   end
 
+  def test_warn_directive
+    expected_warning = <<EXPECTATION
+WARNING: this is a warning
+        on line 2 of test_warn_directive_inline.scss
+
+WARNING: this is a mixin
+        on line 1 of test_warn_directive_inline.scss, in `foo'
+        from line 3 of test_warn_directive_inline.scss
+EXPECTATION
+    assert_warning expected_warning do
+      assert_equal <<CSS, render(<<SCSS)
+bar {
+  c: d; }
+CSS
+@mixin foo { @warn "this is a mixin";}
+@warn "this is a warning";
+bar {c: d; @include foo;}
+SCSS
+    end
+  end
+
   def test_for_directive
     assert_equal <<CSS, render(<<SCSS)
 .foo {
@@ -631,6 +652,57 @@ foo:nth-child(\#{5 + "n"}) {a: b}
 SCSS
   end
 
+  def test_selector_interpolation_at_class_begininng
+    assert_equal <<CSS, render(<<SCSS)
+.zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+.\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_id_begininng
+    assert_equal <<CSS, render(<<SCSS)
+#zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+#\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_pseudo_begininng
+    assert_equal <<CSS, render(<<SCSS)
+:zzz::zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+:\#{$zzz}::\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_attr_beginning
+    assert_equal <<CSS, render(<<SCSS)
+[zzz=foo] {
+  a: b; }
+CSS
+$zzz: zzz;
+[\#{$zzz}=foo] { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_dashes
+    assert_equal <<CSS, render(<<SCSS)
+div {
+  -foo-a-b-foo: foo; }
+CSS
+$a : a;
+$b : b;
+div { -foo-\#{$a}-\#{$b}-foo: foo }
+SCSS
+  end
+
   def test_basic_prop_val_interpolation
     assert_equal <<CSS, render(<<SCSS)
 foo {