sass 3.3.0.alpha.198 → 3.3.0.alpha.201

data/REVISION

@@ -1 +1 @@
-be5f2f981c18818dbb8dd8b08f13262bbf112ef1
+3a64325d2550f0bc57f6490854c0a7d0bc5c9db5

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.198
+3.3.0.alpha.201

data/VERSION_DATE

@@ -1 +1 @@
-03 July 2013 00:40:44 GMT
+17 July 2013 20:29:34 GMT

data/lib/sass/script/functions.rb

@@ -192,6 +192,9 @@ module Sass::Script
   # \{#comparable comparable($number-1, $number-2)}
   # : Returns whether two numbers can be added, subtracted, or compared.
   #
+  # \{#call call($name, $args...)}
+  # : Dynamically calls a Sass function.
+  #
   # ## Miscellaneous Functions
   #
   # \{#if if($condition, $if-true, $if-false)}
@@ -408,8 +411,9 @@ module Sass::Script
       # Asserts that the value is an integer.
       #
       # @example
-      #   assert_unit number, "px"
-      #   assert_unit number, nil
+      #   assert_integer 2px
+      #   assert_integer 2.5px => SyntaxError: "Expected 2.5px to be an integer"
+      #   assert_integer 2.5px, "width" => SyntaxError: "Expected width to be an integer but got 2.5px"
       # @param number [Sass::Script::Value::Base] The value to be validated.
       # @param name [::String] The name of the parameter being validated.
       # @raise [ArgumentError] if number is not an integer or is not a number.
@@ -1781,6 +1785,33 @@ module Sass::Script
     end
     declare :unique_id, []
 
+    # Dynamically calls a function. This can call user-defined
+    # functions, built-in functions, or plain CSS functions. It will
+    # pass along all arguments, including keyword arguments, to the
+    # called function.
+    #
+    # @example
+    #   call(rgb, 10, 100, 255) => #0a64ff
+    #   call(scale-color, #0a64ff, $lightness: -10%) => #0058ef
+    #
+    #   $fn: nth;
+    #   call($fn, 2, (a b c)) => b
+    #
+    # @overload call($name, $args...)
+    # @param $name [String] The name of the function to call.
+    def call(name, *args)
+      assert_type name, :String, :name
+      kwargs = args.last.is_a?(Hash) ? args.pop : {}
+      funcall = Sass::Script::Tree::Funcall.new(
+        name.value,
+        args.map {|a| Sass::Script::Tree::Literal.new(a)},
+        Sass::Util.map_vals(kwargs) {|v| Sass::Script::Tree::Literal.new(v)},
+        nil)
+      funcall.options = options
+      funcall.perform(environment)
+    end
+    declare :call, [:name], :var_args => true, :var_kwargs => true
+
     # This function only exists as a workaround for IE7's [`content:counter`
     # bug](http://jes.st/2013/ie7s-css-breaking-content-counter-bug/).
     # It works identically to any other plain-CSS function, except it

data/lib/sass/script/tree/funcall.rb

@@ -205,7 +205,7 @@ module Sass::Script::Tree
         return args 
       end
 
-      args = args + signature.args[args.size..-1].map do |argname|
+      args = args + (signature.args[args.size..-1] || []).map do |argname|
         if keywords.has_key?(argname)
           keywords.delete(argname)
         else

data/test/sass/functions_test.rb

@@ -1258,6 +1258,41 @@ MSG
     end
   end
 
+  def test_call_with_positional_arguments
+    assert_equal evaluate("lighten(blue, 5%)"), evaluate("call(lighten, blue, 5%)")
+  end
+
+  def test_call_with_keyword_arguments
+    assert_equal(
+      evaluate("lighten($color: blue, $amount: 5%)"),
+      evaluate("call(lighten, $color: blue, $amount: 5%)"))
+  end
+
+  def test_call_with_keyword_and_positional_arguments
+    assert_equal(
+      evaluate("lighten(blue, $amount: 5%)"),
+      evaluate("call(lighten, blue, $amount: 5%)"))
+  end
+
+  def test_call_with_dynamic_name
+    assert_equal(
+      evaluate("lighten($color: blue, $amount: 5%)"),
+      evaluate("call($fn, $color: blue, $amount: 5%)",
+        env("fn" => Sass::Script::String.new("lighten"))))
+  end
+
+  def test_call_unknown_function
+    assert_equal evaluate("unknown(red, blue)"), evaluate("call(unknown, red, blue)")
+  end
+
+  def test_call_with_non_string_argument
+    assert_error_message "$name: 3px is not a string for `call'", "call(3px)"
+  end
+
+  def test_errors_in_called_function
+    assert_error_message "3px is not a color for `lighten'", "call(lighten, 3px, 5%)"
+  end
+
   ## Regression Tests
 
   def test_saturation_bounds

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302721
+  hash: 592302751
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 198
-  version: 3.3.0.alpha.198
+  - 201
+  version: 3.3.0.alpha.201
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-02 00:00:00 -04:00
+date: 2013-07-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency