sass 3.3.0.alpha.227 → 3.3.0.alpha.229

data/REVISION

@@ -1 +1 @@
-22370c84a7b6617813436fa3fd952f89a7821528
+7ff8fef1739f20466b1b9e9330a99fe4f7ca83e9

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.227
+3.3.0.alpha.229

data/VERSION_DATE

@@ -1 +1 @@
-09 August 2013 20:00:43 GMT
+12 August 2013 23:04:10 GMT

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

@@ -25,19 +25,21 @@ module Sass::Script::Tree
     # @see Node#children
     def children; elements; end
 
-    # @see Node#to_sass
+    # @see Value#to_sass
     def to_sass(opts = {})
       return "()" if elements.empty?
       precedence = Sass::Script::Parser.precedence_of(separator)
-      elements.map do |v|
-        if v.is_a?(ListLiteral) && Sass::Script::Parser.precedence_of(v.separator) <= precedence
+      elements.reject {|e| e.is_a?(Sass::Script::Value::Null)}.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)
           "(#{v.to_sass(opts)})"
         else
           v.to_sass(opts)
         end
-      end.join(separator == :space ? ' ' : ', ')
+      end.join(sep_str(nil))
     end
 
+
     # @see Node#deep_copy
     def deep_copy
       node = dup
@@ -61,5 +63,13 @@ module Sass::Script::Tree
       list.options = self.options
       list
     end
+
+    private
+
+    def sep_str(opts = self.options)
+      return ' ' if separator == :space
+      return ',' if opts && opts[:style] == :compressed
+      return ', '
+    end
   end
 end

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

@@ -4,9 +4,14 @@ module Sass::Script::Tree
   #
   # Currently only `-`, `/`, and `not` are unary operators.
   class UnaryOperation < Node
-    # @param operand [Script::Node] The parse-tree node
-    #   for the object of the operator
-    # @param operator [Symbol] The operator to perform
+    # @return [Symbol] The operation to perform
+    attr_reader :operator
+
+    # @return [Script::Node] The parse-tree node for the object of the operator
+    attr_reader :operand
+
+    # @param operand [Script::Node] See \{#operand}
+    # @param operator [Symbol] See \{#operator}
     def initialize(operand, operator)
       @operand = operand
       @operator = operator

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

@@ -42,19 +42,6 @@ module Sass::Script::Value
       return value.reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
     end
 
-    # @see Value#to_sass
-    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|
-        if v.is_a?(List) && Sass::Script::Parser.precedence_of(v.separator) <= precedence
-          "(#{v.to_sass(opts)})"
-        else
-          v.to_sass(opts)
-        end
-      end.join(sep_str(nil))
-    end
-
     # @see Value#inspect
     def inspect
       "(#{value.map {|e| e.inspect}.join(sep_str(nil))})"

data/test/sass/conversion_test.rb

@@ -1742,6 +1742,23 @@ $foo: foo($dash-ed: 2px, $under_scored: 1px);
 SCSS
   end
 
+  def test_ambiguous_negation
+    assert_renders(<<SASS, <<SCSS, :indent => '    ')
+foo
+    ok: -$foo
+    comma: 10px, -$foo
+    needs-parens: 10px (-$foo)
+    no-parens: a 50px + 60px b
+SASS
+foo {
+    ok: -$foo;
+    comma: 10px, -$foo;
+    needs-parens: 10px (-$foo);
+    no-parens: a 50px + 60px b;
+}
+SCSS
+  end
+
   private
 
   def assert_sass_to_sass(sass, options = {})

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302795
+  hash: 592302791
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 227
-  version: 3.3.0.alpha.227
+  - 229
+  version: 3.3.0.alpha.229
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-09 00:00:00 -04:00
+date: 2013-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency