haml 3.1.0.alpha.33 → 3.1.0.alpha.36

data/vendor/sass/test/sass/functions_test.rb

@@ -599,6 +599,75 @@ MSG
     assert_error_message("#ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
   end
 
+  def test_length
+    assert_equal("5", evaluate("length(1 2 3 4 5)"))
+    assert_equal("4", evaluate("length((foo, bar, baz, bip))"))
+    assert_equal("3", evaluate("length((foo, bar, baz bip))"))
+    assert_equal("3", evaluate("length((foo, bar, (baz, bip)))"))
+    assert_equal("1", evaluate("length(#f00)"))
+  end
+
+  def test_nth
+    assert_equal("1", evaluate("nth(1 2 3, 1)"))
+    assert_equal("2", evaluate("nth(1 2 3, 2)"))
+    assert_equal("3", evaluate("nth((1, 2, 3), 3)"))
+    assert_equal("foo", evaluate("nth(foo, 1)"))
+    assert_equal("bar baz", evaluate("nth(foo (bar baz) bang, 2)"))
+    assert_error_message("List index 0 must be greater than or equal to 1 for `nth'", "nth(foo, 0)")
+    assert_error_message("List index -10 must be greater than or equal to 1 for `nth'", "nth(foo, -10)")
+    assert_error_message("List index 1.5 must be an integer for `nth'", "nth(foo, 1.5)")
+    assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
+    assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
+  end
+
+  def test_join
+    assert_equal("1 2 3", evaluate("join(1 2, 3)"))
+    assert_equal("1 2 3", evaluate("join(1, 2 3)"))
+    assert_equal("1 2 3 4", evaluate("join(1 2, 3 4)"))
+    assert_equal("true", evaluate("(1 2 3 4) == join(1 2, 3 4)"))
+    assert_equal("false", evaluate("(1 2 (3 4)) == join(1 2, 3 4)"))
+    assert_equal("1, 2, 3", evaluate("join((1, 2), 3)"))
+    assert_equal("1, 2, 3", evaluate("join(1, (2, 3))"))
+    assert_equal("1, 2, 3, 4", evaluate("join((1, 2), (3, 4))"))
+    assert_equal("true", evaluate("(1, 2, 3, 4) == join((1, 2), (3, 4))"))
+    assert_equal("false", evaluate("(1, 2, (3, 4)) == join((1, 2), (3, 4))"))
+
+    assert_equal("1 2", evaluate("join(1, 2)"))
+    assert_equal("1 2 3 4", evaluate("join(1 2, (3, 4))"))
+    assert_equal("1, 2, 3, 4", evaluate("join((1, 2), 3 4)"))
+
+    assert_equal("1 2", evaluate("join(1, 2, auto)"))
+    assert_equal("1, 2, 3, 4", evaluate("join(1 2, 3 4, comma)"))
+    assert_equal("1 2 3 4", evaluate("join((1, 2), (3, 4), space)"))
+    assert_equal("1, 2", evaluate("join(1, 2, comma)"))
+
+    assert_error_message("Separator name must be space, comma, or auto for `join'", "join(1, 2, baboon)")
+  end
+
+  def test_append
+    assert_equal("1 2 3", evaluate("append(1 2, 3)"))
+    assert_equal("1 2 3 4", evaluate("append(1 2, 3 4)"))
+    assert_equal("false", evaluate("(1 2 3 4) == append(1 2, 3 4)"))
+    assert_equal("true", evaluate("(1 2 (3 4)) == append(1 2, 3 4)"))
+    assert_equal("1, 2, 3", evaluate("append((1, 2), 3)"))
+    assert_equal("1, 2, 3, 4", evaluate("append((1, 2), (3, 4))"))
+    assert_equal("false", evaluate("(1, 2, 3, 4) == append((1, 2), (3, 4))"))
+    assert_equal("true", evaluate("(1, 2, (3, 4)) == append((1, 2), (3, 4))"))
+
+    assert_equal("1 2", evaluate("append(1, 2)"))
+    assert_equal("1 2 3, 4", evaluate("append(1 2, (3, 4))"))
+    assert_equal("true", evaluate("(1 2 (3, 4)) == append(1 2, (3, 4))"))
+    assert_equal("1, 2, 3 4", evaluate("append((1, 2), 3 4)"))
+    assert_equal("true", evaluate("(1, 2, 3 4) == append((1, 2), 3 4)"))
+
+    assert_equal("1 2", evaluate("append(1, 2, auto)"))
+    assert_equal("1, 2, 3 4", evaluate("append(1 2, 3 4, comma)"))
+    assert_equal("1 2 3, 4", evaluate("append((1, 2), (3, 4), space)"))
+    assert_equal("1, 2", evaluate("append(1, 2, comma)"))
+
+    assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
+  end
+
   def test_keyword_args_rgb
     assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
   end

data/vendor/sass/test/sass/plugin_test.rb

@@ -10,8 +10,10 @@ class SassPluginTest < Test::Unit::TestCase
     subdir/subdir subdir/nested_subdir/nested_subdir
     options
   }
+  @@templates += %w[import_charset import_charset_ibm866] unless Sass::Util.ruby1_8?
+  @@templates << 'import_charset_1_8' if Sass::Util.ruby1_8?
 
-  @@cache_store = Sass::InMemoryCacheStore.new
+  @@cache_store = Sass::CacheStores::Memory.new
 
   def setup
     FileUtils.mkdir_p tempfile_loc
@@ -279,11 +281,18 @@ CSS
     prefix = options[:prefix]
     result_name = arguments.shift
     tempfile_name = arguments.shift || result_name
-    expected_lines = File.read(result_loc(result_name, prefix)).split("\n")
-    actual_lines = File.read(tempfile_loc(tempfile_name, prefix)).split("\n")
+
+    expected_str = File.read(result_loc(result_name, prefix))
+    actual_str = File.read(tempfile_loc(tempfile_name, prefix))
+    unless Sass::Util.ruby1_8?
+      expected_str = expected_str.force_encoding('IBM866') if result_name == 'import_charset_ibm866'
+      actual_str = actual_str.force_encoding('IBM866') if tempfile_name == 'import_charset_ibm866'
+    end
+    expected_lines = expected_str.split("\n")
+    actual_lines = actual_str.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"))
+      assert(false, actual_lines[0..Sass::Util.enum_with_index(actual_lines).find {|l, i| l == "*/"}.last].join("\n"))
     end
 
     expected_lines.zip(actual_lines).each_with_index do |pair, line|

data/vendor/sass/test/sass/results/import_charset.css

@@ -0,0 +1,4 @@
+@charset "UTF-8";
+.foo { a: b; }
+
+.bar { a: щ; }

data/vendor/sass/test/sass/results/import_charset_1_8.css

@@ -0,0 +1,4 @@
+@charset "IBM866";
+.foo { a: b; }
+
+.bar { a: �; }

data/vendor/sass/test/sass/results/import_charset_ibm866.css

@@ -0,0 +1,4 @@
+@charset "IBM866";
+.foo { a: b; }
+
+.bar { a: �; }

data/vendor/sass/test/sass/script_conversion_test.rb

@@ -82,28 +82,6 @@ WARN
     assert_renders "$foo !important"
   end
 
-  def test_comma_operator
-    assert_renders "$foo, $bar $baz"
-    assert_renders "$foo $bar, $baz"
-
-    assert_renders "($foo, $bar) $baz"
-    assert_renders "$foo ($bar, $baz)"
-
-    assert_equal "$foo, $bar $baz", render("$foo, ($bar $baz)")
-    assert_equal "$foo $bar, $baz", render("($foo $bar), $baz")
-  end
-
-  def test_concat_operator
-    assert_renders "$foo $bar or $baz"
-    assert_renders "$foo or $bar $baz"
-
-    assert_renders "($foo $bar) or $baz"
-    assert_renders "$foo or ($bar $baz)"
-
-    assert_equal "$foo $bar or $baz", render("$foo ($bar or $baz)")
-    assert_equal "$foo or $bar $baz", render("($foo or $bar) $baz")
-  end
-
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]
@@ -146,7 +124,7 @@ RUBY
   def self.separator_for(op_name)
     case op_name
     when :comma; ", "
-    when :concat; " "
+    when :space; " "
     else; " #{Sass::Script::Lexer::OPERATORS_REVERSE[op_name]} "
     end
   end
@@ -182,8 +160,6 @@ RUBY
   test_precedence :plus, :div
   test_precedence :plus, :mod
 
-  assert_associative :comma, :concat
-  assert_associative :concat, :or
   assert_associative :plus, :minus
   assert_associative :times, :div
   assert_associative :times, :mod
@@ -196,6 +172,32 @@ RUBY
   assert_non_associative :lt, :lte
   assert_non_associative :lte, :gt
 
+  def test_comma_precedence
+    assert_renders "$foo, $bar, $baz"
+
+    assert_renders "$foo ($bar, $baz)"
+    assert_renders "($foo, $bar) $baz"
+
+    assert_equal "$foo, $bar $baz", render("$foo, ($bar $baz)")
+    assert_equal "$foo $bar, $baz", render("($foo $bar), $baz")
+
+    assert_equal "$foo, ($bar, $baz)", render("$foo, ($bar, $baz)")
+    assert_equal "($foo, $bar), $baz", render("($foo, $bar), $baz")
+  end
+
+  def test_space_precedence
+    assert_renders "$foo $bar $baz"
+
+    assert_renders "$foo or ($bar $baz)"
+    assert_renders "($foo $bar) or $baz"
+
+    assert_equal "$foo $bar or $baz", render("$foo ($bar or $baz)")
+    assert_equal "$foo or $bar $baz", render("($foo or $bar) $baz")
+
+    assert_equal "$foo ($bar $baz)", render("$foo ($bar $baz)")
+    assert_equal "($foo $bar) $baz", render("($foo $bar) $baz")
+  end
+
   def test_unary_op
     assert_renders "-12px"
     assert_renders '/"foo"'

data/vendor/sass/test/sass/script_test.rb

@@ -103,7 +103,6 @@ class SassScriptTest < Test::Unit::TestCase
 
   def test_implicit_strings
     assert_equal Sass::Script::String.new("foo"), eval("foo")
-    assert_equal Sass::Script::String.new("foo bar"), eval("foo bar")
     assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
   end
 
@@ -235,6 +234,10 @@ SASS
   def test_ruby_equality
     assert_equal eval('"foo"'), eval('"foo"')
     assert_equal eval('1'), eval('1.0')
+    assert_equal eval('1 2 3.0'), eval('1 2 3')
+    assert_equal eval('1, 2, 3.0'), eval('1, 2, 3')
+    assert_equal eval('(1 2), (3, 4), (5 6)'), eval('(1 2), (3, 4), (5 6)')
+    assert_not_equal eval('1, 2, 3'), eval('1 2 3')
     assert_not_equal eval('1'), eval('"1"')
   end
 
@@ -313,6 +316,14 @@ SASS
     assert_equal "true", resolve("false != true")
     assert_equal "false", resolve("1em == 1px")
     assert_equal "false", resolve("12 != 12")
+    assert_equal "true", resolve("(foo bar baz) == (foo bar baz)")
+    assert_equal "true", resolve("(foo, bar, baz) == (foo, bar, baz)")
+    assert_equal "true", resolve('((1 2), (3, 4), (5 6)) == ((1 2), (3, 4), (5 6))')
+    assert_equal "true", resolve('((1 2), (3 4)) == (1 2, 3 4)')
+    assert_equal "false", resolve('((1 2) 3) == (1 2 3)')
+    assert_equal "false", resolve('(1 (2 3)) == (1 2 3)')
+    assert_equal "false", resolve('((1, 2) (3, 4)) == (1, 2 3, 4)')
+    assert_equal "false", resolve('(1 2 3) == (1, 2, 3)')
   end
 
   def test_operation_precedence

data/vendor/sass/test/sass/scss/css_test.rb

@@ -49,11 +49,34 @@ baz {bar: baz}
 SCSS
   end
 
-  def test_unicode
-    assert_parses <<SCSS
+  if Sass::Util.ruby1_8?
+    def test_unicode
+      assert_parses <<SCSS
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+SCSS
+      assert_parses <<SCSS
 foo {
   bar: föö bâr; }
 SCSS
+    end
+  else
+    def test_unicode
+      assert_parses <<SCSS
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+SCSS
+      assert_equal <<CSS, render(<<SCSS)
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+CSS
+foo {
+  bar: föö bâr; }
+SCSS
+    end
   end
 
   def test_invisible_comments
@@ -429,10 +452,6 @@ SCSS
 
   ## Directives
 
-  def test_charset_directive
-    assert_parses '@charset "utf-8";'
-  end
-
   def test_namespace_directive
     assert_parses '@namespace "http://www.w3.org/Profiles/xhtml1-strict";'
     assert_parses '@namespace url(http://www.w3.org/Profiles/xhtml1-strict);'
@@ -508,11 +527,11 @@ SCSS
   end
 
   def test_blockless_directive_without_semicolon
-    assert_equal "@charset \"utf-8\";\n", render('@charset "utf-8"')
+    assert_equal "@foo \"bar\";\n", render('@foo "bar"')
   end
 
   def test_directive_with_lots_of_whitespace
-    assert_equal "@charset \"utf-16\";\n", render('@charset    "utf-16"  ;')
+    assert_equal "@foo \"bar\";\n", render('@foo    "bar"  ;')
   end
 
   def test_empty_blockless_directive

data/vendor/sass/test/sass/scss/scss_test.rb

@@ -235,6 +235,33 @@ $i: 1;
 SCSS
   end
 
+  def test_each_directive
+    assert_equal <<CSS, render(<<SCSS)
+a {
+  b: 1px;
+  b: 2px;
+  b: 3px;
+  b: 4px; }
+
+c {
+  d: foo;
+  d: bar;
+  d: baz;
+  d: bang; }
+CSS
+a {
+  @each $number in 1px 2px 3px 4px {
+    b: $number;
+  }
+}
+c {
+  @each $str in foo, bar, baz, bang {
+    d: $str;
+  }
+}
+SCSS
+  end
+
   def test_css_import_directive
     assert_equal "@import url(foo.css);\n", render('@import "foo.css";')
     assert_equal "@import url(foo.css);\n", render("@import 'foo.css';")
@@ -441,6 +468,22 @@ baz {
 SCSS
   end
 
+  def test_trailing_comma_in_selector
+    assert_equal <<CSS, render(<<SCSS)
+#foo #bar,
+#baz #boom {
+  a: b; }
+
+#bip #bop {
+  c: d; }
+CSS
+#foo #bar,,
+,#baz #boom, {a: b}
+
+#bip #bop, ,, {c: d}
+SCSS
+  end
+
   def test_parent_selectors
     assert_equal <<CSS, render(<<SCSS)
 foo:hover {
@@ -1023,6 +1066,14 @@ MESSAGE
 SCSS
   end
 
+  def test_no_lonely_else
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+Invalid CSS: @else must come after @if
+MESSAGE
+@else {foo: bar}
+SCSS
+  end
+
   # Regression
 
   def test_weird_added_space
@@ -1146,6 +1197,32 @@ b {
   }
 }
 SCSS
+  end
+
+  def test_if_error_line
+    assert_raise_line(2) {render(<<SCSS)}
+@if true {foo: bar}
+}
+SCSS
+  end
 
+  def test_multiline_var
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: 3;
+  b: false;
+  c: a b c; }
+CSS
+foo {
+  $var1: 1 +
+    2;
+  $var2: true and
+    false;
+  $var3: a b
+    c;
+  a: $var1;
+  b: $var2;
+  c: $var3; }
+SCSS
   end
 end

data/vendor/sass/test/sass/templates/_imported_charset_ibm866.sass

@@ -0,0 +1,4 @@
+@charset "IBM866"
+
+.bar
+  a: �

data/vendor/sass/test/sass/templates/_imported_charset_utf8.sass

@@ -0,0 +1,4 @@
+@charset "UTF-8"
+
+.bar
+  a: щ

data/vendor/sass/test/sass/templates/import_charset.sass

@@ -0,0 +1,7 @@
+.foo
+  a: b
+
+// Even though the imported file is in IBM866,
+// since the root file is in UTF-8/ASCII
+// the output will end up being UTF-8.
+@import "imported_charset_ibm866"

data/vendor/sass/test/sass/templates/import_charset_1_8.sass

@@ -0,0 +1,4 @@
+.foo
+  a: b
+
+@import "imported_charset_ibm866"

data/vendor/sass/test/sass/templates/import_charset_ibm866.sass

@@ -0,0 +1,9 @@
+@charset "IBM866"
+
+.foo
+  a: b
+
+// Even though the imported file is in UTF-8,
+// since the root file is in IBM866
+// the output will end up being IBM866.
+@import "imported_charset_utf8"

data/vendor/sass/test/sass/templates/script.sass

@@ -9,7 +9,7 @@ $esc: 10\+12
 $str: Hello\!
 $qstr: "Quo\"ted\"!"
 $hstr: Hyph-en\!
-$concat: #{5 + 4} hi there
+$space: #{5 + 4} hi there
 $percent: 11%
 $complex: 1px/1em
 
@@ -22,7 +22,7 @@ $complex: 1px/1em
   :color $main_text
   :short-color #123
   :named-color olive
-  :con "foo" bar ($concat "boom")
+  :con "foo" bar ($space "boom")
   :con2 "noquo" quo
   #sidebar
     :background-color $color