sass 3.3.0.alpha.380 → 3.3.0.alpha.382

data/REVISION

@@ -1 +1 @@
-898bec6bfb7fa4ce8a1ca8e2ff210387c7f98f0e
+bdc463148ed78f460943d6872b3e45109fe894ed

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.380
+3.3.0.alpha.382

data/VERSION_DATE

@@ -1 +1 @@
-11 October 2013 22:11:57 GMT
+11 October 2013 22:12:53 GMT

data/lib/sass/script/parser.rb

@@ -269,7 +269,8 @@ RUBY
         key, value = map_pair(e)
         map = node(Sass::Script::Tree::MapLiteral.new([[key, value]]), start_pos)
         while try_tok(:comma)
-          key, value = assert_expr(:map_pair)
+          return map unless (pair = map_pair)
+          key, value = pair
           map.pairs << [key, value]
         end
         map
@@ -289,16 +290,20 @@ RUBY
       end
 
       def list(first, start_pos)
+        return first unless @lexer.peek && @lexer.peek.type == :comma
+
         list = node(Sass::Script::Tree::ListLiteral.new([first], :comma), start_pos)
         while (tok = try_tok(:comma))
-          if (interp = try_op_before_interp(tok, list))
+          element_before_interp = list.elements.length == 1 ? list.elements.first : list
+          if (interp = try_op_before_interp(tok, element_before_interp))
             other_interp = try_ops_after_interp([:comma], :expr, interp)
             return interp unless other_interp
             return other_interp
           end
-          list.elements << assert_expr(:interpolation)
+          return list unless (e = interpolation)
+          list.elements << e
         end
-        list.elements.size == 1 ? list.elements.first : list
+        list
       end
 
       production :equals, :interpolation, :single_eq

data/lib/sass/script/tree/list_literal.rb

@@ -29,7 +29,7 @@ module Sass::Script::Tree
     def to_sass(opts = {})
       return "()" if elements.empty?
       precedence = Sass::Script::Parser.precedence_of(separator)
-      elements.reject {|e| e.is_a?(Sass::Script::Value::Null)}.map do |v|
+      members = elements.map do |v|
         if v.is_a?(ListLiteral) && Sass::Script::Parser.precedence_of(v.separator) <= precedence ||
             separator == :space && v.is_a?(UnaryOperation) &&
             (v.operator == :minus || v.operator == :plus)
@@ -37,7 +37,11 @@ module Sass::Script::Tree
         else
           v.to_sass(opts)
         end
-      end.join(sep_str(nil))
+      end
+
+      return "(#{members.first},)" if separator == :comma && members.length == 1
+
+      members.join(sep_str(nil))
     end
 
 

data/lib/sass/script/value/list.rb

@@ -52,7 +52,7 @@ module Sass::Script::Value
     def to_sass(opts = {})
       return "()" if value.empty?
       precedence = Sass::Script::Parser.precedence_of(separator)
-      value.reject {|e| e.is_a?(Null)}.map do |v|
+      members = value.reject {|e| e.is_a?(Null)}.map do |v|
         if v.is_a?(List) && Sass::Script::Parser.precedence_of(v.separator) <= precedence ||
             separator == :space && v.is_a?(Sass::Script::Tree::UnaryOperation) &&
             (v.operator == :minus || v.operator == :plus)
@@ -60,7 +60,9 @@ module Sass::Script::Value
         else
           v.to_sass(opts)
         end
-      end.join(sep_str(nil))
+      end
+      return "(#{members.first},)" if members.length == 1 && separator == :comma
+      members.join(sep_str(nil))
     end
 
     # @see Value#to_h

data/test/sass/script_conversion_test.rb

@@ -83,6 +83,12 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "foo(a, b, (a, b, c)...)"
   end
 
+  def test_singleton_list
+    assert_renders "(1,)"
+    assert_renders "(1 2 3,)"
+    assert_renders "((1, 2, 3),)"
+  end
+
   def test_map
     assert_renders "(foo: bar)"
     assert_renders "(foo: bar, baz: bip)"

data/test/sass/script_test.rb

@@ -492,6 +492,18 @@ SASS
     assert_equal "1 2 3", resolve("null 1 2 3")
   end
 
+  def test_map_can_have_trailing_comma
+    assert_equal("(foo: 1, bar: 2)", eval("(foo: 1, bar: 2,)").to_sass)
+  end
+
+  def test_list_can_have_trailing_comma
+    assert_equal("1, 2, 3", resolve("1, 2, 3,"))
+  end
+
+  def test_trailing_comma_defines_singleton_list
+    assert_equal("1 2 3", resolve("nth((1 2 3,), 1)"))
+  end
+
   def test_map_cannot_have_duplicate_keys
     assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, foo: baz).') do
       eval("(foo: bar, foo: baz)")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302581
+  hash: 592302577
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 380
-  version: 3.3.0.alpha.380
+  - 382
+  version: 3.3.0.alpha.382
 platform: ruby
 authors: 
 - Nathan Weizenbaum