sass 3.3.0.alpha.121 → 3.3.0.alpha.127

data/REVISION

@@ -1 +1 @@
-d561c91ec63d2793e1ea0b9f571d18e2db83a65b
+37a46f42d51efbb1bb31d4b35c92442d2bed1b98

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.121
+3.3.0.alpha.127

data/VERSION_DATE

@@ -1 +1 @@
-23 March 2013 00:34:47 GMT
+18 April 2013 00:24:47 GMT

data/lib/sass/cache_stores/base.rb

@@ -51,6 +51,7 @@ module Sass
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -63,6 +64,7 @@ module Sass
         Marshal.load(contents) if contents
       rescue EOFError, TypeError, ArgumentError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Return the key for the sass file.

data/lib/sass/exec.rb

@@ -110,11 +110,10 @@ module Sass
             open_file(filename) || $stdin
           end
         @options[:output_filename] = args.shift
-        output ||= open_file(@options[:output_filename], 'w') || $stdout
+        output ||= @options[:output_filename] || $stdout
 
         if @options[:sourcemap] && @options[:output_filename]
           @options[:sourcemap_filename] = Util::sourcemap_name(@options[:output_filename])
-          @options[:sourcemap] = open_file(@options[:sourcemap_filename], 'w')
         end
 
         @options[:input], @options[:output] = input, output
@@ -162,6 +161,14 @@ module Sass
         return "\e[#{COLORS[color]}m#{str}\e[0m"
       end
 
+      def write_output(text, destination)
+        if destination.is_a?(String)
+          File.open(destination, 'w') {|file| file.write(text)}
+        else
+          destination.write(text)
+        end
+      end
+
       private
 
       def open_file(filename, flag = 'r')
@@ -317,7 +324,7 @@ END
         return watch_or_update if @options[:watch] || @options[:update]
         super
         @options[:for_engine][:filename] = @options[:filename]
-        @options[:for_engine][:css_filename] = @options[:output].path if @options[:output].is_a?(File)
+        @options[:for_engine][:css_filename] = @options[:output] if @options[:output].is_a?(String)
 
         begin
           input = @options[:input]
@@ -342,12 +349,13 @@ END
             relative_sourcemap_path = Pathname.new(@options[:sourcemap_filename]).
               relative_path_from(Pathname.new(@options[:output_filename]).dirname)
             rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
-            output.write(rendered)
-            sourcemap.puts(mapping.to_json(
+            write_output(rendered, output)
+            write_output(mapping.to_json(
                 :css_path => @options[:output_filename],
-                :sourcemap_path => @options[:sourcemap_filename]))
+                :sourcemap_path => @options[:sourcemap_filename]) + "\n",
+              @options[:sourcemap_filename])
           else
-            output.write(engine.render)
+            write_output(engine.render, output)
           end
         rescue ::Sass::SyntaxError => e
           raise e if @options[:trace]
@@ -664,7 +672,6 @@ END
           end
 
           input = open_file(f)
-          output = @options[:in_place] ? input : open_file(output, "w")
           process_file(input, output)
         end
       end
@@ -709,7 +716,7 @@ END
           end
 
         output = File.open(input.path, 'w') if @options[:in_place]
-        output.write(out)
+        write_output(out, output)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]
         file = " of #{e.sass_filename}" if e.sass_filename

data/lib/sass/script/funcall.rb

@@ -54,12 +54,18 @@ module Sass
 
       # @see Node#to_sass
       def to_sass(opts = {})
-        args = @args.map {|a| a.to_sass(opts)}.join(', ')
+        arg_to_sass = lambda do |arg|
+          sass = arg.to_sass(opts)
+          sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
+          sass
+        end
+
+        args = @args.map(&arg_to_sass).join(', ')
         keywords = Sass::Util.hash_to_a(@keywords).
-          map {|k, v| "$#{dasherize(k, opts)}: #{v.to_sass(opts)}"}.join(', ')
+          map {|k, v| "$#{dasherize(k, opts)}: #{arg_to_sass[v]}"}.join(', ')
         if self.splat
           splat = (args.empty? && keywords.empty?) ? "" : ", "
-          splat = "#{splat}#{self.splat.inspect}..."
+          splat = "#{splat}#{arg_to_sass[self.splat]}..."
         end
         "#{dasherize(name, opts)}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
       end

data/lib/sass/script/functions.rb

@@ -165,6 +165,15 @@ module Sass::Script
   # \{#append append($list1, $val, \[$separator\])}
   # : Appends a single value onto the end of a list.
   #
+  # \{#zip zip($list1, $list2, ...)}
+  # : Combines several lists into a single multidimensional list.
+  #
+  # \{#index index($list, $value)}
+  # : Returns the position of a value within a list, or false.
+  #
+  # \{#list-separator list-separator(#list)}
+  # : Returns the separator of a list.
+  #
   # ## Introspection Functions
   #
   # \{#type_of type-of($value)}
@@ -1555,8 +1564,8 @@ module Sass::Script
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
 
-    # Combines several lists into a single comma separated list
-    # space separated lists.
+    # Combines several lists into a single comma separated list, where the nth
+    # value is a space separated list of the source lists' nth values.
     #
     # The length of the resulting list is the length of the
     # shortest list.
@@ -1581,8 +1590,8 @@ module Sass::Script
     declare :zip, [], :var_args => true
 
 
-    # Returns the position of the given value within the given
-    # list. If not found, returns false.
+    # Returns the position of a value within a list. If not found, returns
+    # false.
     #
     # @example
     #   index(1px solid red, solid) => 2
@@ -1597,6 +1606,22 @@ module Sass::Script
     end
     declare :index, [:list, :value]
 
+    # Returns the separator of the given list.
+    # If not a list, returns false.
+    #
+    # @example
+    #   list-separator(1px 2px 3px) => 'space'
+    #   list-separator(1px, 2px, 3px) => 'comma'
+    #   list-separator('foo') => 'space'
+    def list_separator(list)
+      if list.class == Sass::Script::List
+        String.new(list.separator.to_s)
+      else
+        String.new('space')
+      end
+    end
+    declare :separator, [:list]
+
     # Returns one of two values based on the truth value of the first argument.
     #
     # @example

data/lib/sass/script/literal.rb

@@ -90,24 +90,6 @@ MSG
       Sass::Script::Bool.new(!to_bool)
     end
 
-    # The SassScript default operation (e.g. `$a $b`, `"foo" "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by a space
-    def space(other)
-      Sass::Script::String.new("#{self.to_s} #{other.to_s}")
-    end
-
-    # The SassScript `,` operation (e.g. `$a, $b`, `"foo", "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `", "`
-    def comma(other)
-      Sass::Script::String.new("#{self.to_s},#{' ' unless options[:style] == :compressed}#{other.to_s}")
-    end
-
     # The SassScript `=` operation
     # (used for proprietary MS syntax like `alpha(opacity=20)`).
     #

data/lib/sass/script/parser.rb

@@ -269,15 +269,15 @@ RUBY
         interp = try_ops_after_interp([:comma], :expr) and return interp
         start_pos = source_position
         return unless e = interpolation
-        arr = [e]
+        list = node(List.new([e], :comma), start_pos)
         while tok = try_tok(:comma)
-          if interp = try_op_before_interp(tok, e)
+          if interp = try_op_before_interp(tok, list)
             return interp unless other_interp = try_ops_after_interp([:comma], :expr, interp)
             return other_interp
           end
-          arr << assert_expr(:interpolation)
+          list.value << assert_expr(:interpolation)
         end
-        arr.size == 1 ? arr.first : node(List.new(arr, :comma), start_pos)
+        list.value.size == 1 ? list.value.first : list
       end
 
       production :equals, :interpolation, :single_eq

data/lib/sass/script/string.rb

@@ -31,7 +31,7 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @value.gsub(/\s+/, " ")
+        return @value.gsub(/\n\s*/, " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}

data/lib/sass/scss/parser.rb

@@ -1151,7 +1151,7 @@ MESSAGE
       end
 
       def rethrow(err)
-        if @throw_err
+        if @throw_error
           throw :_sass_parser_error, err
         else
           @scanner = Sass::Util::MultibyteStringScanner.new(@scanner.string)

data/lib/sass/tree/visitors/convert.rb

@@ -195,13 +195,19 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_mixin(node)
+    arg_to_sass = lambda do |arg|
+      sass = arg.to_sass(@options)
+      sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
+      sass
+    end
+
     unless node.args.empty? && node.keywords.empty? && node.splat.nil?
-      args = node.args.map {|a| a.to_sass(@options)}.join(", ")
+      args = node.args.map(&arg_to_sass).join(", ")
       keywords = Sass::Util.hash_to_a(node.keywords).
-        map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
+        map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}.join(', ')
       if node.splat
         splat = (args.empty? && keywords.empty?) ? "" : ", "
-        splat = "#{splat}#{node.splat.to_sass(@options)}..."
+        splat = "#{splat}#{arg_to_sass[node.splat]}..."
       end
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end

data/test/sass/conversion_test.rb

@@ -1618,6 +1618,30 @@ SCSS
 
   ## Regression Tests
 
+  def test_list_in_args
+    assert_renders(<<SASS, <<SCSS)
+$foo: foo((a, b, c))
+$foo: foo($arg: (a, b, c))
+$foo: foo(a, b, (c, d, e)...)
+
++mixin((a, b, c))
+
++mixin($arg: (a, b, c))
+
++mixin(a, b, (c, d, e)...)
+SASS
+$foo: foo((a, b, c));
+$foo: foo($arg: (a, b, c));
+$foo: foo(a, b, (c, d, e)...);
+
+@include mixin((a, b, c));
+
+@include mixin($arg: (a, b, c));
+
+@include mixin(a, b, (c, d, e)...);
+SCSS
+  end
+
   def test_media_query_with_expr
     assert_scss_to_sass <<SASS, <<SCSS
 @media foo and (bar: baz)

data/test/sass/functions_test.rb

@@ -1116,6 +1116,16 @@ MSG
     assert_equal("false", evaluate("index(1px, #00f)"))
   end
 
+  def test_list_separator
+    assert_equal("space", evaluate("list-separator(1 2 3 4 5)"))
+    assert_equal("comma", evaluate("list-separator((foo, bar, baz, bip))"))
+    assert_equal("comma", evaluate("list-separator((foo, bar, baz bip))"))
+    assert_equal("comma", evaluate("list-separator((foo, bar, (baz, bip)))"))
+    assert_equal("space", evaluate("list-separator(#f00)"))
+    assert_equal("space", evaluate("list-separator(())"))
+    assert_equal("space", evaluate("list-separator(1 2 () 3)"))
+  end
+
   def test_if
     assert_equal("1px", evaluate("if(true, 1px, 2px)"))
     assert_equal("2px", evaluate("if(false, 1px, 2px)"))

data/test/sass/script_test.rb

@@ -134,6 +134,7 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
     assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
     assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
+    assert_equal '3, 7, 11', resolve('3, 7, #{5 + 6}')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')

data/test/sass/scss/css_test.rb

@@ -1011,6 +1011,17 @@ SCSS
 
   ## Regressions
 
+  def test_double_space_string
+    assert_equal(<<CSS, render(<<SCSS))
+.a {
+  content: "  a"; }
+CSS
+.a {
+  content: "  a";
+}
+SCSS
+  end
+
   def test_very_long_number_with_important_doesnt_take_forever
     assert_equal(<<CSS, render(<<SCSS))
 .foo {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303103
+  hash: 592303091
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 121
-  version: 3.3.0.alpha.121
+  - 127
+  version: 3.3.0.alpha.127
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-22 00:00:00 -04:00
+date: 2013-04-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency