haml 3.1.0.alpha.19 → 3.1.0.alpha.22

data/vendor/sass/test/sass/less_conversion_test.rb

@@ -326,7 +326,14 @@ foo {
   d: 1 + 2 - 3 + 4;
   e: 1 / 2 - 3 / 4;
   f: 1 - 2 / 3 - 4;
-  g: 1 / 2 * 3 / 4; }
+  g: 1 / 2 * 3 / 4;
+  h: (1 + 2) * (3 + 4);
+  i: 1 * (2 + 3) * 4;
+  j: 1 - (2 + 2) - 4;
+  k: 1 + 2 - (3 + 4);
+  l: 1 / (2 - 3) / 4;
+  m: (1 - 2) / (3 - 4);
+  n: 1 / (2 * 3) / 4; }
 SCSS
 foo {
   a: 1 + 2 * 3 + 4;
@@ -335,7 +342,14 @@ foo {
   d: 1 + 2 - 3 + 4;
   e: 1 / 2 - 3 / 4;
   f: 1 - 2 / 3 - 4;
-  g: 1 / 2 * 3 / 4; }
+  g: 1 / 2 * 3 / 4;
+  h: (1 + 2) * (3 + 4);
+  i: 1 * (2 + 3) * 4;
+  j: 1 - (2 + 2) - 4;
+  k: 1 + 2 - (3 + 4);
+  l: 1 / (2 - 3) / 4;
+  m: (1 - 2) / (3 - 4);
+  n: 1 / (2 * 3) / 4; }
 LESS
   end
 
@@ -628,5 +642,12 @@ LESS
 end
 
 rescue LoadError => e
-puts "\nCouldn't require less, skipping some tests."
+  unless defined?(Gem)
+    begin
+      require 'rubygems'
+      retry
+    rescue Exception
+    end
+  end
+  puts "\nCouldn't require less, skipping some tests."
 end

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

@@ -53,6 +53,11 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "-foo(12px)"
   end
 
+  def test_funcall_with_keyword_args
+    assert_renders "foo(arg1, arg2, $karg1: val, $karg2: val2)"
+    assert_renders "foo($karg1: val, $karg2: val2)"
+  end
+
   def test_url
     assert_renders "url(foo.gif)"
     assert_renders "url($var)"
@@ -118,6 +123,52 @@ WARN
 RUBY
   end
 
+  def self.assert_associative(op_name, sibling_name)
+    op = separator_for(op_name)
+    sibling = separator_for(sibling_name)
+    class_eval <<RUBY
+      def test_associative_#{op_name}_#{sibling_name} 
+        assert_renders "$foo#{op}$bar#{op}$baz"
+
+        assert_equal "$foo#{op}$bar#{op}$baz",
+          render("$foo#{op}($bar#{op}$baz)")
+        assert_equal "$foo#{op}$bar#{op}$baz",
+          render("($foo#{op}$bar)#{op}$baz")
+
+        assert_equal "$foo#{op}$bar#{sibling}$baz",
+          render("$foo#{op}($bar#{sibling}$baz)")
+        assert_equal "$foo#{sibling}$bar#{op}$baz",
+          render("($foo#{sibling}$bar)#{op}$baz")
+      end
+RUBY
+  end
+
+  def self.separator_for(op_name)
+    case op_name
+    when :comma; ", "
+    when :concat; " "
+    else; " #{Sass::Script::Lexer::OPERATORS_REVERSE[op_name]} "
+    end
+  end
+
+  def self.assert_non_associative(op_name, sibling_name)
+    op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
+    sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
+    class_eval <<RUBY
+      def test_non_associative_#{op_name}_#{sibling_name} 
+        assert_renders "$foo #{op} $bar #{op} $baz"
+
+        assert_renders "$foo #{op} ($bar #{op} $baz)"
+        assert_equal "$foo #{op} $bar #{op} $baz",
+          render("($foo #{op} $bar) #{op} $baz")
+
+        assert_renders "$foo #{op} ($bar #{sibling} $baz)"
+        assert_equal "$foo #{sibling} $bar #{op} $baz",
+          render("($foo #{sibling} $bar) #{op} $baz")
+      end
+RUBY
+  end
+
   test_precedence :or, :and
   test_precedence :and, :eq
   test_precedence :and, :neq
@@ -131,6 +182,20 @@ 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
+
+  assert_non_associative :minus, :plus
+  assert_non_associative :div, :times
+  assert_non_associative :mod, :times
+  assert_non_associative :gt, :gte
+  assert_non_associative :gte, :lt
+  assert_non_associative :lt, :lte
+  assert_non_associative :lte, :gt
+
   def test_unary_op
     assert_renders "-12px"
     assert_renders '/"foo"'

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

@@ -1072,6 +1072,69 @@ ul li\#{$bar} a span.label { foo: bar; }
 SCSS
   end
 
+  def test_mixin_with_keyword_args
+    assert_equal <<CSS, render(<<SCSS)
+.mixed {
+  required: foo;
+  arg1: default-val1;
+  arg2: non-default-val2; }
+CSS
+@mixin a-mixin($required, $arg1: default-val1, $arg2: default-val2) {
+  required: $required;
+  arg1: $arg1;
+  arg2: $arg2;
+}
+.mixed { @include a-mixin(foo, $arg2: non-default-val2); }
+SCSS
+  end
+
+  def test_passing_required_args_as_a_keyword_arg
+    assert_equal <<CSS, render(<<SCSS)
+.mixed {
+  required: foo;
+  arg1: default-val1;
+  arg2: default-val2; }
+CSS
+@mixin a-mixin($required, $arg1: default-val1, $arg2: default-val2) {
+  required: $required;
+  arg1: $arg1;
+  arg2: $arg2; }
+.mixed { @include a-mixin($required: foo); }
+SCSS
+  end
+
+  def test_passing_all_as_keyword_args_in_opposite_order
+    assert_equal <<CSS, render(<<SCSS)
+.mixed {
+  required: foo;
+  arg1: non-default-val1;
+  arg2: non-default-val2; }
+CSS
+@mixin a-mixin($required, $arg1: default-val1, $arg2: default-val2) {
+  required: $required;
+  arg1: $arg1;
+  arg2: $arg2; }
+.mixed { @include a-mixin($arg2: non-default-val2, $arg1: non-default-val1, $required: foo); }
+SCSS
+  end
+
+  def test_keyword_args_in_functions
+    assert_equal <<CSS, render(<<SCSS)
+.keyed {
+  color: rgba(170, 119, 204, 0.4); }
+CSS
+.keyed { color: rgba($color: #a7c, $alpha: 0.4) }
+SCSS
+  end
+
+  def test_unknown_keyword_arg_raises_error
+    assert_raise_message(Sass::SyntaxError, "Mixin a doesn't have an argument named $c") {render <<SCSS}
+@mixin a($b: 1) { a: $b; }
+div { @include a(1, $c: 3); }
+SCSS
+  end
+
+
   def test_newlines_removed_from_selectors_when_compressed
     assert_equal <<CSS, render(<<SCSS, :style=>:compressed)
 z a,z b{display:block}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.19
+  version: 3.1.0.alpha.22
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency