paleta 0.1.0 → 0.2.0

data/lib/paleta/color.rb

@@ -212,6 +212,21 @@ module Paleta
       distance({ :r => @red, :g => @green, :b => @blue}, { :r => color.red, :g => color.green, :b => color.blue}) / sqrt(3 * (255 ** 2))
     end
     
+    # Return an array representation of a {Color} instance,
+    # @param [Symbol] model the color model, should be :rgb or :hsl
+    # @return [Array] an array of component values
+    def to_array(color_model = :rgb)
+      color_model = color_model.to_sym unless color_model.is_a? Symbol
+      if color_model == :rgb
+        array = [self.red, self.green, self.blue]
+      elsif color_model == :hsl
+        array = [self.hue, self.saturation, self.lightness]
+      else
+        raise(ArgumentError, "Argument must be :rgb or :hsl")
+      end
+      array
+    end
+    
     private
     
     def rgb_init(red = 0, green = 0, blue = 0)

data/lib/paleta/core_ext/math.rb

@@ -26,6 +26,7 @@ module Math
     dx.zip(dy, dz).each do |x, y, z|
       sxx += x ** 2
       syy += y ** 2
+      szz += z ** 2
       sxy += x * y
       szx += z * x
       syz += y * z

data/lib/paleta/palette.rb

@@ -213,6 +213,21 @@ module Paleta
       end
     end
     
+    # Return an array representation of a {Palette} instance,
+    # @param [Symbol] model the color model, should be :rgb, :hsl, or :hex
+    # @return [Array] an Array of Arrays where each sub-Array is a representation of a {Color} object in a {Palette} instance
+    def to_array(color_model = :rgb)
+      color_model = color_model.to_sym unless color_model.is_a? Symbol
+      if [:rgb, :hsl].include?(color_model)
+        array = colors.map { |c| c.to_array(color_model) }
+      elsif color_model == :hex
+        array = colors.map{ |c| c.hex }
+      else
+        raise(ArgumentError, "Argument must be :rgb, :hsl, or :hex")
+      end
+      array
+    end
+    
     private
     
     def self.generate_analogous_from_color(color, size)

data/lib/paleta/version.rb

@@ -1,3 +1,3 @@
 module Paleta
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/readme.markdown

@@ -45,6 +45,12 @@ Individual component values can be accessed by name
 	color.lightness # => 64.50980392156862
 	color.hex # => "5EA1EB"
 	
+	
+Get an array representation of a Color
+
+	c = Paleta::Color.new(30, 90, 120)
+	c.to_array(:rgb) # => [30, 90, 120]
+	
 #### Manipulating Colors
 
 Colors can be lightened or darkened by a percentage
@@ -100,6 +106,14 @@ Colors can be accessed and removed by index.
 	palette[1] # => color2
 	
 	palette.delete_at(2)
+	
+Get an array representation of a Palette
+
+    c1 = Paleta::Color.new(13, 57, 182)
+    c2 = Paleta::Color.new(94, 161, 235)
+    palette = Paleta::Palette.new(c1, c2)
+	
+	palette.to_array(:rgb) # => [[13, 57, 182], [94, 161, 235]]
 
 #### Manipulating Palettes
 

data/spec/models/color_spec.rb

@@ -241,4 +241,13 @@ describe Paleta::Color do
     color.saturation.should == 0
     color.lightness.should == 100
   end
+  
+  it "should return an array of component values" do
+    c = Paleta::Color.new(30, 90, 120)
+    rgb_array = [c.red, c.green, c.blue]
+    hsl_array = [c.hue, c.saturation, c.lightness]
+    c.to_array.should == rgb_array
+    c.to_array(:rgb).should == rgb_array
+    c.to_array(:hsl).should == hsl_array
+  end
 end

data/spec/models/palette_spec.rb

@@ -99,12 +99,12 @@ describe Paleta::Palette do
     c3 = Paleta::Color.new(237, 172, 33)
     palette = Paleta::Palette.new(c1, c2, c3)
     r = palette.fit
-    r[:slope][:x].should == 0.19585157930194594
-    r[:slope][:y].should == 0.5276697919048708
-    r[:slope][:z].should == 0.09102564102564102
-    r[:offset][:x].should == 127.54235224004354
-    r[:offset][:y].should == 50.849531214269376
-    r[:offset][:z].should == 102.83333333333333
+    r[:slope][:x].round(5).should == 0.19585
+    r[:slope][:y].round(5).should == 0.52767
+    r[:slope][:z].round(5).should == -0.11913
+    r[:offset][:x].round(5).should == 127.54235
+    r[:offset][:y].round(5).should == 50.84953
+    r[:offset][:z].round(5).should == 130.15404
   end
   
   it "should calculate its similarity to another Palette" do
@@ -132,7 +132,7 @@ describe Paleta::Palette do
     c9 = Paleta::Color.new(13, 57, 182)
     c10 = Paleta::Color.new(94, 161, 235)
     p6 = Paleta::Palette.new(c9, c10)
-    p5.similarity(p6).round(5).should == 0.00627
+    p5.similarity(p6).round(5).should == 0.00669
   end
   
   it "should generate a new Palette of shades of a single Color" do
@@ -235,4 +235,16 @@ describe Paleta::Palette do
   it "should raise an error when generating a Palette from an invalid image" do
     expect{ Paleta::Palette.generate(:from => :image, :image => "/no/image.here") }.to raise_error(RuntimeError)
   end
+  
+  it "should return an array of colors, where each color is represented as an array of component values" do
+    c1 = Paleta::Color.new(13, 57, 182)
+    c2 = Paleta::Color.new(94, 161, 235)
+    palette = Paleta::Palette.new(c1, c2)
+    rgb_palette_array = [c1.to_array, c2.to_array]
+    hsl_palette_array = [c1.to_array(:hsl), c2.to_array(:hsl)]
+    palette.to_array.should == rgb_palette_array
+    palette.to_array(:rgb).should == rgb_palette_array
+    palette.to_array(:hsl).should == hsl_palette_array
+    palette.to_array(:hex).should == ['0D39B6', '5EA1EB']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paleta
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies: []
 description: A gem for working with color palettes
 email: