compass-colors 0.3.1 → 0.9.0

data/VERSION.yml

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

data/lib/compass-colors/sass_extensions.rb

@@ -11,102 +11,55 @@ module Sass::Script::Functions
       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)
-    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)
-    hsl.l -= amount.value / 100.0
-    hsl.to_color
+    Compass::Util.compass_warn("lighten-percent() is deprecated. Please use the scale-color() function provided by sass.")
+    if unitless(amount).to_bool
+      Compass::Util.compass_warn("Sass's scale-color() function requires a percent instead of a unitless number for the amount.")
+      amount = Sass::Script::Number.new(amount.value, ['%'], [])
+    end
+    scale_color(color, "lightness" => amount)
   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)
-    hsl.s += amount.value / 100.0
-    hsl.to_color
+    Compass::Util.compass_warn("darken-percent() is deprecated. Please use the scale-color() function provided by sass.")
+    if unitless(amount).to_bool
+      Compass::Util.compass_warn("Sass's scale-color() function requires a percent instead of a unitless number for the amount.")
+      amount = Sass::Script::Number.new(-amount.value, ['%'], [])
+    else
+      amount = amount.times(Sass::Script::Number.new(-1))
+    end
+    scale_color(color, "lightness" => amount)
   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)
-    hsl.s -= amount.value / 100.0
-    hsl.to_color
+    Compass::Util.compass_warn("saturate-percent() is deprecated. Please use the scale-color() function provided by sass.")
+    if unitless(amount).to_bool
+      Compass::Util.compass_warn("Sass's scale-color() function requires a percent instead of a unitless number for the amount.")
+      amount = Sass::Script::Number.new(amount.value, ['%'], [])
+    end
+    scale_color(color, "saturation" => amount)
   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
-
-  # Return the hue of a color as a number between 0 and 360
-  def hue(color)
-    Sass::Script::Number.new(Compass::Colors::HSL.from_color(color).h.round)
-  end
-
-  # Return the saturation of a color as a number between 0 and 100
-  def saturation(color)
-    Sass::Script::Number.new((Compass::Colors::HSL.from_color(color).s * 100).round)
+    Compass::Util.compass_warn("desaturate-percent() is deprecated. Please use the scale-color() function provided by sass.")
+    if unitless(amount).to_bool
+      Compass::Util.compass_warn("Sass's scale-color() function requires a percent instead of a unitless number for the amount.")
+      amount = Sass::Script::Number.new(-amount.value, ['%'], [])
+    else
+      amount = amount.times(Sass::Script::Number.new(-1))
+    end
+    scale_color(color, "saturation" => amount)
   end
 
   # Return the luminosity of a color as a number between 0 and 100
   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 = Colors.rgb_value(color1).zip(Colors.rgb_value(color2)).map{|c1, c2| (c1 * percent) + (c2 * (1 - percent))}
-    Sass::Script::Color.new(new_colors)
-  end
-
-  # Returns the grayscale equivalent color for the given color
-  def grayscale(color)
-    hsl = Compass::Colors::HSL.from_color(color)
-    g = (hsl.l * 255).round
-    Sass::Script::Color.new([g, g, g])
-  end
-
-  # adjust the hue of a color by the given number of degrees.
-  def adjust_hue(color, degrees)
-    hsl = Compass::Colors::HSL.from_color(color)
-    degrees = degrees.value.to_f.round if degrees.is_a?(Sass::Script::Literal)
-    hsl.h += degrees
-    hsl.to_color
-  end
-
-  def complement(color)
-    adjust_hue color, 180
+    Compass::Util.compass_warn("luminosity($color) is deprecated. Please use the lightness($color) provided by sass.")
+    lightness(color)
   end
 
 end

data/spec/approximate_color_matching.rb

@@ -25,7 +25,7 @@ module BeApproximatelyTheSameColorAsMatcher
       if value.nil?
         'nil'
       end
-
+      value.options = {}
       # join arrays
       if value.class == Array
         return value.join(", ")

data/spec/sass_extensions_spec.rb

@@ -1,22 +1,83 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require File.join(File.dirname(__FILE__), 'approximate_color_matching')
+require 'sass'
+require 'stringio'
+
+module Capturing
+  def capture_stderr
+    $stderr, real_stderr = StringIO.new, $stderr
+    yield
+    $stderr.string
+  ensure
+    $stderr = real_stderr
+  end
+end
 
 Spec::Runner.configure do |config|
   config.include(BeApproximatelyTheSameColorAsMatcher)
