sass 3.1.0.alpha.206 → 3.1.0.alpha.210

data/REVISION

@@ -1 +1 @@
-57a9ce49cd27fe529b7638f94069840bef411b75
+d759347f1299f579d7b5dc2f0f5f30b895168c38

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.206
+3.1.0.alpha.210

data/lib/sass/script/funcall.rb

@@ -84,7 +84,7 @@ module Sass
         args = construct_ruby_args(ruby_name, args, keywords)
 
         unless Sass::Util.has?(:public_instance_method, Functions, ruby_name) && ruby_name !~ /^__/
-          opts(Script::String.new("#{name}(#{args.join(', ')})"))
+          opts(to_literal(args))
         else
           opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
         end
@@ -93,6 +93,13 @@ module Sass
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
 
+      # This method is factored out from `_perform` so that compass can override
+      # it with a cross-browser implementation for functions that require vendor prefixes
+      # in the generated css.
+      def to_literal(args)
+        Script::String.new("#{name}(#{args.join(', ')})")
+      end
+
       private
 
       def construct_ruby_args(name, args, keywords)

data/test/sass/functions_test.rb

@@ -802,10 +802,6 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal('foo', evaluate('unquote($string: foo)'))
   end
 
-  def test_unquote_tests_type
-    assert_error_message("#ff0000 is not a string for `unquote'", "unquote(#f00)")
-  end
-
   def test_quote
     assert_equal('"foo"', evaluate('quote(foo)'))
     assert_equal('"foo"', evaluate('quote("foo")'))

data/test/sass/script_test.rb

@@ -13,13 +13,13 @@ class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(Sass::SyntaxError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(Sass::SyntaxError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(ArgumentError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes

data/test/sass/scss/scss_test.rb

@@ -878,17 +878,6 @@ SCSS
     assert_equal 2, e.sass_line
   end
 
-  def test_imports_only_at_toplevel
-    render <<SCSS
-foo {
-  @import "foo.scss";}
-SCSS
-    assert(false, "Expected syntax error")
-  rescue Sass::SyntaxError => e
-    assert_equal "Import directives may only be used at the root of a document.", e.message
-    assert_equal 2, e.sass_line
-  end
-
   def test_rules_beneath_properties
     render <<SCSS
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.206
+  version: 3.1.0.alpha.210
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -05:00
+date: 2010-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency