sass 3.3.0.alpha.372 → 3.3.0.alpha.375

data/REVISION

@@ -1 +1 @@
-91702cc715e601a0bf682c87983f0b8d9ceb0963
+5339def89cc7f0dbcc9f888a42fb8c571e2c326b

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.372
+3.3.0.alpha.375

data/VERSION_DATE

@@ -1 +1 @@
-10 October 2013 16:29:15 GMT
+10 October 2013 17:02:25 GMT

data/lib/sass/script/functions.rb

@@ -298,10 +298,12 @@ module Sass::Script
 
     # A class representing a Sass function signature.
     #
-    # @attr args [Array<Symbol>] The names of the arguments to the function.
+    # @attr args [Array<String>] The names of the arguments to the function.
+    # @attr delayed_args [Array<String>] The names of the arguments whose evaluation should be
+    #   delayed.
     # @attr var_args [Boolean] Whether the function takes a variable number of arguments.
     # @attr var_kwargs [Boolean] Whether the function takes an arbitrary set of keyword arguments.
-    Signature = Struct.new(:args, :var_args, :var_kwargs)
+    Signature = Struct.new(:args, :delayed_args, :var_args, :var_kwargs)
 
     # Declare a Sass signature for a Ruby-defined function.
     # This includes the names of the arguments,
@@ -338,9 +340,23 @@ module Sass::Script
     #   In addition, if this is true and `:var_args` is not,
     #   Sass will ensure that the last argument passed is a hash.
     def self.declare(method_name, args, options = {})
+      delayed_args = []
+      args = args.map do |a|
+        a = a.to_s
+        if a[0] == ?&
+          a = a[1..-1]
+          delayed_args << a
+        end
+        a
+      end
+      # We don't expose this functionality except to certain builtin methods.
+      if delayed_args.any? && method_name != :if
+        raise ArgumentError.new("Delayed arguments are not allowed for method #{method_name}")
+      end
       @signatures[method_name] ||= []
       @signatures[method_name] << Signature.new(
-        args.map {|s| s.to_s},
+        args,
+        delayed_args,
         options[:var_args],
         options[:var_kwargs])
     end
@@ -478,6 +494,24 @@ module Sass::Script
           raise ArgumentError.new("Expected #{number} to be an integer")
         end
       end
+
+      # Performs a node that has been delayed for execution.
+      #
+      # @private
+      # @param node [Sass::Script::Tree::Node,
+      #   Sass::Script::Value::Base] When this is a tree node, it's
+      #   performed in the caller's environment. When it's a value
+      #   (which can happen when the value had to be performed already
+      #   -- like for a splat), it's returned as-is.
+      # @param env [Sass::Environment] The environment within which to perform the node.
+      #   Defaults to the (read-only) environment of the caller.
+      def perform(node, env = environment.caller)
+        if node.is_a?(Sass::Script::Value::Base)
+          node
+        else
+          node.perform(env)
+        end
+      end
     end
 
     class << self
@@ -1963,17 +1997,17 @@ module Sass::Script
     # @overload if($condition, $if-true, $if-false)
     # @param $condition [Sass::Script::Value::Base] Whether the `$if-true` or
     #   `$if-false` will be returned
-    # @param $if-true [Sass::Script::Value::Base]
-    # @param $if-false [Sass::Script::Value::Base]
+    # @param $if-true [Sass::Script::Tree::Node]
+    # @param $if-false [Sass::Script::Tree::Node]
     # @return [Sass::Script::Value::Base] `$if-true` or `$if-false`
     def if(condition, if_true, if_false)
       if condition.to_bool
-        if_true
+        perform(if_true)
       else
-        if_false
+        perform(if_false)
       end
     end
-    declare :if, [:condition, :if_true, :if_false]
+    declare :if, [:condition, :"&if_true", :"&if_false"]
 
     # Returns a unique CSS identifier. The identifier is returned as an unquoted
     # string. The identifier returned is only guaranteed to be unique within the

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

@@ -119,9 +119,12 @@ module Sass::Script::Tree
     # @return [Sass::Script::Value] The SassScript object that is the value of the function call
     # @raise [Sass::SyntaxError] if the function call raises an ArgumentError
     def _perform(environment)
-      args = @args.map {|a| a.perform(environment)}
+      args = Sass::Util.enum_with_index(@args).
+        map {|a, i| perform_arg(a, environment, signature && signature.args[i])}
       splat = Sass::Tree::Visitors::Perform.perform_splat(@splat, @kwarg_splat, environment)
-      keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
+      keywords = Sass::Util.map_hash(@keywords) do |k, v|
+        [k, perform_arg(v, environment, k.tr('-', '_'))]
+      end
       if (fn = environment.function(@name))
         return perform_sass_fn(fn, args, keywords, splat, environment)
       end
@@ -203,6 +206,15 @@ module Sass::Script::Tree
 
     private
 
+    def perform_arg(argument, environment, name)
+      return argument if signature && signature.delayed_args.include?(name)
+      argument.perform(environment)
+    end
+
+    def signature
+      @signature ||= Sass::Script::Functions.signature(name.to_sym, @args.size, @keywords.size)
+    end
+
     def construct_ruby_args(name, args, keywords, splat, environment)
       args += splat.to_a if splat
 

data/test/sass/functions_test.rb

@@ -1202,6 +1202,28 @@ MSG
     assert_equal("1px", evaluate("if(true, 1px, 2px)"))
     assert_equal("2px", evaluate("if(false, 1px, 2px)"))
     assert_equal("2px", evaluate("if(null, 1px, 2px)"))
+    assert_equal("1px", evaluate("if(true, 1px, $broken)"))
+    assert_equal("1px", evaluate("if(false, $broken, 1px)"))
+    assert_equal("1px", evaluate("if(false, $if-true: $broken, $if-false: 1px)"))
+    assert_equal("1px", evaluate("if(true, $if-true: 1px, $if-false: $broken)"))
+    assert_equal(<<CSS, render(<<SCSS))
+.if {
+  result: yay; }
+CSS
+.if {
+  $something: yay;
+  result: if(true, $if-true: $something, $if-false: $broken);
+}
+SCSS
+    assert_equal(<<CSS, render(<<SCSS))
+.if {
+  result: 1px; }
+CSS
+.if {
+  $splat: 1px, 2px;
+  result: if(true, $splat...);
+}
+SCSS
   end
 
   def test_counter
@@ -1582,5 +1604,4 @@ SCSS
   rescue Sass::SyntaxError => e
     assert_equal(message, e.message)
   end
-
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302565
+  hash: 592302563
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 372
-  version: 3.3.0.alpha.372
+  - 375
+  version: 3.3.0.alpha.375
 platform: ruby
 authors: 
 - Nathan Weizenbaum