sass 3.3.0.alpha.144 → 3.3.0.alpha.149

data/REVISION

@@ -1 +1 @@
-5a0e84467c4bbc4ac847aa17acaf1fb4dcebcfce
+c2ce041855863e29ff5ca89fe6345fe322a1ea0e

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.144
+3.3.0.alpha.149

data/VERSION_DATE

@@ -1 +1 @@
-24 May 2013 23:25:31 GMT
+25 May 2013 00:06:51 GMT

data/lib/sass/script/color.rb

@@ -18,160 +18,166 @@ module Sass::Script
 
     # A hash from color names to `[red, green, blue]` value arrays.
     COLOR_NAMES = map_vals({
-        'aliceblue' => 0xf0f8ff,
-        'antiquewhite' => 0xfaebd7,
-        'aqua' => 0x00ffff,
-        'aquamarine' => 0x7fffd4,
-        'azure' => 0xf0ffff,
-        'beige' => 0xf5f5dc,
-        'bisque' => 0xffe4c4,
-        'black' => 0x000000,
-        'blanchedalmond' => 0xffebcd,
-        'blue' => 0x0000ff,
-        'blueviolet' => 0x8a2be2,
-        'brown' => 0xa52a2a,
-        'burlywood' => 0xdeb887,
-        'cadetblue' => 0x5f9ea0,
-        'chartreuse' => 0x7fff00,
-        'chocolate' => 0xd2691e,
-        'coral' => 0xff7f50,
-        'cornflowerblue' => 0x6495ed,
-        'cornsilk' => 0xfff8dc,
-        'crimson' => 0xdc143c,
-        'cyan' => 0x00ffff,
-        'darkblue' => 0x00008b,
-        'darkcyan' => 0x008b8b,
-        'darkgoldenrod' => 0xb8860b,
-        'darkgray' => 0xa9a9a9,
-        'darkgrey' => 0xa9a9a9,
-        'darkgreen' => 0x006400,
-        'darkkhaki' => 0xbdb76b,
-        'darkmagenta' => 0x8b008b,
-        'darkolivegreen' => 0x556b2f,
-        'darkorange' => 0xff8c00,
-        'darkorchid' => 0x9932cc,
-        'darkred' => 0x8b0000,
-        'darksalmon' => 0xe9967a,
-        'darkseagreen' => 0x8fbc8f,
-        'darkslateblue' => 0x483d8b,
-        'darkslategray' => 0x2f4f4f,
-        'darkslategrey' => 0x2f4f4f,
-        'darkturquoise' => 0x00ced1,
-        'darkviolet' => 0x9400d3,
-        'deeppink' => 0xff1493,
-        'deepskyblue' => 0x00bfff,
-        'dimgray' => 0x696969,
-        'dimgrey' => 0x696969,
-        'dodgerblue' => 0x1e90ff,
-        'firebrick' => 0xb22222,
-        'floralwhite' => 0xfffaf0,
-        'forestgreen' => 0x228b22,
-        'fuchsia' => 0xff00ff,
-        'gainsboro' => 0xdcdcdc,
-        'ghostwhite' => 0xf8f8ff,
-        'gold' => 0xffd700,
-        'goldenrod' => 0xdaa520,
-        'gray' => 0x808080,
-        'green' => 0x008000,
-        'greenyellow' => 0xadff2f,
-        'honeydew' => 0xf0fff0,
-        'hotpink' => 0xff69b4,
-        'indianred' => 0xcd5c5c,
-        'indigo' => 0x4b0082,
-        'ivory' => 0xfffff0,
-        'khaki' => 0xf0e68c,
-        'lavender' => 0xe6e6fa,
-        'lavenderblush' => 0xfff0f5,
-        'lawngreen' => 0x7cfc00,
-        'lemonchiffon' => 0xfffacd,
-        'lightblue' => 0xadd8e6,
-        'lightcoral' => 0xf08080,
-        'lightcyan' => 0xe0ffff,
-        'lightgoldenrodyellow' => 0xfafad2,
-        'lightgreen' => 0x90ee90,
-        'lightgray' => 0xd3d3d3,
-        'lightgrey' => 0xd3d3d3,
-        'lightpink' => 0xffb6c1,
-        'lightsalmon' => 0xffa07a,
-        'lightseagreen' => 0x20b2aa,
-        'lightskyblue' => 0x87cefa,
-        'lightslategray' => 0x778899,
-        'lightslategrey' => 0x778899,
-        'lightsteelblue' => 0xb0c4de,
-        'lightyellow' => 0xffffe0,
-        'lime' => 0x00ff00,
-        'limegreen' => 0x32cd32,
-        'linen' => 0xfaf0e6,
-        'magenta' => 0xff00ff,
-        'maroon' => 0x800000,
-        'mediumaquamarine' => 0x66cdaa,
-        'mediumblue' => 0x0000cd,
-        'mediumorchid' => 0xba55d3,
-        'mediumpurple' => 0x9370db,
-        'mediumseagreen' => 0x3cb371,
-        'mediumslateblue' => 0x7b68ee,
-        'mediumspringgreen' => 0x00fa9a,
-        'mediumturquoise' => 0x48d1cc,
-        'mediumvioletred' => 0xc71585,
-        'midnightblue' => 0x191970,
-        'mintcream' => 0xf5fffa,
-        'mistyrose' => 0xffe4e1,
-        'moccasin' => 0xffe4b5,
-        'navajowhite' => 0xffdead,
-        'navy' => 0x000080,
-        'oldlace' => 0xfdf5e6,
-        'olive' => 0x808000,
-        'olivedrab' => 0x6b8e23,
-        'orange' => 0xffa500,
-        'orangered' => 0xff4500,
-        'orchid' => 0xda70d6,
-        'palegoldenrod' => 0xeee8aa,
-        'palegreen' => 0x98fb98,
-        'paleturquoise' => 0xafeeee,
-        'palevioletred' => 0xdb7093,
-        'papayawhip' => 0xffefd5,
-        'peachpuff' => 0xffdab9,
-        'peru' => 0xcd853f,
-        'pink' => 0xffc0cb,
-        'plum' => 0xdda0dd,
-        'powderblue' => 0xb0e0e6,
-        'purple' => 0x800080,
-        'red' => 0xff0000,
-        'rosybrown' => 0xbc8f8f,
-        'royalblue' => 0x4169e1,
-        'saddlebrown' => 0x8b4513,
-        'salmon' => 0xfa8072,
-        'sandybrown' => 0xf4a460,
-        'seagreen' => 0x2e8b57,
-        'seashell' => 0xfff5ee,
-        'sienna' => 0xa0522d,
-        'silver' => 0xc0c0c0,
-        'skyblue' => 0x87ceeb,
-        'slateblue' => 0x6a5acd,
-        'slategray' => 0x708090,
-        'slategrey' => 0x708090,
-        'snow' => 0xfffafa,
-        'springgreen' => 0x00ff7f,
-        'steelblue' => 0x4682b4,
-        'tan' => 0xd2b48c,
-        'teal' => 0x008080,
-        'thistle' => 0xd8bfd8,
-        'tomato' => 0xff6347,
-        'turquoise' => 0x40e0d0,
-        'violet' => 0xee82ee,
-        'wheat' => 0xf5deb3,
-        'white' => 0xffffff,
-        'whitesmoke' => 0xf5f5f5,
-        'yellow' => 0xffff00,
-        'yellowgreen' => 0x9acd32
-      }) {|color| (0..2).map {|n| color >> (n << 3) & 0xff}.reverse}
-
-    # A hash from `[red, green, blue]` value arrays to color names.
+        'aliceblue'            => 0xF0F8FFFF,
+        'antiquewhite'         => 0xFAEBD7FF,
+        'aqua'                 => 0x00FFFFFF,
+        'aquamarine'           => 0x7FFFD4FF,
+        'azure'                => 0xF0FFFFFF,
+        'beige'                => 0xF5F5DCFF,
+        'bisque'               => 0xFFE4C4FF,
+        'black'                => 0x000000FF,
+        'blanchedalmond'       => 0xFFEBCDFF,
+        'blue'                 => 0x0000FFFF,
+        'blueviolet'           => 0x8A2BE2FF,
+        'brown'                => 0xA52A2AFF,
+        'burlywood'            => 0xDEB887FF,
+        'cadetblue'            => 0x5F9EA0FF,
+        'chartreuse'           => 0x7FFF00FF,
+        'chocolate'            => 0xD2691EFF,
+        'coral'                => 0xFF7F50FF,
+        'cornflowerblue'       => 0x6495EDFF,
+        'cornsilk'             => 0xFFF8DCFF,
+        'crimson'              => 0xDC143CFF,
+        'cyan'                 => 0x00FFFFFF,
+        'darkblue'             => 0x00008BFF,
+        'darkcyan'             => 0x008B8BFF,
+        'darkgoldenrod'        => 0xB8860BFF,
+        'darkgray'             => 0xA9A9A9FF,
+        'darkgrey'             => 0xA9A9A9FF,
+        'darkgreen'            => 0x006400FF,
+        'darkkhaki'            => 0xBDB76BFF,
+        'darkmagenta'          => 0x8B008BFF,
+        'darkolivegreen'       => 0x556B2FFF,
+        'darkorange'           => 0xFF8C00FF,
+        'darkorchid'           => 0x9932CCFF,
+        'darkred'              => 0x8B0000FF,
+        'darksalmon'           => 0xE9967AFF,
+        'darkseagreen'         => 0x8FBC8FFF,
+        'darkslateblue'        => 0x483D8BFF,
+        'darkslategray'        => 0x2F4F4FFF,
+        'darkslategrey'        => 0x2F4F4FFF,
+        'darkturquoise'        => 0x00CED1FF,
+        'darkviolet'           => 0x9400D3FF,
+        'deeppink'             => 0xFF1493FF,
+        'deepskyblue'          => 0x00BFFFFF,
+        'dimgray'              => 0x696969FF,
+        'dimgrey'              => 0x696969FF,
+        'dodgerblue'           => 0x1E90FFFF,
+        'firebrick'            => 0xB22222FF,
+        'floralwhite'          => 0xFFFAF0FF,
+        'forestgreen'          => 0x228B22FF,
+        'fuchsia'              => 0xFF00FFFF,
+        'gainsboro'            => 0xDCDCDCFF,
+        'ghostwhite'           => 0xF8F8FFFF,
+        'gold'                 => 0xFFD700FF,
+        'goldenrod'            => 0xDAA520FF,
+        'gray'                 => 0x808080FF,
+        'grey'                 => 0x808080FF,
+        'green'                => 0x008000FF,
+        'greenyellow'          => 0xADFF2FFF,
+        'honeydew'             => 0xF0FFF0FF,
+        'hotpink'              => 0xFF69B4FF,
+        'indianred'            => 0xCD5C5CFF,
+        'indigo'               => 0x4B0082FF,
+        'ivory'                => 0xFFFFF0FF,
+        'khaki'                => 0xF0E68CFF,
+        'lavender'             => 0xE6E6FAFF,
+        'lavenderblush'        => 0xFFF0F5FF,
+        'lawngreen'            => 0x7CFC00FF,
+        'lemonchiffon'         => 0xFFFACDFF,
+        'lightblue'            => 0xADD8E6FF,
+        'lightcoral'           => 0xF08080FF,
+        'lightcyan'            => 0xE0FFFFFF,
+        'lightgoldenrodyellow' => 0xFAFAD2FF,
+        'lightgreen'           => 0x90EE90FF,
+        'lightgray'            => 0xD3D3D3FF,
+        'lightgrey'            => 0xD3D3D3FF,
+        'lightpink'            => 0xFFB6C1FF,
+        'lightsalmon'          => 0xFFA07AFF,
+        'lightseagreen'        => 0x20B2AAFF,
+        'lightskyblue'         => 0x87CEFAFF,
+        'lightslategray'       => 0x778899FF,
+        'lightslategrey'       => 0x778899FF,
+        'lightsteelblue'       => 0xB0C4DEFF,
+        'lightyellow'          => 0xFFFFE0FF,
+        'lime'                 => 0x00FF00FF,
+        'limegreen'            => 0x32CD32FF,
+        'linen'                => 0xFAF0E6FF,
+        'magenta'              => 0xFF00FFFF,
+        'maroon'               => 0x800000FF,
+        'mediumaquamarine'     => 0x66CDAAFF,
+        'mediumblue'           => 0x0000CDFF,
+        'mediumorchid'         => 0xBA55D3FF,
+        'mediumpurple'         => 0x9370DBFF,
+        'mediumseagreen'       => 0x3CB371FF,
+        'mediumslateblue'      => 0x7B68EEFF,
+        'mediumspringgreen'    => 0x00FA9AFF,
+        'mediumturquoise'      => 0x48D1CCFF,
+        'mediumvioletred'      => 0xC71585FF,
+        'midnightblue'         => 0x191970FF,
+        'mintcream'            => 0xF5FFFAFF,
+        'mistyrose'            => 0xFFE4E1FF,
+        'moccasin'             => 0xFFE4B5FF,
+        'navajowhite'          => 0xFFDEADFF,
+        'navy'                 => 0x000080FF,
+        'oldlace'              => 0xFDF5E6FF,
+        'olive'                => 0x808000FF,
+        'olivedrab'            => 0x6B8E23FF,
+        'orange'               => 0xFFA500FF,
+        'orangered'            => 0xFF4500FF,
+        'orchid'               => 0xDA70D6FF,
+        'palegoldenrod'        => 0xEEE8AAFF,
+        'palegreen'            => 0x98FB98FF,
+        'paleturquoise'        => 0xAFEEEEFF,
+        'palevioletred'        => 0xDB7093FF,
+        'papayawhip'           => 0xFFEFD5FF,
+        'peachpuff'            => 0xFFDAB9FF,
+        'peru'                 => 0xCD853FFF,
+        'pink'                 => 0xFFC0CBFF,
+        'plum'                 => 0xDDA0DDFF,
+        'powderblue'           => 0xB0E0E6FF,
+        'purple'               => 0x800080FF,
+        'red'                  => 0xFF0000FF,
+        'rosybrown'            => 0xBC8F8FFF,
+        'royalblue'            => 0x4169E1FF,
+        'saddlebrown'          => 0x8B4513FF,
+        'salmon'               => 0xFA8072FF,
+        'sandybrown'           => 0xF4A460FF,
+        'seagreen'             => 0x2E8B57FF,
+        'seashell'             => 0xFFF5EEFF,
+        'sienna'               => 0xA0522DFF,
+        'silver'               => 0xC0C0C0FF,
+        'skyblue'              => 0x87CEEBFF,
+        'slateblue'            => 0x6A5ACDFF,
+        'slategray'            => 0x708090FF,
+        'slategrey'            => 0x708090FF,
+        'snow'                 => 0xFFFAFAFF,
+        'springgreen'          => 0x00FF7FFF,
+        'steelblue'            => 0x4682B4FF,
+        'tan'                  => 0xD2B48CFF,
+        'teal'                 => 0x008080FF,
+        'thistle'              => 0xD8BFD8FF,
+        'tomato'               => 0xFF6347FF,
+        'transparent'          => 0x00000000,
+        'turquoise'            => 0x40E0D0FF,
+        'violet'               => 0xEE82EEFF,
+        'wheat'                => 0xF5DEB3FF,
+        'white'                => 0xFFFFFFFF,
+        'whitesmoke'           => 0xF5F5F5FF,
+        'yellow'               => 0xFFFF00FF,
+        'yellowgreen'          => 0x9ACD32FF
+      }) do |color|
+        rgba = (0..3).map {|n| color >> (n << 3) & 0xff}.reverse
+        rgba[-1] = rgba[-1] / 255.0
+        rgba
+      end
+
+    # A hash from `[red, green, blue, alpha]` value arrays to color names.
     COLOR_NAMES_REVERSE = map_hash(hash_to_a(COLOR_NAMES)) {|k, v| [v, k]}
 
     # Constructs an RGB or HSL color object,
     # optionally with an alpha channel.
-    # 
+    #
     # The RGB values must be between 0 and 255.
     # The saturation and lightness values must be between 0 and 100.
     # The alpha value must be between 0 and 1.
@@ -295,7 +301,7 @@ module Sass::Script
     #
     # @return [Fixnum]
     def alpha
-      @attrs[:alpha]
+      @attrs[:alpha].to_f
     end
 
     # Returns whether this color object is translucent;
@@ -314,6 +320,14 @@ module Sass::Script
       [red, green, blue].freeze
     end
 
+    # Returns the red, green, blue, and alpha components of the color.
+    #
+    # @return [Array<Fixnum>] A frozen four-element array of the red, green,
+    #   blue, and alpha values (respectively) of the color
+    def rgba
+      [red, green, blue, alpha].freeze
+    end
+
     # Returns the hue, saturation, and lightness components of the color.
     #
     # @return [Array<Fixnum>] A frozen three-element array of the
@@ -322,6 +336,14 @@ module Sass::Script
       [hue, saturation, lightness].freeze
     end
 
+    # Returns the hue, saturation, lightness, and alpha components of the color.
+    #
+    # @return [Array<Fixnum>] A frozen four-element array of the hue,
+    #   saturation, lightness, and alpha values (respectively) of the color
+    def hsla
+      [hue, saturation, lightness].freeze
+    end
+
     # The SassScript `==` operation.
     # **Note that this returns a {Sass::Script::Bool} object,
     # not a Ruby boolean**.
