sass 3.2.0.alpha.95 → 3.2.0.alpha.96

data/REVISION

@@ -1 +1 @@
-86bea8daaaa4b261d7c850276314d62b798fe053
+71e121eea2e0cd0b5752f4a7ffdce70b16fcbf58

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.95
+3.2.0.alpha.96

data/lib/sass/script/funcall.rb

@@ -145,10 +145,10 @@ module Sass
 
       def perform_sass_fn(function, args, keywords)
         # TODO: merge with mixin arg evaluation?
-        keywords.each do |name, value|
-          # TODO: Make this fast
-          unless function.args.find {|(var, default)| var.underscored_name == name}
-            raise Sass::SyntaxError.new("Function #{@name} doesn't have an argument named $#{name}")
+        if keywords.any?
+          unknown_args = keywords.keys - function.args.map {|var| var.first.underscored_name }
+          if unknown_args.any?
+            raise Sass::SyntaxError.new("Function #{@name} doesn't have #{unknown_args.length > 1 ? 'the following arguments:' : 'an argument named'} #{unknown_args.map{|name| "$#{name}"}.join ', '}")
           end
         end
 

data/test/sass/engine_test.rb

@@ -106,6 +106,8 @@ MSG
     "foo\n  @function bar()\n    @return 1" => ['Functions may only be defined at the root of a document.', 2],
     "@function foo($a)\n  @return 1\na\n  b: foo()" => 'Function foo is missing parameter $a.',
     "@function foo()\n  @return 1\na\n  b: foo(2)" => 'Wrong number of arguments (1 for 0) for `foo\'',
+    "@function foo()\n  @return 1\na\n  b: foo($a: 1)" => "Function foo doesn't have an argument named $a",
+    "@function foo()\n  @return 1\na\n  b: foo($a: 1, $b: 2)" => "Function foo doesn't have the following arguments: $a, $b",
     "@return 1" => '@return may only be used within a function.',
     "@if true\n  @return 1" => '@return may only be used within a function.',
     "@mixin foo\n  @return 1\n@include foo" => ['@return may only be used within a function.', 2],

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303011
+  hash: 592303069
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 95
-  version: 3.2.0.alpha.95
+  - 96
+  version: 3.2.0.alpha.96
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 -04:00
+date: 2012-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency