colorable 0.0.2 → 0.0.3

data/lib/colorable.rb

@@ -8,5 +8,7 @@ module Colorable
   # When W3C color conflict with X11, a name of the color is appended with '2'.
   COLORNAMES = [["Alice Blue", [240, 248, 255]], ["Antique White", [250, 235, 215]], ["Aqua", [0, 255, 255]], ["Aquamarine", [127, 255, 212]], ["Azure", [240, 255, 255]], ["Beige", [245, 245, 220]], ["Bisque", [255, 228, 196]], ["Black", [0, 0, 0]], ["Blanched Almond", [255, 235, 205]], ["Blue", [0, 0, 255]], ["Blue Violet", [138, 43, 226]], ["Brown", [165, 42, 42]], ["Burlywood", [222, 184, 135]], ["Cadet Blue", [95, 158, 160]], ["Chartreuse", [127, 255, 0]], ["Chocolate", [210, 105, 30]], ["Coral", [255, 127, 80]], ["Cornflower", [100, 149, 237]], ["Cornsilk", [255, 248, 220]], ["Crimson", [220, 20, 60]], ["Cyan", [0, 255, 255]], ["Dark Blue", [0, 0, 139]], ["Dark Cyan", [0, 139, 139]], ["Dark Goldenrod", [184, 134, 11]], ["Dark Gray", [169, 169, 169]], ["Dark Green", [0, 100, 0]], ["Dark Khaki", [189, 183, 107]], ["Dark Magenta", [139, 0, 139]], ["Dark Olive Green", [85, 107, 47]], ["Dark Orange", [255, 140, 0]], ["Dark Orchid", [153, 50, 204]], ["Dark Red", [139, 0, 0]], ["Dark Salmon", [233, 150, 122]], ["Dark Sea Green", [143, 188, 143]], ["Dark Slate Blue", [72, 61, 139]], ["Dark Slate Gray", [47, 79, 79]], ["Dark Turquoise", [0, 206, 209]], ["Dark Violet", [148, 0, 211]], ["Deep Pink", [255, 20, 147]], ["Deep Sky Blue", [0, 191, 255]], ["Dim Gray", [105, 105, 105]], ["Dodger Blue", [30, 144, 255]], ["Firebrick", [178, 34, 34]], ["Floral White", [255, 250, 240]], ["Forest Green", [34, 139, 34]], ["Fuchsia", [255, 0, 255]], ["Gainsboro", [220, 220, 220]], ["Ghost White", [248, 248, 255]], ["Gold", [255, 215, 0]], ["Goldenrod", [218, 165, 32]], ["Gray", [190, 190, 190]], ["Gray2", [128, 128, 128]], ["Green", [0, 255, 0]], ["Green Yellow", [173, 255, 47]], ["Green2", [0, 128, 0]], ["Honeydew", [240, 255, 240]], ["Hot Pink", [255, 105, 180]], ["Indian Red", [205, 92, 92]], ["Indigo", [75, 0, 130]], ["Ivory", [255, 255, 240]], ["Khaki", [240, 230, 140]], ["Lavender", [230, 230, 250]], ["Lavender Blush", [255, 240, 245]], ["Lawn Green", [124, 252, 0]], ["Lemon Chiffon", [255, 250, 205]], ["Light Blue", [173, 216, 230]], ["Light Coral", [240, 128, 128]], ["Light Cyan", [224, 255, 255]], ["Light Goldenrod", [250, 250, 210]], ["Light Gray", [211, 211, 211]], ["Light Green", [144, 238, 144]], ["Light Pink", [255, 182, 193]], ["Light Salmon", [255, 160, 122]], ["Light Sea Green", [32, 178, 170]], ["Light Sky Blue", [135, 206, 250]], ["Light Slate Gray", [119, 136, 153]], ["Light Steel Blue", [176, 196, 222]], ["Light Yellow", [255, 255, 224]], ["Lime", [0, 255, 0]], ["Lime Green", [50, 205, 50]], ["Linen", [250, 240, 230]], ["Magenta", [255, 0, 255]], ["Maroon", [176, 48, 96]], ["Maroon2", [127, 0, 0]], ["Medium Aquamarine", [102, 205, 170]], ["Medium Blue", [0, 0, 205]], ["Medium Orchid", [186, 85, 211]], ["Medium Purple", [147, 112, 219]], ["Medium Sea Green", [60, 179, 113]], ["Medium Slate Blue", [123, 104, 238]], ["Medium Spring Green", [0, 250, 154]], ["Medium Turquoise", [72, 209, 204]], ["Medium Violet Red", [199, 21, 133]], ["Midnight Blue", [25, 25, 112]], ["Mint Cream", [245, 255, 250]], ["Misty Rose", [255, 228, 225]], ["Moccasin", [255, 228, 181]], ["Navajo White", [255, 222, 173]], ["Navy", [0, 0, 128]], ["Old Lace", [253, 245, 230]], ["Olive", [128, 128, 0]], ["Olive Drab", [107, 142, 35]], ["Orange", [255, 165, 0]], ["Orange Red", [255, 69, 0]], ["Orchid", [218, 112, 214]], ["Pale Goldenrod", [238, 232, 170]], ["Pale Green", [152, 251, 152]], ["Pale Turquoise", [175, 238, 238]], ["Pale Violet Red", [219, 112, 147]], ["Papaya Whip", [255, 239, 213]], ["Peach Puff", [255, 218, 185]], ["Peru", [205, 133, 63]], ["Pink", [255, 192, 203]], ["Plum", [221, 160, 221]], ["Powder Blue", [176, 224, 230]], ["Purple", [160, 32, 240]], ["Purple2", [127, 0, 127]], ["Red", [255, 0, 0]], ["Rosy Brown", [188, 143, 143]], ["Royal Blue", [65, 105, 225]], ["Saddle Brown", [139, 69, 19]], ["Salmon", [250, 128, 114]], ["Sandy Brown", [244, 164, 96]], ["Sea Green", [46, 139, 87]], ["Seashell", [255, 245, 238]], ["Sienna", [160, 82, 45]], ["Silver", [192, 192, 192]], ["Sky Blue", [135, 206, 235]], ["Slate Blue", [106, 90, 205]], ["Slate Gray", [112, 128, 144]], ["Snow", [255, 250, 250]], ["Spring Green", [0, 255, 127]], ["Steel Blue", [70, 130, 180]], ["Tan", [210, 180, 140]], ["Teal", [0, 128, 128]], ["Thistle", [216, 191, 216]], ["Tomato", [255, 99, 71]], ["Turquoise", [64, 224, 208]], ["Violet", [238, 130, 238]], ["Wheat", [245, 222, 179]], ["White", [255, 255, 255]], ["White Smoke", [245, 245, 245]], ["Yellow", [255, 255, 0]], ["Yellow Green", [154, 205, 50]]]
 
+  DARK_COLORS = ["Black", "Dark Green", "Dark Olive Green", "Dark Slate Gray", "Dim Gray",  "Gray", "Indigo", "Midnight Blue", "Navy", "Navy Blue", "Blue Violet", "Brown", "Dark Slate Blue", "Dark Violet", "Firebrick", "Medium Blue", "Medium Violet Red",  "Saddle Brown"]
+
 end
 

data/lib/colorable/color.rb

@@ -2,6 +2,7 @@ module Colorable
   class Color
     class ColorNameError < StandardError; end
     include Colorable::Converter
+    include Comparable
     attr_reader :name, :rgb
 
     def initialize(name_or_rgb)
@@ -29,6 +30,7 @@ module Colorable
     def hsb
       @hsb ||= rgb2hsb(rgb)
     end
+    alias :hsv :hsb
 
     %w(red green blue).each_with_index do |c, i|
       define_method(c) { rgb[i] }
@@ -38,6 +40,25 @@ module Colorable
       define_method(n) { hsb[i] }
     end
 
+    def <=>(other)
+      self.name <=> other.name
+    end
+
+    @@colorset = {}
+    def next(set=:name, n=1)
+      @@colorset[set] ||= Colorable::Colorset[set]
+      idx = @@colorset[set].find_index(self)
+      @@colorset[set].at(idx+n) if idx
+    end
+
+    def prev(set=:name, n=1)
+      self.next(set, -n)
+    end
+
+    def dark?
+      DARK_COLORS.detect { |d| d == self.name }
+    end
+
     private
     def varidate_name(name)
       COLORNAMES.detect do |label, _|

data/lib/colorable/colorset.rb

@@ -9,7 +9,7 @@ module Colorable
     end
 
     # +Colorset[:order]+ create a ordered colorset by passing a order key.
-    def self.[](order, dir=:+)
+    def self.[](order, dir=:+, colorset=nil)
       rgb = [:red, :green, :blue]
       hsb = [:hue, :sat, :bright]
       blk =
@@ -24,9 +24,9 @@ module Colorable
 
       case dir
       when :+
-        new.sort_by(&blk)
+        new(colorset).sort_by(&blk)
       when :-
-        new.sort_by(&blk).reverse
+        new(colorset).sort_by(&blk).reverse
       else
         raise ArgumentError, "it must ':+' or ':-'"
       end
@@ -36,17 +36,21 @@ module Colorable
       @colorset.each(&blk)
     end
 
+    def size
+      @colorset.size
+    end
+
     def at(pos=0)
-      @colorset[pos]
+      @colorset[pos%size]
     end
 
     def next(n=1)
-      @pos += n
+      @pos = (@pos+n)%size
       at @pos
     end
 
     def prev(n=1)
-      @pos -= n
+      @pos = (@pos-n)%size
       at @pos
     end
 
@@ -63,6 +67,10 @@ module Colorable
       @colorset.first(n)
     end
 
+    def find_index(color)
+      @colorset.find_index { |c| c == color }
+    end
+
     def sort_by(&blk)
       self.class.new @colorset.sort_by(&blk)
     end
@@ -70,5 +78,9 @@ module Colorable
     def reverse
       self.class.new @colorset.reverse
     end
+ 
+    def to_a
+      @colorset
+    end
   end
 end

data/lib/colorable/version.rb

@@ -1,3 +1,3 @@
 module Colorable
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/color_spec.rb

@@ -44,17 +44,57 @@ describe Colorable::Color do
     end
   end
 
-  context "#hex" do
+  describe "#hex" do
     it { color.new("Alice Blue").hex.should eql "#F0F8FF" }
     it { color.new("Khaki").hex.should eql "#F0E68C" }
     it { color.new("Mint Cream").hex.should eql "#F5FFFA" }
     it { color.new("Thistle").hex.should eql "#D8BFD8" }
   end
 
-  context "#hsb" do
+  describe "#hsb" do
     it { color.new("Alice Blue").hsb.should eql [208, 6, 100] }
     it { color.new("Khaki").hsb.should eql [55, 42, 94] }
     it { color.new("Mint Cream").hsb.should eql [150, 4, 100] }
     it { color.new("Thistle").hsb.should eql [300, 12, 85] }
   end
+
+  describe "#next" do
+    context "when no argument" do
+      it "returns next color in name order" do
+        @c = color.new("khaki")
+        @c.next.name.should eql "Lavender"
+      end
+    end
+
+    context "when :hsb passed" do
+      it "returns next color in hsb order" do
+        @c = color.new("khaki")
+        @c.next(:hsb).name.should eql "Dark Khaki"
+      end
+    end
+
+    context "when color is not in X11 colorset" do
+      it "returns nil" do
+        @c = color.new([100,10,10])
+        @c.next.should be_nil
+      end
+    end
+  end
+
+  describe "#prev" do
+    context "when no argument" do
+      it "returns prev color in name order" do
+        @c = color.new("Alice Blue")
+        @c.prev.name.should eql "Yellow Green"
+      end
+    end
+
+    context "when :hsb passed" do
+      it "returns prev color in hsb order" do
+        @c = color.new("Yellow")
+        @c.prev(:hsb).name.should eql "Olive"
+      end
+    end
+  end
+
 end

data/spec/colorset_spec.rb

@@ -41,6 +41,12 @@ describe Colorable::Colorset do
       it { @cs.at.to_s.should eql 'rgb(0,0,0)' }
       it { @cs.at(1).to_s.should eql 'rgb(0,0,128)' }
     end
+
+    context "when argument exceed colorset size" do
+      it "acts like linked list" do
+        colorset.new.at(144).name.should eql "Alice Blue"
+      end
+    end
   end
 
   describe "#next" do
@@ -63,4 +69,10 @@ describe Colorable::Colorset do
     before(:all) { @cs = colorset.new }
     it { @cs.next(10); @cs.rewind.should eql @cs.at }
   end
+
+  describe "#size" do
+    it "returns size of colorset" do
+      colorset.new.size.should eql 144
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colorable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec