chriseppstein-compass-colors 0.1.1 → 0.1.3

data/VERSION.yml

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

data/example/config.rb

@@ -1,4 +1,6 @@
 # Require any additional compass plugins here.
+require File.join(File.dirname(__FILE__), '..', 'lib', 'compass-colors')
+
 project_type = :stand_alone
 # Set this to the root of your project when deployed:
 http_path = "/"

data/lib/compass-colors/sass_extensions.rb

@@ -5,28 +5,28 @@ 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 *= (amount.value / 100.0) + 1.0
+    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)
-    hsl.l *= (-amount.value / 100.0) + 1.0
+    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)
-    hsl.s *= (amount.value / 100.0) + 1.0
+    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)
-    hsl.s *= (-amount.value / 100.0) + 1.0
+    hsl.s *= (1.0 - (amount.value / 100.0))
     hsl.to_color
   end
 

data/spec/sass_extensions_spec.rb

@@ -11,18 +11,18 @@ require 'compass-colors'
 describe "sass extensions" do
   it "should lighten red into pink" do
     pink = invoke(:lighten, color(255,0,0), number(50))
-    pink.to_s.should == "#ff8080"
+    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.to_s.should == "maroon"
+    maroon.should be_approximately_the_same_color_as(color(127,0,0))
   end
 
-  it "should darken this blue into darker blue and then lighten it back again" do
-    darker = invoke(:darken, color(0x4D, 0xA3, 0x78), number(50))
+  it "should darken white into gray and back again" do
+    darker = invoke(:darken, color(0xff, 0xff, 0xff), number(50))
     lighter_again = invoke(:lighten, darker, number(100))
-    color(0x4D, 0xA3, 0x78).should be_approximately_the_same_color_as(lighter_again)
+    color(0xff, 0xff, 0xff).should be_approximately_the_same_color_as(lighter_again)
   end
 
   it "shouldn't saturate fully saturated colors" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass-colors
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chris Eppstein