colorable 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4862f2760ecd40037e08051beda7ced338b1c589
-  data.tar.gz: f4882f6046fd30d8c098199ccc7681768013cff5
+  metadata.gz: cd1ee00539ef3544f0938729f93a1abc32c3b3ec
+  data.tar.gz: 72879c844b5456ad6908cf0875cc5468f553b0ea
 SHA512:
-  metadata.gz: 9142e066151a08d31ce9b57107d47d1f640432631267f70db272625eaade9bca54da1f7e750686666b1180f6b7e33cd28c4d7fe9bc4524a3c68cfd720226ce8c
-  data.tar.gz: bba5baf4843abe1c52112b3fc1ee78c4f09066b2b6fb28015ce456aee93cf19e5fc72f653d1693876ef23a44eac2d3262e1e55842cfa6c9bf12201474ba56519
+  metadata.gz: a04a172d115e8c82c5f0d6746bebebd90670e74ac8a7a97bf8369c961a37de9e2825ef7ba6f57199862ef0253910af6d79d20ff20ef7bdc8ed925c7296d2694a
+  data.tar.gz: fe15f0a313eea761fbd741398159dad8d8aaa26d4f56f74b9ff1ff45a48cfaa571537578b4ccb95db1f02a88919b10ab91ea52ef8f10a3f79e8d4f25eb83a6a2

data/lib/colorable/colorset.rb

@@ -1,6 +1,9 @@
+require "forwardable"
+
 module Colorable
   class Colorset
     include Enumerable
+    extend Forwardable
 
     def initialize(colorset=nil)
       @pos = 0
@@ -8,6 +11,8 @@ module Colorable
         colorset || COLORNAMES.map { |name, rgb| Colorable::Color.new(name) }
     end
 
+    def_delegators :@colorset, :size, :first, :last, :to_a
+
     # +Colorset[:order]+ create a ordered colorset by passing a order key.
     def self.[](order, dir=:+, colorset=nil)
       rgb = [:red, :green, :blue]
@@ -36,10 +41,6 @@ module Colorable
       @colorset.each(&blk)
     end
 
-    def size
-      @colorset.size
-    end
-
     def at(pos=0)
       @colorset[(@pos+pos)%size]
     end
@@ -59,16 +60,9 @@ module Colorable
       at
     end
   
-    def last(n=1)
-      @colorset.last(n)
-    end
-
-    def first(n=1)
-      @colorset.first(n)
-    end
-
     def find_index(color)
-      @colorset.find_index { |c| c == color }
+      idx = @colorset.find_index { |c| c == color }
+      (@pos+idx)%size if idx
     end
 
     def sort_by(&blk)
@@ -79,10 +73,6 @@ module Colorable
       self.class.new @colorset.reverse
     end
  
-    def to_a
-      @colorset
-    end
-
     def to_s
       "#<%s %d/%d pos='%s:%s'>" % [:Colorset, @pos, size, at.name, at]
     end

data/lib/colorable/version.rb

@@ -1,3 +1,3 @@
 module Colorable
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/colorset_spec.rb

@@ -13,13 +13,13 @@ describe Colorable::Colorset do
     context "when :rgb passed" do
       before(:all) { @cs = colorset[:rgb] }
       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)'] }
+      it { @cs.last.to_s.should eql 'rgb(255,255,255)' }
     end
 
     context "when :red" do
       before(:all) { @cs = colorset[:red] }
       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)'] }
+      it { @cs.last.to_s.should eql 'rgb(255,255,255)' }
     end
 
     context "when :green in descent order" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorable
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec