colorable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4a1f54afeb206a7c833d741172a8f4886d668d
-  data.tar.gz: 03240466ab3c82a9adf566349858bee303cc7968
+  metadata.gz: d632dab9e8eb142bf07ac4a9390e42211092031d
+  data.tar.gz: 9947396d86fc127a78a2c83912edfb520c061530
 SHA512:
-  metadata.gz: 58bc7a8448a6135f7a0471eeaa03bdbe3bea4c2450f7f85ffecadc96477438bbe6cc39bc5f561a0378185d7a79fc2e5fdf4f51c04b4b5f78c25d53bbcb0b22ed
-  data.tar.gz: e3eecb0216ed4ba8d0eeef6c6c6b81ba46574d4a05364d9b7bf0ae45a5487100fb9a032293d0adbb119d7216870d1660d2b39771788d686981041f85d6c340a9
+  metadata.gz: 168f110be434072d078e4255db6db262b6e563b8b00f0d072f002def13c9647f1f82cc193df38f90b91f7a26b65f6fd485de9162b8dbd0bfe2524c9c6f225c21
+  data.tar.gz: 93344cf79f3c319d497e22c2252f159f5472bd614984a776191d44b7b8adb5c0814a3eb623eb498fa008b97a693ae14a65d12375e76afbe4f234a6c8e6ead4a9

data/lib/colorable/colorset.rb

@@ -41,22 +41,22 @@ module Colorable
     end
 
     def at(pos=0)
-      @colorset[pos%size]
+      @colorset[(@pos+pos)%size]
     end
 
     def next(n=1)
       @pos = (@pos+n)%size
-      at @pos
+      at
     end
 
     def prev(n=1)
       @pos = (@pos-n)%size
-      at @pos
+      at
     end
 
     def rewind
       @pos = 0
-      at @pos
+      at
     end
   
     def last(n=1)
@@ -82,5 +82,10 @@ module Colorable
     def to_a
       @colorset
     end
+
+    def to_s
+      "#<%s %d/%d pos='%s:%s'>" % [:Colorset, @pos, size, at.name, at]
+    end
+    alias :inspect :to_s
   end
 end

data/lib/colorable/version.rb

@@ -1,3 +1,3 @@
 module Colorable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/colorset_spec.rb

@@ -12,20 +12,20 @@ describe Colorable::Colorset do
   describe ".[](order)" do
     context "when :rgb passed" do
       before(:all) { @cs = colorset[:rgb] }
-      it { @cs.take(3).to_s.should eql '[rgb(0,0,0), rgb(0,0,128), rgb(0,0,139)]' }
-      it { @cs.last.to_s.should eql '[rgb(255,255,255)]' }
+      it { @cs.take(3).map(&:to_s).should eql ['rgb(0,0,0)', 'rgb(0,0,128)', 'rgb(0,0,139)'] }
+      it { @cs.last.map(&:to_s).should eql ['rgb(255,255,255)'] }
     end
 
     context "when :red" do
       before(:all) { @cs = colorset[:red] }
-      it { @cs.take(3).to_s.should eql '[rgb(0,0,0), rgb(0,0,128), rgb(0,0,139)]' }
-      it { @cs.last.to_s.should eql '[rgb(255,255,255)]' }
+      it { @cs.take(3).map(&:to_s).should eql ['rgb(0,0,0)', 'rgb(0,0,128)', 'rgb(0,0,139)'] }
+      it { @cs.last.map(&:to_s).should eql ['rgb(255,255,255)'] }
     end
 
     context "when :green in descent order" do
       before(:all) { @cs = colorset[:green, :-] }
-      it { @cs.take(3).to_s.should eql '[rgb(255,255,255), rgb(255,255,240), rgb(255,255,224)]' }
-      it { @cs.last(3).to_s.should eql '[rgb(0,0,139), rgb(0,0,128), rgb(0,0,0)]' }
+      it { @cs.take(3).map(&:to_s).should eql ['rgb(255,255,255)', 'rgb(255,255,240)', 'rgb(255,255,224)'] }
+      it { @cs.last(3).map(&:to_s).should eql ['rgb(0,0,139)', 'rgb(0,0,128)', 'rgb(0,0,0)'] }
     end
   end
 
@@ -51,23 +51,22 @@ describe Colorable::Colorset do
 
   describe "#next" do
     before(:all) { @cs = colorset.new }
-    it { @cs.next.should eql @cs.at(1) }
-    it { @cs.next.should eql @cs.at(2) }
-    it { @cs.next.should eql @cs.at(3) }
-    it { @cs.next(2).should eql @cs.at(5) }
+    it { @cs.next.name.should eql 'Antique White' }
+    it { @cs.next.name.should eql 'Aqua' }
+    it { @cs.next(2).name.should eql 'Azure' }
   end
 
   describe "#prev" do
     before(:all) { @cs = colorset[:hsb] }
-    it { @cs.prev.should eql @cs.at(-1) }
-    it { @cs.prev.should eql @cs.at(-2) }
-    it { @cs.prev.should eql @cs.at(-3) }
-    it { @cs.prev(2).should eql @cs.at(-5) }
+    it { @cs.prev.name.should eql 'Light Pink' }
+    it { @cs.prev.name.should eql 'Pink' }
+    it { @cs.prev.name.should eql 'Crimson' }
+    it { @cs.prev(2).name.should eql 'Lavender Blush' }
   end
 
   describe "#rewind" do
     before(:all) { @cs = colorset.new }
-    it { @cs.next(10); @cs.rewind.should eql @cs.at }
+    it { @cs.next(10); @cs.rewind.name.should eql 'Alice Blue' }
   end
 
   describe "#size" do
@@ -75,4 +74,10 @@ describe Colorable::Colorset do
       colorset.new.size.should eql 144
     end
   end
+
+  describe "#to_s" do
+    before(:all) { @cs = colorset.new }
+    it { @cs.to_s.should eql "#<Colorset 0/144 pos='Alice Blue:rgb(240,248,255)'>"}
+    it { @cs.next;@cs.to_s.should eql "#<Colorset 1/144 pos='Antique White:rgb(250,235,215)'>"}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple color handler which provide a conversion between colorname, RGB,