paleta 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a306c36ae6e1a659170b8a0e45ef52cc0df8d4
-  data.tar.gz: eeaec953fa8e5a7d6b4d6205d153d464d1ea0e32
+  metadata.gz: dbc68d095b1685f151b262ce76ec4c5f51380b07
+  data.tar.gz: c31c9b06f8045aa81bd4aca725c83411f1c75f55
 SHA512:
-  metadata.gz: 6c8a0bfc98c27f9712446e4f0956ea04ee4efe29b364beb699152a6731479264ea0d2bedd52e0bbd7961a8e3f02f1e8f73dd6d69fb936d81bdbb2c721e03b72e
-  data.tar.gz: 0c30bb441600cc863bcee8f5d7190b502f3741d49f93d4e46e17999f8ff981224bbefe8dff850d43cd390b0355e82b16af52f6fe53e7b0ec5311c4de57bff26c
+  metadata.gz: 3affa703081598c705dc1b678ac3f8d2dc1b47a363338dd86e7778d0df9b8fcd2ba8d53434f2a7a24130214aab65cf0c83abcb9b4dbdddcc94e2bb26c387d371
+  data.tar.gz: 707274da81a1aeec5ee96bff51feadd472867791f73aaaffc9619e2b8abb15c569d9e1a6c0b926cb2f0cf9567a9ad7067686b5848a83319b585ff6d355221a3a

data/lib/paleta/color.rb

@@ -277,10 +277,10 @@ module Paleta
         end
       end
 
-      @hue = h * 60
+      @hue = (h * 60.0).round(8)
       @hue += 360 if @hue < 0
-      @saturation = s * 100
-      @lightness = l * 100
+      @saturation = (s * 100.0).round(8)
+      @lightness = (l * 100.0).round(8)
     end
 
     def update_rgb

data/lib/paleta/palette.rb

@@ -227,6 +227,14 @@ module Paleta
       array
     end
 
+    def fit
+      # create a 3xn matrix where n = @colors.size to represent the set of colors
+      reds = @colors.map { |c| c.red }
+      greens = @colors.map { |c| c.green }
+      blues = @colors.map { |c| c.blue }
+      multiple_regression(reds, greens, blues)
+    end
+
     private
 
     def self.generate_analogous_from_color(color, size)
@@ -345,13 +353,5 @@ module Paleta
       end
       palette.sort! { |a, b| a.saturation <=> b.saturation }
     end
-
-    def fit
-      # create a 3xn matrix where n = @colors.size to represent the set of colors
-      reds = @colors.map { |c| c.red }
-      greens = @colors.map { |c| c.green }
-      blues = @colors.map { |c| c.blue }
-      multiple_regression(reds, greens, blues)
-    end
   end
 end

data/lib/paleta/version.rb

@@ -1,3 +1,3 @@
 module Paleta
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/readme.markdown

@@ -174,49 +174,49 @@ Palettes can be generated from a "seed" Color or from an image by using the `gen
 
 ```ruby
 color = Paleta::Color.new(:hex, "ff0000")
-palette = Paleta::Palette.generate(:type => :shades, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :shades, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of analogous Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "0066cc")
-palette = Paleta::Palette.generate(:type => :analogous, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :analogous, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of monochromatic Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "336699")
-palette = Paleta::Palette.generate(:type => :monochromatic, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :monochromatic, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of complementary Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "0000ff")
-palette = Paleta::Palette.generate(:type => :complementary, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :complementary, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of split-complement Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "006699")
-palette = Paleta::Palette.generate(:type => :split_complement, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :split_complement, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of triad Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "006699")
-palette = Paleta::Palette.generate(:type => :triad, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :triad, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a Palette of tetrad Colors from a Color**
 
 ```ruby
 color = Paleta::Color.new(:hex, "dd5533")
-palette = Paleta::Palette.generate(:type => :tetrad, :from => :color, :size => 5)
+palette = Paleta::Palette.generate(:type => :tetrad, :from => :color, :size => 5, :color => color)
 ```
 
 **Generate a random Palette**
@@ -237,4 +237,3 @@ palette = Paleta::Palette.generate(:from => :image, :image => "/path/to/image.jp
 
 See the [documentation](http://rubydoc.info/gems/paleta/ "Documentation").
 
- 

data/spec/models/color_spec.rb

@@ -81,11 +81,11 @@ describe Paleta::Color do
   it "should determine its equality to another Color" do
     color1 = Paleta::Color.new(237, 172, 33)
     color2 = Paleta::Color.new(:hex, "EDAC21")
-    (color1 == color2).should be_true
+    (color1 == color2).should be true
     color3 = Paleta::Color.new(:hsl, 200, 50, 100)
-    (color1 == color3).should be_false
+    (color1 == color3).should be false
     obj = Object.new
-    (color1 == obj).should be_false
+    (color1 == obj).should be false
   end
 
   it "should calculate its HSL value on itialization" do

data/spec/models/palette_spec.rb

@@ -1,28 +1,28 @@
 require 'spec_helper'
 
 describe Paleta::Palette do
-  
+
   it "should initialize with a set of Colors" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
     Paleta::Palette.new(c1, c2)
   end
-  
+
   it "should not initialize if an object in the set is not a Color" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = 13
     expect{ Paleta::Palette.new(c1, c2) }.to raise_error(ArgumentError)
   end
-  
+
   it "should add Colors" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
     c3 = Paleta::Color.new(0, 0, 0)
     palette = Paleta::Palette.new(c1)
     palette << c2 << c3
-    palette.include?(c2).should be_true
+    palette.include?(c2).should be true
   end
-  
+
   it "should add Colors with push" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
@@ -30,31 +30,31 @@ describe Paleta::Palette do
     palette.push(c2)
     palette[1].should == c2
   end
-  
+
   it "should remove the last Color with pop" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
     palette = Paleta::Palette.new(c1, c2)
     c = palette.pop()
     c.should == c2
-    palette.include?(c2).should be_false
+    palette.include?(c2).should be false
   end
-  
+
   it "should remove Colors by index" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
     palette = Paleta::Palette.new(c1, c2)
     palette.delete_at(0)
-    palette.include?(c1).should be_false
+    palette.include?(c1).should be false
   end
-  
+
   it "should allow array-style accessing of Colors" do
     c1 = Paleta::Color.new(13, 57, 182)
     palette = Paleta::Palette.new(c1)
     palette[0].should == c1
     palette[1].should be_nil
   end
-  
+
   it "should lighten each Color in a Palette by a percentage" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
@@ -66,7 +66,7 @@ describe Paleta::Palette do
     palette[0].lightness.should == lightness1 + percent
     palette[1].lightness.should == lightness2 + percent
   end
-  
+
   it "should darken each Color in a Palette by a percentage" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
@@ -78,7 +78,7 @@ describe Paleta::Palette do
     palette[0].lightness.should == lightness1 - percent
     palette[1].lightness.should == lightness2 - percent
   end
-  
+
   it "should invert each Color in a Palette" do
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
@@ -91,9 +91,8 @@ describe Paleta::Palette do
     palette[1].green.should == 94
     palette[1].blue.should == 20
   end
-  
+
   it "should calculate a multiple regression over each Color in the Palette in RGB space" do
-    Paleta::Palette.send(:public, :fit)
     c1 = Paleta::Color.new(13, 57, 182)
     c2 = Paleta::Color.new(94, 161, 235)
     c3 = Paleta::Color.new(237, 172, 33)
@@ -106,35 +105,35 @@ describe Paleta::Palette do
     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
     c1 = Paleta::Color.new(0, 0, 0)
     p1 = Paleta::Palette.new(c1)
-    
+
     c2 = Paleta::Color.new(255, 255, 255)
     p2 = Paleta::Palette.new(c2)
-    
+
     p1.similarity(p2).should == 1
-    
+
     c3 = Paleta::Color.new(0, 0, 0)
     c4 = Paleta::Color.new(255, 255, 255)
     p3 = Paleta::Palette.new(c3, c4)
-    
+
     c5 = Paleta::Color.new(0, 0, 0)
     c6 = Paleta::Color.new(255, 255, 255)
     p4 = Paleta::Palette.new(c5, c6)
     p3.similarity(p4).should == 0
-    
+
     c7 = Paleta::Color.new(13, 57, 182)
     c8 = Paleta::Color.new(237, 172, 33)
     p5 = Paleta::Palette.new(c7, c8)
-    
+
     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.00669
   end
-  
+
   it "should generate a new Palette of shades of a single Color" do
     color = Paleta::Color.new(:hex, "ff0000")
     palette = Paleta::Palette.generate(:from => :color, :color => color, :size => 5)
@@ -149,7 +148,7 @@ describe Paleta::Palette do
     palette[3].lightness.should == 70
     palette[4].lightness.should == 90
   end
-  
+
   it "should generate a new Palette of Colors analogous to the seed Color" do
     color = Paleta::Color.new(:hex, "0066cc")
     palette = Paleta::Palette.generate(:type => :analogous, :from => :color, :color => color, :size => 5)
@@ -164,7 +163,7 @@ describe Paleta::Palette do
     palette[3].hue.should == 230
     palette[4].hue.should == 250
   end
-  
+
   it "should generate a new Palette of Colors monochromatic to the seed Color" do
     color = Paleta::Color.new(:hex, "0066cc")
     palette = Paleta::Palette.generate(:type => :monochromatic, :from => :color, :color => color, :size => 5)
@@ -179,19 +178,19 @@ describe Paleta::Palette do
     palette[3].saturation.should == 80
     palette[4].saturation.should == 100
   end
-  
+
   it "should generate a new Palette of random Colors" do
     palette = Paleta::Palette.generate(:type => :random, :size => 5)
     palette.size.should == 5
   end
-  
+
   it "should generate a new complementary Palette from the seed Color" do
     color = Paleta::Color.new(:hex, "0066cc")
     palette = Paleta::Palette.generate(:type => :complementary, :from => :color, :color => color, :size => 5)
     palette.size.should == 5
     palette.each do |c|
       c.lightness.should == color.lightness
-      [color.hue, color.complement.hue].include?(c.hue).should be_true
+      [color.hue, color.complement.hue].include?(c.hue).should be true
     end
   end
 
@@ -201,7 +200,7 @@ describe Paleta::Palette do
     palette.size.should == 5
     palette.each do |c|
       c.lightness.should == color.lightness
-      [color.hue, (color.hue + 120) % 360, (color.hue + 240) % 360].include?(c.hue).should be_true
+      [color.hue, (color.hue + 120) % 360, (color.hue + 240) % 360].include?(c.hue).should be true
     end
   end
 
@@ -211,31 +210,31 @@ describe Paleta::Palette do
     palette.size.should == 5
     palette.each do |c|
       c.lightness.should == color.lightness
-      [color.hue, (color.hue + 90) % 360, (color.hue + 180) % 360, (color.hue + 270) % 360].include?(c.hue).should be_true
+      [color.hue, (color.hue + 90) % 360, (color.hue + 180) % 360, (color.hue + 270) % 360].include?(c.hue).should be true
     end
   end
-  
+
   it "should generate a new split-complement Palette from the seed Color" do
     color = Paleta::Color.new(:hex, "0066cc")
     palette = Paleta::Palette.generate(:type => :split_complement, :from => :color, :color => color, :size => 5)
     palette.size.should == 5
     palette.each do |c|
       c.lightness.should == color.lightness
-      [color.hue, (color.hue + 150) % 360, (color.hue + 210) % 360].include?(c.hue).should be_true
+      [color.hue, (color.hue + 150) % 360, (color.hue + 210) % 360].include?(c.hue).should be true
     end
   end
-  
+
   it "should generate a Palette from an image" do
     path = File.join(File.dirname(__FILE__), '..', 'images/test.jpg')
     size = 5
     palette = Paleta::Palette.generate(:from => :image, :image => path, :size => size)
     palette.size.should == size
   end
-  
+
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paleta
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jordan Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec