compass-colors 0.2.1 → 0.3.0

data/VERSION.yml

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

data/lib/compass-colors/sass_extensions.rb

@@ -4,28 +4,44 @@ module Sass::Script::Functions
   # 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)
-    hsl.l += (1 - hsl.l) * (amount.value / 100.0)
+    if percentage?(amount)
+      hsl.l += (1 - hsl.l) * (amount.value / 100.0)
+    else
+      hsl.l += amount.value
+    end
     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)
-    hsl.l *= 1.0 - (amount.value / 100.0)
+    if percentage?(amount)
+      hsl.l *= 1.0 - (amount.value / 100.0)
+    else
+      hsl.l -= amount.value
+    end
     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)
-    hsl.s += (1 - hsl.s) * (amount.value / 100.0)
+    if percentage?(amount)
+      hsl.s += (1 - hsl.s) * (amount.value / 100.0)
+    else
+      hsl.s += amount.value
+    end
     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)
-    hsl.s *= (1.0 - (amount.value / 100.0))
+    if percentage?(amount)
+      hsl.s *= (1.0 - (amount.value / 100.0))
+    else
+      hsl.s -= amount.value
+    end
     hsl.to_color
   end
 
@@ -70,4 +86,10 @@ 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

metadata

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