colorscheme 0.0.1 → 0.0.2

data/README.md

@@ -36,8 +36,7 @@ Or install it yourself as:
 ## Usage
 
 ```
-scheme = Colorscheme::Colorscheme.new(Color.RGB.new(255,0,0))
-scheme.triadic!
+scheme = Colorscheme::Triadic.new(Color.RGB.new(255,0,0))
 scheme.colors # is an array of three colors
 ```
 

data/lib/colorscheme/algorithms.rb

@@ -0,0 +1,29 @@
+module Colorscheme
+  module Algorithms
+
+    def analogous(source, degrees)
+      [rotate_color(source, degrees), rotate_color(source, -degrees)]
+    end
+
+    def complementary(source)
+      rotate_color(source, 180)
+    end
+
+    def rotate_color(source, degrees)
+      hsl = source.to_hsl
+      h = 360.0 * hsl.h + degrees
+      Color::HSL.new(h, hsl.s * 100, hsl.l * 100).to_rgb
+    end
+
+    def text_color(source)
+      sum = source.red + source.green + source.blue
+      if sum > 382.5
+        return Color::RGB.new(0,0,0)
+      else
+        return Color::RGB.new(255,255,255)
+      end
+    end
+
+
+  end
+end

data/lib/colorscheme/analogous.rb

@@ -0,0 +1,10 @@
+require 'colorscheme/colorscheme'
+module Colorscheme
+  class Analogous < Colorscheme
+    def initialize(color=nil, degrees=30)
+      super(color)
+      @colors.push(@source_color)
+      @colors.concat analogous(@source_color, degrees)
+    end
+  end
+end

data/lib/colorscheme/colorscheme.rb

@@ -1,59 +1,12 @@
 require 'color'
+require 'colorscheme/algorithms'
 module Colorscheme
   class Colorscheme
+    include Algorithms
     attr_accessor :colors, :source_color
-    def initialize(options={})
+    def initialize(color=nil)
       @colors = []
-      @source_color = options[:source] if options.has_key?(:source)
-    end
-
-    def complementary!
-      @colors = []
-      @colors.push(@source_color)
-      @colors.push(complementary(@source_color))
-    end
-
-    def rotate_color(source, degrees)
-      hsl = source.to_hsl
-      h = 360.0 * hsl.h + degrees
-      Color::HSL.new(h, hsl.s * 100, hsl.l * 100).to_rgb
-    end
-
-    def complementary(source)
-      rotate_color(source, 180)
-    end
-
-    def analogous!(degrees)
-      @colors = []
-      @colors.push(@source_color)
-      @colors.concat analogous(@source_color, degrees)
-    end
-
-    def analogous(source, degrees)
-      [rotate_color(source, degrees), rotate_color(source, -degrees)]
-    end
-
-    def split_complementary!(degrees)
-      @colors = []
-      @colors.push @source_color
-      complementary = complementary(@source_color)
-      analogous_to_complementary = analogous(complementary, degrees)
-      @colors.push complementary
-      @colors.concat analogous_to_complementary
-    end
-
-    def triadic!
-      @colors = []
-      @colors.push @source_color
-      @colors.concat analogous(@source_color, 120)
-    end
-
-    def squared!
-      @colors = []
-      @colors.push @source_color
-      @colors.push rotate_color(@source_color, 90)
-      @colors.push rotate_color(@source_color, 180)
-      @colors.push rotate_color(@source_color, 270)
+      @source_color = color
     end
   end
 end

data/lib/colorscheme/complementary.rb

@@ -0,0 +1,10 @@
+require 'colorscheme/colorscheme'
+module Colorscheme
+  class Complementary < Colorscheme
+    def initialize(color=nil)
+      super(color)
+      @colors.push(@source_color)
+      @colors.push(complementary(@source_color))
+    end
+  end
+end

data/lib/colorscheme/split_complementary.rb

@@ -0,0 +1,13 @@
+require 'colorscheme/colorscheme'
+module Colorscheme
+  class SplitComplementary < Colorscheme
+    def initialize(color=nil, degrees=30)
+      super(color)
+      @colors.push @source_color
+      complementary = complementary(@source_color)
+      analogous_to_complementary = analogous(complementary, degrees)
+      @colors.push complementary
+      @colors.concat analogous_to_complementary
+    end
+  end
+end

data/lib/colorscheme/squared.rb

@@ -0,0 +1,12 @@
+require 'colorscheme/colorscheme'
+module Colorscheme
+  class Squared < Colorscheme
+    def initialize(color=nil)
+      super(color)
+      @colors.push @source_color
+      @colors.push rotate_color(@source_color, 90)
+      @colors.push rotate_color(@source_color, 180)
+      @colors.push rotate_color(@source_color, 270)
+    end
+  end
+end

data/lib/colorscheme/triadic.rb

@@ -0,0 +1,11 @@
+require 'colorscheme/colorscheme'
+module Colorscheme
+  class Triadic < Colorscheme
+    def initialize(color=nil)
+      super(color)
+      @colors.push @source_color
+      @colors.push rotate_color(@source_color, 120)
+      @colors.push rotate_color(@source_color, 240)
+    end
+  end
+end

data/lib/colorscheme/version.rb

@@ -1,3 +1,3 @@
 module Colorscheme
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/colorscheme/analogous_spec.rb

@@ -0,0 +1,15 @@
+require 'colorscheme/analogous'
+describe Colorscheme::Analogous do
+  it "gets adjacent colors" do
+    color = Color::RGB.new(255,0,0)
+    adj1 = Color::HSL.new(30,100,50)
+    adj2 = Color::HSL.new(-30,100,50)
+    scheme = Colorscheme::Analogous.new(color, 30)
+
+    scheme.colors.first.should equal(color)
+    scheme.colors[1].html.should eq(adj1.html)
+    scheme.colors.last.html.should eq(adj2.html)
+  end
+end
+
+

data/spec/lib/colorscheme/colorscheme_spec.rb

@@ -1,12 +1,6 @@
 require 'colorscheme/colorscheme'
 
 describe Colorscheme::Colorscheme do
-  describe ".new" do
-    it "can be instantiated by calling new" do
-      Colorscheme::Colorscheme.new
-    end
-  end
-
   describe ".colors" do
     it "has an array of colors" do
       scheme = Colorscheme::Colorscheme.new
@@ -17,83 +11,35 @@ describe Colorscheme::Colorscheme do
   describe ".source_color" do
     it "sets the source_color on the object" do
       color = Color::RGB.new(1,2,3)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
+      scheme = Colorscheme::Colorscheme.new(color)
       scheme.source_color.should equal(color)
     end
   end
 
-  describe ".complementary" do
-    it "gets the complementary color as well as the original" do
-      color = Color::RGB.new(255,0,0)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
-      scheme.complementary!
-      scheme.colors.first.should equal(color)
-      scheme.colors.last.html.should eq(Color::RGB.new(0,255,255).html)
-    end
-  end
-
-  describe ".analogous" do
-    it "gets adjacent colors" do
-      color = Color::RGB.new(255,0,0)
-      adj1 = Color::HSL.new(30,100,50)
-      adj2 = Color::HSL.new(-30,100,50)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
-
-      scheme.analogous!(30)
-
-      scheme.colors.first.should equal(color)
-      scheme.colors[1].html.should eq(adj1.html)
-      scheme.colors.last.html.should eq(adj2.html)
+  describe ".text_color" do
+    it "selects black for white source" do
+      color = Color::RGB.new(255,255,255)
+      scheme = Colorscheme::Colorscheme.new
+      text_color = scheme.text_color(color)
+      text_color.html.should eq('#000000')
     end
-  end
-
-  describe ".split_complementary" do
-    it "gets the complementary color, and its analogous colors" do
-      color = Color::RGB.new(0,255,255)
-      complementary = Color::RGB.new(255,0,0)
-      adj1 = Color::HSL.new(30,100,50)
-      adj2 = Color::HSL.new(-30,100,50)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
-
-      scheme.split_complementary!(30)
-
-      scheme.colors.first.should equal(color)
-      scheme.colors[1].html.should eq(complementary.html)
-      scheme.colors[2].html.should eq(adj1.html)
-      scheme.colors[3].html.should eq(adj2.html)
-
+    it "selects white for black source" do
+      color = Color::RGB.new(0,0,0)
+      scheme = Colorscheme::Colorscheme.new
+      text_color = scheme.text_color(color)
+      text_color.html.should eq('#ffffff')
     end
-  end
-
-  describe ".triadic" do
-    it "gets triadic colors for source" do
-      color = Color::RGB.new(255,0,0)
-      triadic1 = Color::RGB.new(0,255,0)
-      triadic2 = Color::RGB.new(0,0,255)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
-
-      scheme.triadic!
-
-      scheme.colors.first.should equal(color)
-      scheme.colors[1].html.should eq(triadic1.html)
-      scheme.colors[2].html.should eq(triadic2.html)
+    it "selects white for #666666" do
+      color = Color::RGB.from_html('#666666')
+      scheme = Colorscheme::Colorscheme.new
+      text_color = scheme.text_color(color)
+      text_color.html.should eq('#ffffff')
     end
-  end
-
-  describe ".squared" do
-    it "gets equally spaced colors for source" do
-      color = Color::RGB.new(255,0,0)
-      quad1 = Color::HSL.new(90, 100, 50)
-      quad2 = Color::HSL.new(180, 100, 50)
-      quad3 = Color::HSL.new(270, 100, 50)
-      scheme = Colorscheme::Colorscheme.new({:source => color})
-
-      scheme.squared!
-
-      scheme.colors.first.should equal(color)
-      scheme.colors[1].html.should eq(quad1.html)
-      scheme.colors[2].html.should eq(quad2.html)
-      scheme.colors[3].html.should eq(quad3.html)
+    it "selects black for #aaaaaa" do
+      color = Color::RGB.from_html('#aaaaaa')
+      scheme = Colorscheme::Colorscheme.new
+      text_color = scheme.text_color(color)
+      text_color.html.should eq('#000000')
     end
   end
 end

data/spec/lib/colorscheme/complementary_spec.rb

@@ -0,0 +1,9 @@
+require 'colorscheme/complementary'
+describe Colorscheme::Complementary do
+  it "gets the complementary color as well as the original" do
+    color = Color::RGB.new(255,0,0)
+    scheme = Colorscheme::Complementary.new(color)
+    scheme.colors.first.should equal(color)
+    scheme.colors.last.html.should eq(Color::RGB.new(0,255,255).html)
+  end
+end

data/spec/lib/colorscheme/split_complementary_spec.rb

@@ -0,0 +1,18 @@
+require 'colorscheme/split_complementary'
+describe Colorscheme::SplitComplementary do
+  it "gets the complementary color, and its analogous colors" do
+    color = Color::RGB.new(0,255,255)
+    complementary = Color::RGB.new(255,0,0)
+    adj1 = Color::HSL.new(30,100,50)
+    adj2 = Color::HSL.new(-30,100,50)
+    scheme = Colorscheme::SplitComplementary.new(color)
+
+    scheme.colors.first.should equal(color)
+    scheme.colors[1].html.should eq(complementary.html)
+    scheme.colors[2].html.should eq(adj1.html)
+    scheme.colors[3].html.should eq(adj2.html)
+
+  end
+end
+
+

data/spec/lib/colorscheme/squared_spec.rb

@@ -0,0 +1,17 @@
+require 'colorscheme/squared.rb'
+describe Colorscheme::Squared do
+  it "gets equally spaced colors for source" do
+    color = Color::RGB.new(255,0,0)
+    quad1 = Color::HSL.new(90, 100, 50)
+    quad2 = Color::HSL.new(180, 100, 50)
+    quad3 = Color::HSL.new(270, 100, 50)
+    scheme = Colorscheme::Squared.new(color)
+
+    scheme.colors.first.should equal(color)
+    scheme.colors[1].html.should eq(quad1.html)
+    scheme.colors[2].html.should eq(quad2.html)
+    scheme.colors[3].html.should eq(quad3.html)
+  end
+end
+
+

data/spec/lib/colorscheme/triadic_spec.rb

@@ -0,0 +1,15 @@
+require 'colorscheme/triadic'
+describe Colorscheme::Triadic do
+  it "gets triadic colors for source" do
+    color = Color::RGB.new(255,0,0)
+    triadic1 = Color::RGB.new(0,255,0)
+    triadic2 = Color::RGB.new(0,0,255)
+    scheme = Colorscheme::Triadic.new(color)
+
+    scheme.colors.first.should equal(color)
+    scheme.colors[1].html.should eq(triadic1.html)
+    scheme.colors[2].html.should eq(triadic2.html)
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colorscheme
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color
@@ -74,9 +74,20 @@ files:
 - Rakefile
 - colorscheme.gemspec
 - lib/colorscheme.rb
+- lib/colorscheme/algorithms.rb
+- lib/colorscheme/analogous.rb
 - lib/colorscheme/colorscheme.rb
+- lib/colorscheme/complementary.rb
+- lib/colorscheme/split_complementary.rb
+- lib/colorscheme/squared.rb
+- lib/colorscheme/triadic.rb
 - lib/colorscheme/version.rb
+- spec/lib/colorscheme/analogous_spec.rb
 - spec/lib/colorscheme/colorscheme_spec.rb
+- spec/lib/colorscheme/complementary_spec.rb
+- spec/lib/colorscheme/split_complementary_spec.rb
+- spec/lib/colorscheme/squared_spec.rb
+- spec/lib/colorscheme/triadic_spec.rb
 - spec/spec_helper.rb
 homepage: http://clauswitt.com/gems/colorscheme
 licenses: []
@@ -103,5 +114,10 @@ signing_key:
 specification_version: 3
 summary: Given a source - a website, and image or a color - the gem returns a colorscheme
 test_files:
+- spec/lib/colorscheme/analogous_spec.rb
 - spec/lib/colorscheme/colorscheme_spec.rb
+- spec/lib/colorscheme/complementary_spec.rb
+- spec/lib/colorscheme/split_complementary_spec.rb
+- spec/lib/colorscheme/squared_spec.rb
+- spec/lib/colorscheme/triadic_spec.rb
 - spec/spec_helper.rb