colorable 0.1.4 → 0.2.0

data/lib/colorable/colorset.rb

@@ -62,7 +62,7 @@ module Colorable
     end
  
     def to_s
-      "#<%s %d/%d pos='%s/%s/%s'>" % [:Colorset, @pos, size, at.name, at.rgb, at.hsb]
+      "#<%s %d/%d pos='%s<%s/%s>'>" % [self.class, @pos, size, at.name, at._rgb, at._hsb]
     end
     alias :inspect :to_s
 
@@ -90,11 +90,11 @@ module Colorable
       order_cond =
         case order
         when *rgb_part
-          ->color{ color.rgb.move_to_top rgb_part.index(order) }
+          ->color{ color._rgb.move_to_top rgb_part.index(order) }
         when *hsb_part
-          ->color{ color.hsb.move_to_top hsb_part.index(order) }
+          ->color{ color._hsb.move_to_top hsb_part.index(order) }
         when :name, :rgb, :hsb, :hsv, :hex
-          ->color{ color.send order }
+          ->color{ color.send "_#{order}" }
         end
 
       case opt[:dir].intern

data/lib/colorable/version.rb

@@ -1,3 +1,3 @@
 module Colorable
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/spec/color_space_spec.rb

@@ -35,28 +35,45 @@ describe RGB do
       before(:all) { @rgb = RGB.new(100, 100, 100) }
       subject { @rgb + [0, 50, 100] }
       its(:rgb) { should eql [100, 150, 200] }
-      it "keep original same" do @rgb.rgb.should eql [100, 100, 100] end
+      it "keep original same" do
+        @rgb.rgb.should eql [100, 100, 100]
+      end
     end
 
     context "when '+' makes out of RGB range or rack of numbers" do
       it "raise ArgumentError" do
-        expect { RGB.new(100, 100, 100) + [0, 50, 200] }.to raise_error ArgumentError
-        expect { RGB.new(100, 100, 100) + [0, -150, 0] }.to raise_error ArgumentError
         expect { RGB.new(100, 100, 100) + [0, 150] }.to raise_error ArgumentError
       end
+
+      it "not raise ArgumentError" do
+        expect { RGB.new(100, 100, 100) + [0, 50, 200] }.not_to raise_error ArgumentError
+        expect { RGB.new(100, 100, 100) + [0, -150, 0] }.not_to raise_error ArgumentError
+      end
     end
 
     context "pass a Fixnum" do
       before(:all) { @rgb = RGB.new(100, 100, 100) }
       it { (@rgb + 50).rgb.should eql [150, 150, 150] }
-      it "raise ArgumentError" do
-        expect { @rgb + 160 }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { @rgb + 160 }.not_to raise_error ArgumentError
       end
     end
 
     context "coerce make Fixnum#+ accept rgb object" do
       it { (10 + RGB.new(100, 100, 100)).rgb.should eql [110, 110, 110] }
     end
+
+    context "pass a RGB object" do
+      before(:each) do
+        @a = RGB.new(100, 100, 255)
+        @b = RGB.new(255, 100, 100)
+        @c = RGB.new(100, 255, 100)
+      end
+      it { (@a + @b).rgb.should eql [255, 200, 255] }
+      it { (@b + @c).rgb.should eql [255, 255, 200] }
+      it { (@a + @c).rgb.should eql [200, 255, 255] }
+      it { (@a + @b + @c).rgb.should eql [255, 255, 255] }
+    end
   end
 
   describe "#-" do
@@ -64,22 +81,64 @@ describe RGB do
       before(:all) { @rgb = RGB.new(100, 100, 100) }
       subject { @rgb - [0, 50, 100] }
       its(:rgb) { should eql [100, 50, 0] }
-      it "keep original same" do @rgb.rgb.should eql [100, 100, 100] end
+      it "keep original same" do
+        @rgb.rgb.should eql [100, 100, 100]
+      end
     end
 
     context "when '-' makes out of RGB range" do
-      it "raise ArgumentError" do
-        expect { RGB.new(100, 100, 100) - [0, 50, 200] }.to raise_error ArgumentError
-        expect { RGB.new(100, 100, 100) - [0, -250, 0] }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { RGB.new(100, 100, 100) - [0, 50, 200] }.not_to raise_error ArgumentError
+        expect { RGB.new(100, 100, 100) - [0, -250, 0] }.not_to raise_error ArgumentError
       end
     end
 
     context "pass a Fixnum" do
       before(:all) { @rgb = RGB.new(100, 100, 100) }
       it { (@rgb - 50).rgb.should eql [50, 50, 50] }
-      it "raise ArgumentError" do
-        expect { @rgb - 160 }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { @rgb - 160 }.not_to raise_error ArgumentError
+      end
+    end
+
+    context "pass a RGB object" do
+      before(:each) do
+        @a = RGB.new(100, 100, 255)
+        @b = RGB.new(255, 100, 100)
+        @c = RGB.new(100, 255, 100)
       end
+      it { (@a - @b).rgb.should eql [100, 0, 100] }
+      it { (@b - @c).rgb.should eql [100, 100, 0] }
+      it { (@a - @c).rgb.should eql [0, 100, 100] }
+      it { (@a - @b - @c).rgb.should eql [0, 0, 0] }
+    end
+  end
+
+  describe "#*" do
+    context "pass a RGB object" do
+      before(:each) do
+        @a = RGB.new(100, 100, 255)
+        @b = RGB.new(255, 100, 100)
+        @c = RGB.new(100, 255, 100)
+      end
+      it { (@a * @b).rgb.should eql [100, 39, 100] }
+      it { (@b * @c).rgb.should eql [100, 100, 39] }
+      it { (@a * @c).rgb.should eql [39, 100, 100] }
+      it { (@a * @b * @c).rgb.should eql [39, 39, 39] }
+    end
+  end
+
+  describe "#/" do
+    context "pass a RGB object" do
+      before(:each) do
+        @a = RGB.new(100, 100, 255)
+        @b = RGB.new(255, 100, 100)
+        @c = RGB.new(100, 255, 100)
+      end
+      it { (@a / @b).rgb.should eql [255, 161, 255] }
+      it { (@b / @c).rgb.should eql [255, 255, 161] }
+      it { (@a / @c).rgb.should eql [161, 255, 255] }
+      it { (@a / @b / @c).rgb.should eql [255, 255, 255] }
     end
   end
 
@@ -139,11 +198,14 @@ describe HSB do
 
     context "when '+' makes out of HSB range or rack of numbers" do
       it "raise ArgumentError" do
-        expect { HSB.new(300, 70, 90) + [0, 50, 0] }.to raise_error ArgumentError
-        expect { HSB.new(300, 70, 90) + [0, 0, -100] }.to raise_error ArgumentError
         expect { HSB.new(300, 70, 90) + [0, 5] }.to raise_error ArgumentError
         expect { HSB.new(300, 70, 90) + 5 }.to raise_error ArgumentError
       end
+
+      it "not raise ArgumentError" do
+        expect { HSB.new(300, 70, 90) + [60, 50, 0] }.not_to raise_error ArgumentError
+        expect { HSB.new(300, 70, 90) + [0, 0, -100] }.not_to raise_error ArgumentError
+      end
     end
   end
 
@@ -156,9 +218,9 @@ describe HSB do
     end
 
     context "when '-' makes out of HSB range" do
-      it "raise ArgumentError" do
-        expect { HSB.new(300, 7, 90) - [305, 0, 10] }.to raise_error ArgumentError
-        expect { HSB.new(300, 70, 90) - [0, -35, 0] }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { HSB.new(300, 7, 90) - [305, 0, 10] }.not_to raise_error ArgumentError
+        expect { HSB.new(300, 70, 90) - [0, -35, 0] }.not_to raise_error ArgumentError
       end
     end
   end
@@ -283,12 +345,17 @@ describe HEX do
       it { (@hex + '#00ffcc').hex.should eql '#FFFFCC'}
       it { (@hex + '00FFCC').hex.should eql '#FFFFCC'}
       it { (@hex + '#0FC').hex.should eql '#FFFFCC'}
-      it "keep original" do @hex.hex.should eql '#FF0000' end
+      it "keep original" do
+        @hex.hex.should eql '#FF0000'
+      end
     end
 
-    context "out of HEX range" do
+    context "out of HEX range or Array" do
+      it "not raise ArgumentError" do
+        expect { HEX.new('#FF0000') + '#010000' }.not_to raise_error ArgumentError
+      end
+      
       it "raise ArgumentError" do
-        expect { HEX.new('#FF0000') + '#010000' }.to raise_error ArgumentError
         expect { HEX.new('#FF0000') + '#00ffgg' }.to raise_error ArgumentError
         expect { HEX.new('#000000') + [0, 50, 100] }.to raise_error ArgumentError
       end
@@ -297,8 +364,8 @@ describe HEX do
     context "pass a Fixnum" do
       before(:all) { @hex = HEX.new('#000000') }
       it { (@hex + 255).hex.should eql '#FFFFFF' }
-      it "raise ArgumentError" do
-        expect { @hex + 260 }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { @hex + 260 }.not_to raise_error ArgumentError
       end
     end
 
@@ -314,13 +381,18 @@ describe HEX do
       it { (@hex - '#00ffcc').hex.should eql '#000033'}
       it { (@hex - '00FFCC').hex.should eql '#000033'}
       it { (@hex - '#0FC').hex.should eql '#000033'}
-      it "keep original" do @hex.hex.should eql '#00FFFF' end
+      it "keep original" do
+        @hex.hex.should eql '#00FFFF'
+      end
     end
 
-    context "out of HEX range" do
+    context "out of HEX range or Array" do
+      it "not raise ArgumentError" do
+        expect { HEX.new('#FF0000') - '#000100' }.not_to raise_error ArgumentError
+        expect { HEX.new('#FF0000') - '#0000cc' }.not_to raise_error ArgumentError
+      end
+
       it "raise ArgumentError" do
-        expect { HEX.new('#FF0000') - '#000100' }.to raise_error ArgumentError
-        expect { HEX.new('#FF0000') - '#0000cc' }.to raise_error ArgumentError
         expect { HEX.new('#000000') - [0, 50, 100] }.to raise_error ArgumentError
       end
     end
@@ -328,8 +400,8 @@ describe HEX do
     context "pass a Fixnum" do
       before(:all) { @hex = HEX.new('#FFFFFF') }
       it { (@hex - 255).hex.should eql '#000000' }
-      it "raise ArgumentError" do
-        expect { @hex + 260 }.to raise_error ArgumentError
+      it "not raise ArgumentError" do
+        expect { @hex + 260 }.not_to raise_error ArgumentError
       end
     end
 

data/spec/color_spec.rb

@@ -5,19 +5,19 @@ describe Color do
   describe ".new" do
     context "with a string" do
       context "of valid colorname" do
-        it { Color.new("Alice Blue").name.to_s.should eql "Alice Blue" }
-        it { Color.new("Khaki").name.to_s.should eql "Khaki" }
-        it { Color.new("Mint Cream").name.to_s.should eql "Mint Cream" }
-        it { Color.new("Thistle").name.to_s.should eql "Thistle" }
+        it { Color.new("Alice Blue").name.should eql "Alice Blue" }
+        it { Color.new("Khaki").name.should eql "Khaki" }
+        it { Color.new("Mint Cream").name.should eql "Mint Cream" }
+        it { Color.new("Thistle").name.should eql "Thistle" }
       end
 
       context "of valid name variations" do
-        it { Color.new("AliceBlue").name.to_s.should eql "Alice Blue" }
-        it { Color.new("aliceblue").name.to_s.should eql "Alice Blue" }
-        it { Color.new("aliceblue").name.to_s.should eql "Alice Blue" }
-        it { Color.new(:AliceBlue).name.to_s.should eql "Alice Blue" }
-        it { Color.new(:aliceblue).name.to_s.should eql "Alice Blue" }
-        it { Color.new(:alice_blue).name.to_s.should eql "Alice Blue" }
+        it { Color.new("AliceBlue").name.should eql "Alice Blue" }
+        it { Color.new("aliceblue").name.should eql "Alice Blue" }
+        it { Color.new("aliceblue").name.should eql "Alice Blue" }
+        it { Color.new(:AliceBlue).name.should eql "Alice Blue" }
+        it { Color.new(:aliceblue).name.should eql "Alice Blue" }
+        it { Color.new(:alice_blue).name.should eql "Alice Blue" }
       end
 
       context "of invalid name" do
@@ -30,9 +30,9 @@ describe Color do
 
     context "with a HEX string" do
       context "of valid HEX" do
-        it { Color.new("#FFFFFF").hex.to_s.should eql "#FFFFFF" }
-        it { Color.new("#00F").hex.to_s.should eql "#0000FF" }
-        it { Color.new("000000").hex.to_s.should eql "#000000" }
+        it { Color.new("#FFFFFF").hex.should eql "#FFFFFF" }
+        it { Color.new("#00F").hex.should eql "#0000FF" }
+        it { Color.new("000000").hex.should eql "#000000" }
       end
 
       context "of invalid HEX" do
