compass-colors 0.3.0 → 0.3.1

data/VERSION.yml

@@ -2,4 +2,4 @@
 :build: 
 :major: 0
 :minor: 3
-:patch: 0
+:patch: 1

data/lib/compass-colors/hsl.rb

@@ -8,7 +8,8 @@ module Compass
       attr_reader :s, :l
 
       def self.from_color(color)
-        from_rgb(*color.value)
+        rgb = color.respond_to?(:rgb) ? color.rgb : color.value
+        from_rgb(*rgb)
       end
 
       def self.from_rgb(r, g, b)

data/lib/compass-colors/sass_extensions.rb

@@ -1,47 +1,69 @@
 require 'sass'
 
 module Sass::Script::Functions
+  module Colors
+    extend self
+    def rgb_value(color)
+      if color.respond_to?(:rgb)
+        color.rgb
+      else
+        color.value
+      end
+    end
+  end
   # Takes a color object and amount by which to lighten it (0 to 100).
   def lighten(color, amount)
     hsl = Compass::Colors::HSL.from_color(color)
-    if percentage?(amount)
-      hsl.l += (1 - hsl.l) * (amount.value / 100.0)
-    else
-      hsl.l += amount.value
-    end
+    hsl.l += amount.value / 100.0
+    hsl.to_color
+  end
+
+  # Takes a color object and percent by which to lighten it (0 to 100).
+  def lighten_percent(color, amount)
+    hsl = Compass::Colors::HSL.from_color(color)
+    hsl.l += (1 - hsl.l) * (amount.value / 100.0)
     hsl.to_color
   end
 
   # Takes a color object and amount by which to darken it (0 to 100).
   def darken(color, amount)
     hsl = Compass::Colors::HSL.from_color(color)
-    if percentage?(amount)
-      hsl.l *= 1.0 - (amount.value / 100.0)
-    else
-      hsl.l -= amount.value
-    end
+    hsl.l -= amount.value / 100.0
+    hsl.to_color
+  end
+
+  # Takes a color object and percent by which to darken it (0 to 100).
+  def darken_percent(color, amount)
+    hsl = Compass::Colors::HSL.from_color(color)
+    hsl.l *= 1.0 - (amount.value / 100.0)
     hsl.to_color
   end
 
   # Saturate (make a color "richer") a color by the given amount (0 to 100)
   def saturate(color, amount)
     hsl = Compass::Colors::HSL.from_color(color)
-    if percentage?(amount)
-      hsl.s += (1 - hsl.s) * (amount.value / 100.0)
-    else
-      hsl.s += amount.value
-    end
+    hsl.s += amount.value / 100.0
+    hsl.to_color
+  end
+
+  # Saturate (make a color "richer") a color by the given percent (0 to 100)
+  def saturate_percent(color, amount)
+    hsl = Compass::Colors::HSL.from_color(color)
+    hsl.s += (1 - hsl.s) * (amount.value / 100.0)
     hsl.to_color
   end
 
   # Desaturate (make a color "grayer") a color by the given amount (0 to 100)
   def desaturate(color, amount)
     hsl = Compass::Colors::HSL.from_color(color)
-    if percentage?(amount)
-      hsl.s *= (1.0 - (amount.value / 100.0))
-    else
-      hsl.s -= amount.value
-    end
+    hsl.s -= amount.value / 100.0
+    hsl.to_color
+  end
+
+  # Desaturate (make a color "grayer") a color by the given percent (0 to 100)
+  def desaturate_percent(color, amount)
+    hsl = Compass::Colors::HSL.from_color(color)
+    hsl.s *= (1.0 - (amount.value / 100.0))
     hsl.to_color
   end
 
@@ -59,11 +81,12 @@ module Sass::Script::Functions
   def luminosity(color)
     Sass::Script::Number.new((Compass::Colors::HSL.from_color(color).l * 100).round)
   end
+  alias lightness luminosity
 
   # Mixes two colors by some amount (0 to 100). Defaults to 50.
   def mix(color1, color2, amount = nil)
     percent = amount ? amount.value.round / 100.0 : 0.5
-    new_colors = color1.value.zip(color2.value).map{|c1, c2| (c1 * percent) + (c2 * (1 - percent))}
+    new_colors = Colors.rgb_value(color1).zip(Colors.rgb_value(color2)).map{|c1, c2| (c1 * percent) + (c2 * (1 - percent))}
     Sass::Script::Color.new(new_colors)
   end
 
@@ -86,10 +109,4 @@ module Sass::Script::Functions
     adjust_hue color, 180
   end
 
-  private
-
-  def percentage?(amount)
-    amount.numerator_units == ["%"] || (amount.unitless? && amount.value > 1 && amount.value < 100)
-  end
-
 end

data/spec/approximate_color_matching.rb

@@ -6,7 +6,7 @@ module BeApproximatelyTheSameColorAsMatcher
 
     def matches?(target)
       @target = target
-      @target.value.zip(@expected.value).all?{|e,t| (e-t).abs <= 1}
+      @target.rgb.zip(@expected.rgb).all?{|e,t| (e-t).abs <= 1}
     end
 
     def failure_message

data/spec/sass_extensions_spec.rb

@@ -10,12 +10,22 @@ require 'compass-colors'
 
 describe "sass extensions" do
   it "should lighten red into pink" do
-    pink = invoke(:lighten, color(255,0,0), number(50))
+    pink = invoke(:lighten, color(255,0,0), number(25))
+    pink.should be_approximately_the_same_color_as(color(255,127,127))
+  end
+
+  it "should lighten red into pink (percentage)" do
+    pink = invoke(:lighten_percent, color(255,0,0), number(50))
     pink.should be_approximately_the_same_color_as(color(255,127,127))
   end
 
   it "should darken red into maroon" do
-    maroon = invoke(:darken, color(255,0,0), number(50))
+    maroon = invoke(:darken, color(255,0,0), number(25))
+    maroon.should be_approximately_the_same_color_as(color(127,0,0))
+  end
+
+  it "should darken red into maroon (percentage)" do
+    maroon = invoke(:darken_percent, color(255,0,0), number(50))
     maroon.should be_approximately_the_same_color_as(color(127,0,0))
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: compass-colors
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -08:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency