haml 3.1.0.alpha.19 → 3.1.0.alpha.22

data/vendor/sass/lib/sass/tree/prop_node.rb

@@ -88,8 +88,12 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
     def _to_s(tabs)
-      to_return = '  ' * (tabs - 1 + self.tabs) + resolved_name + ":" +
-        (style == :compressed ? '' : ' ') + resolved_value + (style == :compressed ? "" : ";")
+      tab_str = '  ' * (tabs - 1 + self.tabs)
+      if style == :compressed
+        "#{tab_str}#{resolved_name}:#{resolved_value}"
+      else
+        "#{tab_str}#{resolved_name}: #{resolved_value};"
+      end
     end
 
     # Converts nested properties into flat properties.
@@ -154,10 +158,9 @@ module Sass::Tree
     private
 
     def check!
-      if @options[:property_syntax] == :old && @prop_syntax == :new
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.")
-      elsif @options[:property_syntax] == :new && @prop_syntax == :old
-        raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.")
+      if @options[:property_syntax] && @options[:property_syntax] != @prop_syntax
+        raise Sass::SyntaxError.new(
+          "Illegal property syntax: can't use #{@prop_syntax} syntax when :property_syntax => #{@options[:property_syntax].inspect} is set.")
       elsif resolved_value.empty?
         raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value)." +
           pseudo_class_selector_message)

data/vendor/sass/lib/sass/tree/rule_node.rb

@@ -121,17 +121,18 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
     def _to_s(tabs)
+      output_style = style
       tabs = tabs + self.tabs
 
-      rule_separator = style == :compressed ? ',' : ', '
+      rule_separator = output_style == :compressed ? ',' : ', '
       line_separator =
-        case style
+        case output_style
           when :nested, :expanded; "\n"
           when :compressed; ""
           else; " "
         end
       rule_indent = '  ' * (tabs - 1)
-      per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
+      per_rule_indent, total_indent = [:nested, :expanded].include?(output_style) ? [rule_indent, ''] : ['', rule_indent]
 
       total_rule = total_indent + resolved_rules.members.
         map {|seq| seq.to_a.join.gsub(/([^,])\n/m, style == :compressed ? '\1 ' : "\\1\n")}.
@@ -142,7 +143,7 @@ module Sass::Tree
       to_return = ''
       old_spaces = '  ' * (tabs - 1)
       spaces = '  ' * tabs
-      if style != :compressed
+      if output_style != :compressed
         if @options[:debug_info]
           to_return << debug_info_rule.to_s(tabs) << "\n"
         elsif @options[:line_comments]
@@ -165,15 +166,15 @@ module Sass::Tree
         end
       end
 
-      if style == :compact
+      if output_style == :compact
         properties = children.map { |a| a.to_s(1) }.join(' ')
         to_return << "#{total_rule} { #{properties} }#{"\n" if group_end}"
-      elsif style == :compressed
+      elsif output_style == :compressed
         properties = children.map { |a| a.to_s(1) }.join(';')
         to_return << "#{total_rule}{#{properties}}"
       else
         properties = children.map { |a| a.to_s(tabs + 1) }.join("\n")
-        end_props = (style == :expanded ? "\n" + old_spaces : ' ')
+        end_props = (output_style == :expanded ? "\n" + old_spaces : ' ')
         to_return << "#{total_rule} {\n#{properties}#{end_props}}#{"\n" if group_end}"
       end
 
@@ -199,7 +200,7 @@ module Sass::Tree
     #   or nil if the parent isn't a {RuleNode}
     def _cssize(extends, parent)
       node = super
-      rules = node.children.select {|c| c.is_a?(RuleNode)}
+      rules = node.children.grep(RuleNode)
       props = node.children.reject {|c| c.is_a?(RuleNode) || c.invisible?}
 
       unless props.empty?

data/vendor/sass/lib/sass/util.rb

@@ -121,10 +121,12 @@ module Sass
     # @example
     #   merge_adjacent_strings([1, "foo", "bar", 2, "baz"])
     #     #=> [1, "foobar", 2, "baz"]
-    # @param enum [Enumerable]
+    # @param arr [Array]
     # @return [Array] The enumerable with strings merged
-    def merge_adjacent_strings(enum)
-      enum.inject([]) do |a, e|
+    def merge_adjacent_strings(arr)
+      # Optimize for the common case of one element
+      return arr if arr.size < 2
+      arr.inject([]) do |a, e|
         if e.is_a?(String)
           if a.last.is_a?(String)
             a.last << e

data/vendor/sass/test/sass/conversion_test.rb

@@ -859,6 +859,20 @@ foo {
 SCSS
   end
 
+  def test_mixin_include_with_keyword_args
+    assert_renders <<SASS, <<SCSS
+foo
+  +foo-bar(12px, "blaz", $blip: blap, $bloop: blop)
+  +foo-bar($blip: blap, $bloop: blop)
+  a: blip
+SASS
+foo {
+  @include foo-bar(12px, "blaz", $blip: blap, $bloop: blop);
+  @include foo-bar($blip: blap, $bloop: blop);
+  a: blip; }
+SCSS
+  end
+
   def test_variable_definition
     assert_renders <<SASS, <<SCSS
 $var1: 12px + 15px

data/vendor/sass/test/sass/engine_test.rb

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'
+require 'pathname'
 
 module Sass::Script::Functions::UserFunctions
   def option(name)
@@ -94,6 +95,7 @@ MSG
     "a-\#{$b\n  c: d" => ['Invalid CSS after "a-#{$b": expected "}", was ""', 1],
     "=a($b = 1, $c)" => "Required argument $c must come before any optional arguments.",
     "=a($b = 1)\n  a: $b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
+    "=a($b: 1)\n  a: $b\ndiv\n  +a(1,$c: 3)" => "Mixin a doesn't have an argument named $c",
     "=a($b)\n  a: $b\ndiv\n  +a" => "Mixin a is missing parameter $b.",
     "@else\n  a\n    b: c" => ["@else must come after @if.", 1],
     "@if false\n@else foo" => "Invalid else directive '@else foo': expected 'if <expr>'.",
@@ -115,6 +117,16 @@ MSG
     '@warn' => "Invalid warn directive '@warn': expected expression.",
     %Q{@warn "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath warn directives.",
     "/* foo\n    bar\n  baz" => "Inconsistent indentation: previous line was indented by 4 spaces, but this line was indented by 2 spaces.",
+    '+foo(1 + 1: 2)' => 'Invalid CSS after "(1 + 1": expected comma, was ": 2)"',
+    '+foo($var: )' => 'Invalid CSS after "($var: ": expected mixin argument, was ")"',
+    '+foo($var: a, $var: b)' => 'Keyword argument "$var" passed more than once',
+    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var-var" passed more than once',
+    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var_var" passed more than once',
+    "a\n  b: foo(1 + 1: 2)" => 'Invalid CSS after "foo(1 + 1": expected comma, was ": 2)"',
+    "a\n  b: foo($var: )" => 'Invalid CSS after "foo($var: ": expected function argument, was ")"',
+    "a\n  b: foo($var: a, $var: b)" => 'Keyword argument "$var" passed more than once',
+    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var-var" passed more than once',
+    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var_var" passed more than once',
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
@@ -534,6 +546,15 @@ CSS
     assert File.exists?(sassc_file)
   end
 
+  def test_sass_pathname_import
+    sassc_file = sassc_path("importee")
+    assert !File.exists?(sassc_file)
+    renders_correctly("import",
+      :style => :compact,
+      :load_paths => [Pathname.new(File.dirname(__FILE__) + "/templates")])
+    assert File.exists?(sassc_file)
+  end
+
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
@@ -2101,6 +2122,70 @@ CSS
 SASS
   end
 
+  def test_mixin_with_keyword_args
+    assert_equal <<CSS, render(<<SASS)
+.mixed {
+  required: foo;
+  arg1: default-val1;
+  arg2: non-default-val2; }
+CSS
+=a-mixin($required, $arg1: default-val1, $arg2: default-val2)
+  required: $required
+  arg1: $arg1
+  arg2: $arg2
+.mixed
+  +a-mixin(foo, $arg2: non-default-val2)
+SASS
+  end
+
+  def test_mixin_keyword_args_handle_variable_underscore_dash_equivalence
+    assert_equal <<CSS, render(<<SASS)
+.mixed {
+  required: foo;
+  arg1: non-default-val1;
+  arg2: non-default-val2; }
+CSS
+=a-mixin($required, $arg-1: default-val1, $arg_2: default-val2)
+  required: $required
+  arg1: $arg_1
+  arg2: $arg-2
+.mixed
+  +a-mixin(foo, $arg-2: non-default-val2, $arg_1: non-default-val1)
+SASS
+  end
+
+  def test_passing_required_args_as_a_keyword_arg
+    assert_equal <<CSS, render(<<SASS)
+.mixed {
+  required: foo;
+  arg1: default-val1;
+  arg2: default-val2; }
+CSS
+=a-mixin($required, $arg1: default-val1, $arg2: default-val2)
+  required: $required
+  arg1: $arg1
+  arg2: $arg2
+.mixed
+  +a-mixin($required: foo)
+SASS
+  end
+
+  def test_passing_all_as_keyword_args_in_opposite_order
+    assert_equal <<CSS, render(<<SASS)
+.mixed {
+  required: foo;
+  arg1: non-default-val1;
+  arg2: non-default-val2; }
+CSS
+=a-mixin($required, $arg1: default-val1, $arg2: default-val2)
+  required: $required
+  arg1: $arg1
+  arg2: $arg2
+.mixed
+  +a-mixin($arg2: non-default-val2, $arg1: non-default-val1, $required: foo)
+SASS
+  end
+
   def test_function_output_with_comma
     assert_equal <<CSS, render(<<SASS)
 foo {

data/vendor/sass/test/sass/functions_test.rb

@@ -3,6 +3,22 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/script'
 
+module Sass::Script::Functions
+  def no_kw_args
+    Sass::Script::String.new("no-kw-args")
+  end
+
+  def only_var_args(*args)
+    Sass::Script::String.new("only-var-args("+args.map{|a| a.plus(Sass::Script::Number.new(1)).to_s }.join(", ")+")")
+  end
+  declare :only_var_args, [], :var_args => true
+
+  def only_kw_args(kwargs)
+    Sass::Script::String.new("only-kw-args(" + kwargs.keys.sort.join(", ") + ")")
+  end
+  declare :only_kw_args, [], :var_kwargs => true
+end
+
 module Sass::Script::Functions::UserFunctions
   def call_options_on_new_literal
     str = Sass::Script::String.new("foo")
@@ -50,6 +66,10 @@ class SassFunctionTest < Test::Unit::TestCase
     end
   end
 
+  def test_hsl_kwargs
+    assert_equal "#33cccc", evaluate("hsl($hue: 180, $saturation: 60%, $lightness: 50%)")
+  end
+
   def test_hsl_checks_bounds
     assert_error_message("Saturation -114 must be between 0% and 100% for `hsl'", "hsl(10, -114, 12)");
     assert_error_message("Lightness 256 must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
@@ -65,6 +85,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal "rgba(51, 204, 204, 0.4)", evaluate("hsla(180, 60%, 50%, 0.4)")
     assert_equal "#33cccc", evaluate("hsla(180, 60%, 50%, 1)")
     assert_equal "rgba(51, 204, 204, 0)", evaluate("hsla(180, 60%, 50%, 0)")
+    assert_equal "rgba(51, 204, 204, 0.4)", evaluate("hsla($hue: 180, $saturation: 60%, $lightness: 50%, $alpha: 0.4)")
   end
 
   def test_hsla_checks_bounds
@@ -85,6 +106,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("50%",  evaluate("percentage(.5)"))
     assert_equal("100%", evaluate("percentage(1)"))
     assert_equal("25%",  evaluate("percentage(25px / 100px)"))
+    assert_equal("50%",  evaluate("percentage($value: 0.5)"))
   end
 
   def test_percentage_checks_types
@@ -97,6 +119,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5",   evaluate("round(4.8)"))
     assert_equal("5px", evaluate("round(4.8px)"))
     assert_equal("5px", evaluate("round(5.49px)"))
+    assert_equal("5px", evaluate("round($value: 5.49px)"))
 
     assert_error_message("#cccccc is not a number for `round'", "round(#ccc)")
   end
@@ -104,6 +127,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_floor
     assert_equal("4",   evaluate("floor(4.8)"))
     assert_equal("4px", evaluate("floor(4.8px)"))
+    assert_equal("4px", evaluate("floor($value: 4.8px)"))
 
     assert_error_message("\"foo\" is not a number for `floor'", "floor(\"foo\")")
   end
@@ -111,6 +135,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_ceil
     assert_equal("5",   evaluate("ceil(4.1)"))
     assert_equal("5px", evaluate("ceil(4.8px)"))
+    assert_equal("5px", evaluate("ceil($value: 4.8px)"))
 
     assert_error_message("\"a\" is not a number for `ceil'", "ceil(\"a\")")
   end
@@ -120,6 +145,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("abs(-5px)"))
     assert_equal("5",   evaluate("abs(5)"))
     assert_equal("5px", evaluate("abs(5px)"))
+    assert_equal("5px", evaluate("abs($value: 5px)"))
 
     assert_error_message("#aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
@@ -128,6 +154,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#123456", evaluate("rgb(18, 52, 86)"))
     assert_equal("#beaded", evaluate("rgb(190, 173, 237)"))
     assert_equal("#00ff7f", evaluate("rgb(0, 255, 127)"))
+    assert_equal("#00ff7f", evaluate("rgb($red: 0, $green: 255, $blue: 127)"))
   end
 
   def test_rgb_percent
@@ -169,6 +196,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("rgba(18, 52, 86, 0.5)", evaluate("rgba(18, 52, 86, 0.5)"))
     assert_equal("#beaded", evaluate("rgba(190, 173, 237, 1)"))
     assert_equal("rgba(0, 255, 127, 0)", evaluate("rgba(0, 255, 127, 0)"))
+    assert_equal("rgba(0, 255, 127, 0)", evaluate("rgba($red: 0, $green: 255, $blue: 127, $alpha: 0)"))
   end
 
   def test_rgb_tests_bounds
@@ -198,6 +226,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_rgba_with_color
     assert_equal "rgba(16, 32, 48, 0.5)", evaluate("rgba(#102030, 0.5)")
     assert_equal "rgba(0, 0, 255, 0.5)", evaluate("rgba(blue, 0.5)")
+    assert_equal "rgba(0, 0, 255, 0.5)", evaluate("rgba($color: blue, $alpha: 0.5)")
   end
 
   def test_rgba_with_color_tests_types
@@ -214,6 +243,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_red
     assert_equal("18", evaluate("red(#123456)"))
+    assert_equal("18", evaluate("red($color: #123456)"))
   end
 
   def test_red_exception
@@ -222,6 +252,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_green
     assert_equal("52", evaluate("green(#123456)"))
+    assert_equal("52", evaluate("green($color: #123456)"))
   end
 
   def test_green_exception
@@ -230,6 +261,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_blue
     assert_equal("86", evaluate("blue(#123456)"))
+    assert_equal("86", evaluate("blue($color: #123456)"))
   end
 
   def test_blue_exception
@@ -238,6 +270,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_hue
     assert_equal("18deg", evaluate("hue(hsl(18, 50%, 20%))"))
+    assert_equal("18deg", evaluate("hue($color: hsl(18, 50%, 20%))"))
   end
 
   def test_hue_exception
@@ -247,6 +280,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_saturation
     assert_equal("52%", evaluate("saturation(hsl(20, 52%, 20%))"))
     assert_equal("52%", evaluate("saturation(hsl(20, 52, 20%))"))
+    assert_equal("52%", evaluate("saturation($color: hsl(20, 52, 20%))"))
   end
 
   def test_saturation_exception
@@ -256,6 +290,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_lightness
     assert_equal("86%", evaluate("lightness(hsl(120, 50%, 86%))"))
     assert_equal("86%", evaluate("lightness(hsl(120, 50%, 86))"))
+    assert_equal("86%", evaluate("lightness($color: hsl(120, 50%, 86))"))
   end
 
   def test_lightness_exception
@@ -266,6 +301,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("1", evaluate("alpha(#123456)"))
     assert_equal("0.34", evaluate("alpha(rgba(0, 1, 2, 0.34))"))
     assert_equal("0", evaluate("alpha(hsla(0, 1, 2, 0))"))
+    assert_equal("0", evaluate("alpha($color: hsla(0, 1, 2, 0))"))
   end
 
   def test_alpha_exception
@@ -279,6 +315,8 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("black", evaluate("fade_in(rgba(0, 0, 0, 0.2), 0.8)"))
     assert_equal("black", evaluate("opacify(rgba(0, 0, 0, 0.2), 1)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("opacify(rgba(0, 0, 0, 0.2), 0%)"))
+    assert_equal("rgba(0, 0, 0, 0.2)", evaluate("opacify($color: rgba(0, 0, 0, 0.2), $amount: 0%)"))
+    assert_equal("rgba(0, 0, 0, 0.2)", evaluate("fade-in($color: rgba(0, 0, 0, 0.2), $amount: 0%)"))
   end
 
   def test_opacify_tests_bounds
@@ -300,6 +338,8 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("rgba(0, 0, 0, 0)", evaluate("fade_out(rgba(0, 0, 0, 0.2), 0.2)"))
     assert_equal("rgba(0, 0, 0, 0)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 1)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 0)"))
+    assert_equal("rgba(0, 0, 0, 0.2)", evaluate("transparentize($color: rgba(0, 0, 0, 0.2), $amount: 0)"))
+    assert_equal("rgba(0, 0, 0, 0.2)", evaluate("fade-out($color: rgba(0, 0, 0, 0.2), $amount: 0)"))
   end
 
   def test_transparentize_tests_bounds
@@ -321,6 +361,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("white", evaluate("lighten(#800, 100%)"))
     assert_equal("#880000", evaluate("lighten(#800, 0%)"))
     assert_equal("rgba(238, 0, 0, 0.5)", evaluate("lighten(rgba(136, 0, 0, 0.5), 20%)"))
+    assert_equal("rgba(238, 0, 0, 0.5)", evaluate("lighten($color: rgba(136, 0, 0, 0.5), $amount: 20%)"))
   end
 
   def test_lighten_tests_bounds
@@ -342,6 +383,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("black", evaluate("darken(#800, 100%)"))
     assert_equal("#880000", evaluate("darken(#800, 0%)"))
     assert_equal("rgba(34, 0, 0, 0.5)", evaluate("darken(rgba(136, 0, 0, 0.5), 20%)"))
+    assert_equal("rgba(34, 0, 0, 0.5)", evaluate("darken($color: rgba(136, 0, 0, 0.5), $amount: 20%)"))
   end
 
   def test_darken_tests_bounds
@@ -364,6 +406,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#33ff33", evaluate("saturate(#8a8, 100%)"))
     assert_equal("#88aa88", evaluate("saturate(#8a8, 0%)"))
     assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate(rgba(136, 85, 85, 0.5), 20%)"))
+    assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate($color: rgba(136, 85, 85, 0.5), $amount: 20%)"))
   end
 
   def test_saturate_tests_bounds
@@ -386,6 +429,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#999999", evaluate("desaturate(#8a8, 100%)"))
     assert_equal("#88aa88", evaluate("desaturate(#8a8, 0%)"))
     assert_equal("rgba(114, 107, 107, 0.5)", evaluate("desaturate(rgba(136, 85, 85, 0.5), 20%)"))
+    assert_equal("rgba(114, 107, 107, 0.5)", evaluate("desaturate($color: rgba(136, 85, 85, 0.5), $amount: 20%)"))
   end
 
   def test_desaturate_tests_bounds
@@ -409,6 +453,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#88aa88", evaluate("adjust-hue(#8a8, 360deg)"))
     assert_equal("#88aa88", evaluate("adjust-hue(#8a8, 0deg)"))
     assert_equal("rgba(136, 106, 17, 0.5)", evaluate("adjust-hue(rgba(136, 17, 17, 0.5), 45deg)"))
+    assert_equal("rgba(136, 106, 17, 0.5)", evaluate("adjust-hue($color: rgba(136, 17, 17, 0.5), $degrees: 45deg)"))
   end
 
   def test_adjust_hue_tests_types
@@ -430,6 +475,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("blue", evaluate("mix(transparentize(#f00, 1), #00f, 0%)"))
     assert_equal("rgba(0, 0, 255, 0)", evaluate("mix(#f00, transparentize(#00f, 1), 0%)"))
     assert_equal("rgba(255, 0, 0, 0)", evaluate("mix(transparentize(#f00, 1), #00f, 100%)"))
+    assert_equal("rgba(255, 0, 0, 0)", evaluate("mix($color-1: transparentize(#f00, 1), $color-2: #00f, $weight: 100%)"))
   end
 
   def test_mix_tests_types
@@ -451,6 +497,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("gray", evaluate("grayscale(#00f)"))
     assert_equal("white", evaluate("grayscale(white)"))
     assert_equal("black", evaluate("grayscale(black)"))
+    assert_equal("black", evaluate("grayscale($color: black)"))
   end
 
   def tets_grayscale_tests_types
@@ -463,6 +510,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("red", evaluate("complement(aqua)"))
     assert_equal("white", evaluate("complement(white)"))
     assert_equal("black", evaluate("complement(black)"))
+    assert_equal("black", evaluate("complement($color: black)"))
   end
 
   def tets_complement_tests_types
@@ -481,6 +529,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_unquote
     assert_equal('foo', evaluate('unquote("foo")'))
     assert_equal('foo', evaluate('unquote(foo)'))
+    assert_equal('foo', evaluate('unquote($string: foo)'))
   end
 
   def test_unquote_tests_type
@@ -490,6 +539,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_quote
     assert_equal('"foo"', evaluate('quote(foo)'))
     assert_equal('"foo"', evaluate('quote("foo")'))
+    assert_equal('"foo"', evaluate('quote($string: "foo")'))
   end
 
   def test_quote_tests_type
@@ -520,6 +570,7 @@ MSG
     assert_equal("number", evaluate("type-of(1px)"))
     assert_equal("bool", evaluate("type-of(true)"))
     assert_equal("color", evaluate("type-of(#fff)"))
+    assert_equal("color", evaluate("type-of($value: #fff)"))
   end
 
   def test_unit
@@ -528,12 +579,14 @@ MSG
     assert_equal(%Q{"em*px"}, evaluate("unit(10px * 5em)"))
     assert_equal(%Q{"em*px"}, evaluate("unit(5em * 10px)"))
     assert_equal(%Q{"em*px/cm*rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
+    assert_equal(%Q{"px"}, evaluate("unit($number: 100px)"))
     assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
   end
 
   def test_unitless
     assert_equal(%Q{true}, evaluate("unitless(100)"))
     assert_equal(%Q{false}, evaluate("unitless(100px)"))
+    assert_equal(%Q{false}, evaluate("unitless($number: 100px)"))
     assert_error_message("#ff0000 is not a number for `unitless'", "unitless(#f00)")
   end
 
@@ -541,10 +594,46 @@ MSG
     assert_equal(%Q{true}, evaluate("comparable(2px, 1px)"))
     assert_equal(%Q{true}, evaluate("comparable(10cm, 3mm)"))
     assert_equal(%Q{false}, evaluate("comparable(100px, 3em)"))
+    assert_equal(%Q{false}, evaluate("comparable($number-1: 100px, $number-2: 3em)"))
     assert_error_message("#ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
     assert_error_message("#ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
   end
 
+  def test_keyword_args_rgb
+    assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
+  end
+
+  def test_keyword_args_rgba
+    assert_equal(%Q{rgba(255, 255, 255, 0.5)}, evaluate("rgba($red: 255, $green: 255, $blue: 255, $alpha: 0.5)"))
+    assert_equal(%Q{rgba(255, 255, 255, 0.5)}, evaluate("rgba($color: #fff, $alpha: 0.5)"))
+  end
+
+  def test_keyword_args_rgba_with_extra_args
+    assert_equal(%Q{rgba(255, 255, 255, 0.5)}, evaluate("rgba($red: 255, $green: 255, $blue: 255, $alpha: 0.5, $extra: error)"))
+  rescue Sass::SyntaxError => e
+    assert_equal("Function rgba doesn't take an argument named $extra", e.message)
+  end
+
+  def test_keyword_args_must_have_signature
+    evaluate("no-kw-args($fake: value)")
+  rescue Sass::SyntaxError => e
+    assert_equal("Function no_kw_args doesn't support keyword arguments", e.message)
+  end
+
+  def test_keyword_args_with_missing_argument
+    evaluate("rgb($red: 255, $green: 255)")
+  rescue Sass::SyntaxError => e
+    assert_equal("Function rgb requires an argument named $blue", e.message)
+  end
+
+  def test_only_var_args
+    assert_equal "only-var-args(2px, 3px, 4px)", evaluate("only-var-args(1px, 2px, 3px)")
+  end
+
+  def test_only_kw_args
+    assert_equal "only-kw-args(a, b, c)", evaluate("only-kw-args($a: 1, $b: 2, $c: 3)")
+  end
+
   private
 
   def evaluate(value)