@@ -45,10 +45,10 @@ describe Color do
 
     context "with an array" do
       context "of valid RGB value" do
-        it { Color.new([240, 248, 255]).rgb.to_a.should eql [240, 248, 255] }
-        it { Color.new([240, 230, 140]).rgb.to_a.should eql [240, 230, 140] }
-        it { Color.new([245, 255, 250]).rgb.to_a.should eql [245, 255, 250] }
-        it { Color.new([216, 191, 216]).rgb.to_a.should eql [216, 191, 216] }
+        it { Color.new([240, 248, 255]).rgb.should eql [240, 248, 255] }
+        it { Color.new([240, 230, 140]).rgb.should eql [240, 230, 140] }
+        it { Color.new([245, 255, 250]).rgb.should eql [245, 255, 250] }
+        it { Color.new([216, 191, 216]).rgb.should eql [216, 191, 216] }
       end
 
       context "of invalid RGB value" do
@@ -60,24 +60,31 @@ describe Color do
     end
 
     context "with a RGB or HSB object" do
-      it { Color.new(RGB.new 240, 248, 255).name.to_s.should eql "Alice Blue" }
-      it { Color.new(HSB.new 208, 6, 100).name.to_s.should eql "Alice Blue" }
-      it { Color.new(HEX.new '#F0F8FF').name.to_s.should eql "Alice Blue" }
+      it { Color.new(RGB.new 240, 248, 255).name.should eql "Alice Blue" }
+      it { Color.new(HSB.new 208, 6, 100).name.should eql "Alice Blue" }
+      it { Color.new(HEX.new '#F0F8FF').name.should eql "Alice Blue" }
     end
   end
 
+  describe "#_name,#_hex,#_rgb,#_hsb" do
+    it { Color.new("Alice Blue")._name.should be_instance_of NAME }
+    it { Color.new("Alice Blue")._hex.should be_instance_of HEX }
+    it { Color.new("Alice Blue")._rgb.should be_instance_of RGB }
+    it { Color.new("Alice Blue")._hsb.should be_instance_of HSB }
+  end
+
   describe "#hex" do
-    it { Color.new("Alice Blue").hex.to_s.should eql "#F0F8FF" }
-    it { Color.new("Khaki").hex.to_s.should eql "#F0E68C" }
-    it { Color.new("Mint Cream").hex.to_s.should eql "#F5FFFA" }
-    it { Color.new("Thistle").hex.to_s.should eql "#D8BFD8" }
+    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
 
   describe "#hsb" do
-    it { Color.new("Alice Blue").hsb.to_a.should eql [208, 6, 100] }
-    it { Color.new("Khaki").hsb.to_a.should eql [55, 42, 94] }
-    it { Color.new("Mint Cream").hsb.to_a.should eql [150, 4, 100] }
-    it { Color.new("Thistle").hsb.to_a.should eql [300, 12, 85] }
+    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 '#red, #green, #blue, #hue, #sat, #bright' do
@@ -119,7 +126,7 @@ describe Color do
     end
 
     context "when color is not in X11 colorset" do
-      it { Color.new([100,10,10]).name.should be_nil }
+      it { Color.new([100,10,10]).name.should be_empty }
     end
   end
 
@@ -152,7 +159,7 @@ describe Color do
     end
 
     context "when color is not in X11 colorset" do
-      it { Color.new([100,10,10]).name.should be_nil }
+      it { Color.new([100,10,10]).name.should be_empty }
     end
   end
 
@@ -177,10 +184,6 @@ describe Color do
   end
 
   describe "#to_s" do
-    context "default" do
-      it { Color.new(:alice_blue).to_s.should eql "Alice Blue" }
-    end
-
     context "with name mode" do
       before do
         @c = Color.new(:alice_blue)
@@ -209,6 +212,11 @@ describe Color do
     end
   end
 
+  describe "#inspect" do
+    subject { Color.new :alice_blue }
+    its(:inspect) { should eql "#<Colorable::Color 'Alice Blue<rgb(240,248,255)/hsb(208,6,100)/#F0F8FF>'>"}
+  end
+
   describe "#+" do
     context "with :NAME mode" do
       before { @c = Color.new :khaki }
@@ -235,6 +243,24 @@ describe Color do
       it { @c2.to_s.should eql "hsb(350,20,85)" }
       it { @c.to_s.should eql "hsb(250,10,80)" }
     end
+
+    context "pass a RGB object" do
+      before(:each) do
+        @a = Color.new('Red')
+        @b = Color.new('Green')
+        @c = Color.new('Blue')
+        @d = Color.new([255, 0, 0])
+        @e = Color.new([0, 255, 0])
+        @f = Color.new([0, 0, 255])
+      end
+      it { (@a + @b).to_s.should eql "Yellow" }
+      it { (@b + @c).to_s.should eql "Aqua" }
+      it { (@a + @c).to_s.should eql "Fuchsia" }
+      it { (@a + @b + @c).to_s.should eql "White" }
+      it { (@e + @a).to_s.should eql "rgb(255,255,0)" }
+      it { (@f + @b).to_s.should eql "rgb(0,255,255)" }
+      it { (@d + @e + @f).to_s.should eql "rgb(255,255,255)" }
+    end
   end
 
   describe "#-" do
@@ -263,6 +289,64 @@ describe Color do
       it { @c.to_s.should eql "hsb(350,20,85)" }
       it { @c2.to_s.should eql "hsb(250,10,80)" }
     end
+
+    context "pass a RGB object" do
+      before(:each) do
+        @a = Color.new('Red')
+        @b = Color.new('Green')
+        @c = Color.new('Blue')
+        @d = Color.new([255, 0, 0])
+        @e = Color.new([0, 255, 0])
+        @f = Color.new([0, 0, 255])
+      end
+      it { (@a - @b).to_s.should eql "Black" }
+      it { (@b - @c).to_s.should eql "Black" }
+      it { (@a - @c).to_s.should eql "Black" }
+      it { (@a - @b - @c).to_s.should eql "Black" }
+      it { (@e - @a).to_s.should eql "rgb(0,0,0)" }
+      it { (@f - @b).to_s.should eql "rgb(0,0,0)" }
+      it { (@d - @e - @f).to_s.should eql "rgb(0,0,0)" }
+    end
+  end
+
+  describe "#*" do
+    context "pass a RGB object" do
+      before(:each) do
+        @a = Color.new('Red')
+        @b = Color.new('Green')
+        @c = Color.new('Blue')
+        @d = Color.new([255, 0, 0])
+        @e = Color.new([0, 255, 0])
+        @f = Color.new([0, 0, 255])
+      end
+      it { (@a * @b).to_s.should eql "Black" }
+      it { (@b * @c).to_s.should eql "Black" }
+      it { (@a * @c).to_s.should eql "Black" }
+      it { (@a * @b * @c).to_s.should eql "Black" }
+      it { (@e * @a).to_s.should eql "rgb(0,0,0)" }
+      it { (@f * @b).to_s.should eql "rgb(0,0,0)" }
+      it { (@d * @e * @f).to_s.should eql "rgb(0,0,0)" }
+    end
+  end
+
+  describe "#/" do
+    context "pass a RGB object" do
+      before(:each) do
+        @a = Color.new('Red')
+        @b = Color.new('Green')
+        @c = Color.new('Blue')
+        @d = Color.new([255, 0, 0])
+        @e = Color.new([0, 255, 0])
+        @f = Color.new([0, 0, 255])
+      end
+      it { (@a / @b).to_s.should eql "Yellow" }
+      it { (@b / @c).to_s.should eql "Aqua" }
+      it { (@a / @c).to_s.should eql "Fuchsia" }
+      it { (@a / @b / @c).to_s.should eql "White" }
+      it { (@e / @a).to_s.should eql "rgb(255,255,0)" }
+      it { (@f / @b).to_s.should eql "rgb(0,255,255)" }
+      it { (@d / @e / @f).to_s.should eql "rgb(255,255,255)" }
+    end
   end
 
   describe "#dark?" do
@@ -273,12 +357,12 @@ describe Color do
   describe "#info" do
     it 'returns data of the color' do
       info = { 
-        NAME:'Black',
-        RGB:[0, 0, 0],
-        HSB:[0, 0, 0],
-        HEX:'#000000',
-        MODE: :NAME,
-        DARK:true
+        name:'Black',
+        rgb:[0, 0, 0],
+        hsb:[0, 0, 0],
+        hex:'#000000',
+        mode: :NAME,
+        dark:true
       }
       Color.new(:black).info.should eql info
     end