@@ -490,10 +512,9 @@ module Sass::Script
     #
     # @return [String] The string representation
     def to_s(opts = {})
-      return rgba_str if alpha?
       return smallest if options[:style] == :compressed
-      return COLOR_NAMES_REVERSE[rgb] if COLOR_NAMES_REVERSE[rgb]
-      hex_str
+      return COLOR_NAMES_REVERSE[rgba] if COLOR_NAMES_REVERSE[rgba]
+      return alpha? ? rgba_str : hex_str
     end
     alias_method :to_sass, :to_s
 
@@ -507,9 +528,9 @@ module Sass::Script
     private
 
     def smallest
-      small_hex_str = hex_str.gsub(/^#(.)\1(.)\2(.)\3$/, '#\1\2\3')
-      return small_hex_str unless (color = COLOR_NAMES_REVERSE[rgb]) &&
-        color.size <= small_hex_str.size
+      small_explicit_str = alpha? ? rgba_str : hex_str.gsub(/^#(.)\1(.)\2(.)\3$/, '#\1\2\3')
+      return small_explicit_str unless (color = COLOR_NAMES_REVERSE[rgba]) &&
+        color.size <= small_explicit_str.size
       return color
     end
 
@@ -526,7 +547,7 @@ module Sass::Script
     def piecewise(other, operation)
       other_num = other.is_a? Number
       if other_num && !other.unitless?
-        raise Sass::SyntaxError.new("Cannot add a number with units (#{other}) to a color (#{self}).") 
+        raise Sass::SyntaxError.new("Cannot add a number with units (#{other}) to a color (#{self}).")
       end
 
       result = []

data/test/sass/functions_test.rb

@@ -379,8 +379,8 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("rgba(0, 0, 0, 0.3)", evaluate("transparentize(rgba(0, 0, 0, 0.5), 0.2)"))
     assert_equal("rgba(0, 0, 0, 0.1)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 0.1)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("fade-out(rgba(0, 0, 0, 0.5), 0.3px)"))
-    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("transparent", evaluate("fade_out(rgba(0, 0, 0, 0.2), 0.2)"))
+    assert_equal("transparent", 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)"))
@@ -815,8 +815,8 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_grayscale
     assert_equal("#bbbbbb", evaluate("grayscale(#abc)"))
-    assert_equal("gray", evaluate("grayscale(#f00)"))
-    assert_equal("gray", evaluate("grayscale(#00f)"))
+    assert_equal("grey", evaluate("grayscale(#f00)"))
+    assert_equal("grey", evaluate("grayscale(#00f)"))
     assert_equal("white", evaluate("grayscale(white)"))
     assert_equal("black", evaluate("grayscale(black)"))
     assert_equal("black", evaluate("grayscale($color: black)"))

data/test/sass/script_test.rb

@@ -46,6 +46,8 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "white", resolve("white")
     assert_equal "white", resolve("#ffffff")
     assert_equal "#fffffe", resolve("white - #000001")
+    assert_equal "transparent", resolve("transparent")
+    assert_equal "transparent", resolve("rgba(0, 0, 0, 0)")
   end
 
   def test_rgba_color_literals
@@ -95,6 +97,7 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "navy", resolve("#000080", :style => :compressed)
     assert_equal "navy #fff", resolve("#000080 white", :style => :compressed)
     assert_equal "This color is #fff", resolve('"This color is #{ white }"', :style => :compressed)
+    assert_equal "transparent", resolve("rgba(0, 0, 0, 0)", :style => :compressed)
   end
 
   def test_compressed_comma

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302637
+  hash: 592302631
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 144
-  version: 3.3.0.alpha.144
+  - 149
+  version: 3.3.0.alpha.149
 platform: ruby
 authors: 
 - Nathan Weizenbaum