+  config.include(Capturing)
 end
 
 require 'compass-colors'
 
 describe "sass extensions" do
+
+  it "should deprecate luminosity" do
+    warning = capture_stderr do
+      invoke(:luminosity, color(255,0,0))
+    end
+    warning.strip.should == "luminosity($color) is deprecated. Please use the lightness($color) provided by sass."
+  end
+
+  it "should deprecate desaturate-percent" do
+    warning = capture_stderr do
+      desaturated = invoke(:desaturate_percent, color(255,0,0), number(25))
+      desaturated.should be_approximately_the_same_color_as(color(223,32,32))
+    end
+    warning.should == %q<desaturate-percent() is deprecated. Please use the scale-color() function provided by sass.
+Sass's scale-color() function requires a percent instead of a unitless number for the amount.
+>
+  end
+
+  it "should deprecate saturate-percent" do
+    warning = capture_stderr do
+      desaturated = invoke(:saturate_percent, color(127,32,32), number(25))
+      desaturated.should be_approximately_the_same_color_as(color(135,24,24))
+    end
+    warning.should == %q<saturate-percent() is deprecated. Please use the scale-color() function provided by sass.
+Sass's scale-color() function requires a percent instead of a unitless number for the amount.
+>
+  end
+
+  it "should desaturate-percents" do
+    capture_stderr do
+      desaturated = invoke(:desaturate_percent, color(255,0,0), number(25, '%'))
+      desaturated.should be_approximately_the_same_color_as(color(223,32,32))
+    end
+  end
+
+  it "should saturate colors" do
+    color = invoke(:saturate, color(127,32,32), number(25))
+    color.should be_approximately_the_same_color_as(color(147,12,12))
+  end
+
+  it "should desaturate colors" do
+    color = invoke(:desaturate, color(255,0,0), number(25))
+    color.should be_approximately_the_same_color_as(color(223,32,32))
+  end
+
   it "should lighten red into pink" do
     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))
+    warning = capture_stderr do
+      pink = invoke(:lighten_percent, color(255,0,0), number(50))
+      pink.should be_approximately_the_same_color_as(color(255,127,127))
+    end
+    warning.should == "lighten-percent() is deprecated. Please use the scale-color() function provided by sass.\nSass's scale-color() function requires a percent instead of a unitless number for the amount.\n"
   end
 
   it "should darken red into maroon" do
@@ -25,8 +86,11 @@ describe "sass extensions" do
   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))
+    warning = capture_stderr do
+      maroon = invoke(:darken_percent, color(255,0,0), number(50))
+      maroon.should be_approximately_the_same_color_as(color(127,0,0))
+    end
+    warning.should == "darken-percent() is deprecated. Please use the scale-color() function provided by sass.\nSass's scale-color() function requires a percent instead of a unitless number for the amount.\n"
   end
 
   it "should darken white into gray and back again" do
@@ -40,6 +104,16 @@ describe "sass extensions" do
     saturated.should be_approximately_the_same_color_as(color(0, 127, 127))
   end
 
+  it "should mix colors" do
+    mixed = invoke(:mix, color(127, 127, 0), color(0, 127, 127), number(50))
+    mixed.should be_approximately_the_same_color_as(color(63, 127, 63))
+  end
+
+  it "should adjust hues" do
+    mixed = invoke(:adjust_hue, color(127, 0, 0), number(120, "deg"))
+    mixed.should be_approximately_the_same_color_as(color(0, 127, 0))
+  end
+
   def invoke(name, *args)
     Sass::Script::Functions::EvaluationContext.new({}).send(name, *args)
   end
@@ -48,7 +122,7 @@ describe "sass extensions" do
     Sass::Script::Color.new([r,g,b])
   end
 
-  def number(num)
-    Sass::Script::Number.new(num)
+  def number(num, units = nil)
+    Sass::Script::Number.new(num, Array(units))
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: compass-colors
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,19 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -08:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Sass Extensions and color theme templates to make working with colors easier and more maintainable.
 email: chris@eppsteins.net
 executables: []
@@ -59,26 +61,26 @@ homepage: http://compass-style.org
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Color Support for Compass & Sass