sass 3.1.0.alpha.9 → 3.1.0.alpha.10

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.9
+3.1.0.alpha.10

data/Rakefile

@@ -24,7 +24,7 @@ end
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:permissions, :revision_file, :submodules] do
+task :package => [:revision_file, :submodules, :permissions] do
   load scope('sass.gemspec')
   Gem::Builder.new(SASS_GEMSPEC).build
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.9
+3.1.0.alpha.10

data/lib/sass/script/funcall.rb

@@ -63,13 +63,10 @@ module Sass
         args = self.args.map {|a| a.perform(environment)}
         ruby_name = name.gsub('-', '_')
         unless Sass::Util.has?(:public_instance_method, Functions, ruby_name) && ruby_name !~ /^__/
-          result = Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})")
+          opts(Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})"))
         else
-          result = Functions::EvaluationContext.new(environment.options).send(ruby_name, *args)
+          opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
         end
-
-        result.options = environment.options
-        return result
       rescue ArgumentError => e
         raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")

data/lib/sass/script/interpolation.rb

@@ -64,7 +64,7 @@ module Sass::Script
       res << (val.is_a?(Sass::Script::String) ? val.value : val.to_s)
       res << " " if @after && @whitespace_after
       res << @after.perform(environment).to_s if @after
-      Sass::Script::String.new(res)
+      opts(Sass::Script::String.new(res))
     end
   end
 end

data/lib/sass/script/node.rb

@@ -90,6 +90,8 @@ module Sass::Script
     end
 
     # Evaluates this node.
+    # Note that all {Literal} objects created within this method
+    # should have their \{#options} attribute set, probably via \{#opts}.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
     # @return [Literal] The SassScript object that is the value of the SassScript
@@ -97,5 +99,14 @@ module Sass::Script
     def _perform(environment)
       Sass::Util.abstract(self)
     end
+
+    # Sets the \{#options} field on the given literal and returns it
+    #
+    # @param literal [Literal]
+    # @return [Literal]
+    def opts(literal)
+      literal.options = options
+      literal
+    end
   end
 end

data/lib/sass/script/operation.rb

@@ -72,9 +72,7 @@ module Sass::Script
       end
 
       begin
-        res = literal1.send(@operator, literal2)
-        res.options = environment.options
-        res
+        opts(literal1.send(@operator, literal2))
       rescue NoMethodError => e
         raise e unless e.name.to_s == @operator.to_s
         raise Sass::SyntaxError.new("Undefined operation: \"#{literal1} #{@operator} #{literal2}\".")

data/lib/sass/script/string_interpolation.rb

@@ -72,7 +72,7 @@ module Sass::Script
       mid = @mid.perform(environment)
       res << (mid.is_a?(Sass::Script::String) ? mid.value : mid.to_s)
       res << @after.perform(environment).value
-      Sass::Script::String.new(res, before.type)
+      opts(Sass::Script::String.new(res, before.type))
     end
 
     private

data/test/sass/engine_test.rb

@@ -2111,6 +2111,28 @@ foo
 SASS
   end
 
+  def test_interpolation_with_comma
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  a: foo, bar; }
+CSS
+$foo: foo
+foo
+  a: \#{$foo}, bar
+SASS
+  end
+
+  def test_string_interpolation_with_comma
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  a: "bip foo bap", bar; }
+CSS
+$foo: foo
+foo
+  a: "bip \#{$foo} bap", bar
+SASS
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.9
+  version: 3.1.0.alpha.10
 platform: ruby
 authors: 
 - Nathan Weizenbaum