sass 3.1.0.alpha.6 → 3.1.0.alpha.9

data/EDGE_GEM_VERSION

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

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 => [:revision_file, :submodules] do
+task :package => [:permissions, :revision_file, :submodules] do
   load scope('sass.gemspec')
   Gem::Builder.new(SASS_GEMSPEC).build
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"
@@ -36,6 +36,16 @@ task :package => [:revision_file, :submodules] do
   sh %{gzip pkg/#{pkg}.tar}
 end
 
+task :permissions do
+  sh %{chmod -R a+rx bin}
+  sh %{chmod -R a+r .}
+  require 'shellwords'
+  Dir.glob('test/**/*_test.rb') do |file|
+    next if file =~ %r{^test/haml/spec/}
+    sh %{chmod a+rx #{file}}
+  end
+end
+
 task :revision_file do
   require 'lib/sass'
 

data/VERSION

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

data/lib/sass/script/funcall.rb

@@ -63,10 +63,11 @@ 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 !~ /^__/
-          return Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})")
+          result = Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})")
+        else
+          result = Functions::EvaluationContext.new(environment.options).send(ruby_name, *args)
         end
 
-        result = Functions::EvaluationContext.new(environment.options).send(ruby_name, *args)
         result.options = environment.options
         return result
       rescue ArgumentError => e

data/test/sass/engine_test.rb

@@ -2101,6 +2101,16 @@ CSS
 SASS
   end
 
+  def test_function_output_with_comma
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  a: b(c), d(e); }
+CSS
+foo
+  a: b(c), d(e)
+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.6
+  version: 3.1.0.alpha.9
 platform: ruby
 authors: 
 - Nathan Weizenbaum