paleta 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03ada62d667c325f97922bd22b05801aff9cccd
-  data.tar.gz: cb7d2375cfcf0ac8cceb96719d1c9cdb13b5af23
+  metadata.gz: e2a306c36ae6e1a659170b8a0e45ef52cc0df8d4
+  data.tar.gz: eeaec953fa8e5a7d6b4d6205d153d464d1ea0e32
 SHA512:
-  metadata.gz: 2a4cd1d750c2f78091b15b904d0d2e599dea95d91922a32b494ecd559bf5fa0eb504cb53e2ca735688efcab05195f573a5944eacaa37cef455d0430282873dbb
-  data.tar.gz: 1eeac708731584488a6a1611a14f3ba7417f3de5693f5144602cee107c43fe6d3b48b296c8dbd411a04561b46cead354641d77262f2aa8608f7a0a299292ad57
+  metadata.gz: 6c8a0bfc98c27f9712446e4f0956ea04ee4efe29b364beb699152a6731479264ea0d2bedd52e0bbd7961a8e3f02f1e8f73dd6d69fb936d81bdbb2c721e03b72e
+  data.tar.gz: 0c30bb441600cc863bcee8f5d7190b502f3741d49f93d4e46e17999f8ff981224bbefe8dff850d43cd390b0355e82b16af52f6fe53e7b0ec5311c4de57bff26c

data/lib/paleta/color.rb

@@ -42,7 +42,15 @@ module Paleta
         end
       elsif args.length == 2 && args[0] == :hex && args[1].is_a?(String)
         # example: new(:hex, "336699")
-        hex_init(args[1])
+        # example: new(:hex, "#336699")
+        # example: new(:hex, "#fff")
+        color_hex = args[1]
+        color_hex = color_hex[1..-1] if color_hex.start_with?('#')
+
+        # These are all string operations to make a "fea" into a "ffeeaa"
+        color_hex = color_hex[0] * 2 + color_hex[1] * 2 + color_hex[2] * 2 if color_hex.length == 3
+
+        hex_init(color_hex)
       elsif args.length == 3 && args[0].is_a?(Numeric) && args[1].is_a?(Numeric) && args[2].is_a?(Numeric)
         # example: new(235, 129, 74)
         rgb_init(args[0], args[1], args[2])

data/lib/paleta/version.rb

@@ -1,3 +1,3 @@
 module Paleta
-  VERSION = '0.2.1'
+  VERSION = "0.2.2"
 end

data/spec/models/color_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paleta::Color do
   it "should initialize with RGB components in 0..255" do
@@ -7,14 +7,35 @@ describe Paleta::Color do
     color.green.should == 161
     color.blue.should == 235
   end
-  
+
   it "should initialize with the :hex flag and a valid 6 character HEX string" do
     color = Paleta::Color.new(:hex, "5EA1EB")
     color.red.should == 94
     color.green.should == 161
     color.blue.should == 235
   end
-  
+
+  it "should initialize with the :hex flag and a valid 7 character HEX string" do
+    color = Paleta::Color.new(:hex, "#5EA1EB")
+    color.red.should == 94
+    color.green.should == 161
+    color.blue.should == 235
+  end
+
+  it "should initialize with the :hex flag and a valid 3 character HEX string" do
+    color = Paleta::Color.new(:hex, "5EA")
+    color.red.should == 85
+    color.green.should == 238
+    color.blue.should == 170
+  end
+
+  it "should initialize with the :hex flag and a valid 4 character HEX string" do
+    color = Paleta::Color.new(:hex, "#5EA")
+    color.red.should == 85
+    color.green.should == 238
+    color.blue.should == 170
+  end
+
   it "should initialize with the :hsl flag, hue in 0..360, and saturation and lightness in 0..100" do
     color = Paleta::Color.new(:hsl, 0, 0, 100)
     color.hue.should == 0
@@ -25,38 +46,38 @@ describe Paleta::Color do
     color.blue.should == 255
     color.hex.should == "FFFFFF"
   end
-  
+
   it "should initialize with the :rgb flag with RGB components in 0..255" do
     color = Paleta::Color.new(:rgb, 94, 161, 235)
     color.red.should == 94
     color.green.should == 161
     color.blue.should == 235
   end
-  
+
   it "should raise an error on an invalid format flag" do
     expect{ Paleta::Color.new(:something, 50, 50, 50) }.to raise_error(ArgumentError)
   end
-  
+
   it "should raise an error on an invalid hex string" do
     expect{ Paleta::Color.new(:hex, "xkfjs") }.to raise_error(ArgumentError)
   end
-  
+
   it "should raise an error on RGB components not in 0..255" do
     expect{ Paleta::Color.new(-74, 333, 4321) }.to raise_error(ArgumentError)
   end
-  
+
   it "should raise an error on hue not in 0..360" do
     expect{ Paleta::Color.new(:hsl, 400, 50, 50) }.to raise_error(ArgumentError)
   end
-  
+
   it "should raise an error on saturation not in 0..100" do
     expect{ Paleta::Color.new(:hsl, 200, 150, 50) }.to raise_error(ArgumentError)
   end
-  
+
   it "should raise an error on lightness not in 0..100" do
     expect{ Paleta::Color.new(:hsl, 200, 50, 150) }.to raise_error(ArgumentError)
   end
-  
+
   it "should determine its equality to another Color" do
     color1 = Paleta::Color.new(237, 172, 33)
     color2 = Paleta::Color.new(:hex, "EDAC21")
@@ -66,51 +87,51 @@ describe Paleta::Color do
     obj = Object.new
     (color1 == obj).should be_false
   end
-  
+
   it "should calculate its HSL value on itialization" do
     color = Paleta::Color.new(237, 172, 33)
     color.hue.to_i.should == 40
     color.saturation.to_i.should == 85
     color.lightness.to_i.should == 52
   end
-  
+
   it "should update its HSL value when its RGB value is updated" do
     color = Paleta::Color.new(237, 172, 33)
-    
+
     color.red = 0
     color.hue.to_i.should == 131
     color.saturation.to_i.should == 100
     color.lightness.to_i.should == 33
-    
+
     color.green = 123
     color.hue.to_i.should == 136
-    color.saturation.to_i.should == 99
+    color.saturation.to_i.should == 100
     color.lightness.to_i.should == 24
-  
+
     color.blue = 241
     color.hue.to_i.should == 209
     color.saturation.to_i.should == 100
     color.lightness.to_i.should == 47
   end
-  
+
   it "should update its RGB value when its HSL value is updated" do
     color = Paleta::Color.new(0, 0, 255)
     color.hue = 120
     color.red.to_i.should == 0
     color.green.to_i.should == 255
     color.blue.to_i.should == 0
-    
+
     color.saturation = 50
     color.red.to_i.should == 63
     color.green.to_i.should == 191
     color.blue.to_i.should == 63
-  
+
     color.lightness = 80
     color.red.to_i.should == 178
     color.green.to_i.should == 229
     color.blue.to_i.should == 178
   end
-  
+
   it "should lighten itself by a percentage" do
     color = Paleta::Color.new(94, 161, 235)
     lightness = color.lightness
@@ -120,7 +141,7 @@ describe Paleta::Color do
     color.lighten!(20)
     color.lightness.should == lightness + 20
   end
-  
+
   it "should return a copy of itself, lightened by a percentage" do
     color = Paleta::Color.new(94, 161, 235)
     lightness = color.lightness
@@ -128,13 +149,13 @@ describe Paleta::Color do
     copy.lightness.should == lightness + 20
     color.lightness.should == lightness
   end
-  
+
   it "should quietly maintain a maximum of 100 when lightening" do
     color = Paleta::Color.new(94, 161, 235)
     color.lighten!(300)
     color.lightness.should == 100
   end
-  
+
   it "should darken by a percentage" do
     color = Paleta::Color.new(94, 161, 235)
     lightness = color.lightness
@@ -144,7 +165,7 @@ describe Paleta::Color do
     color.darken!(20)
     color.lightness.should == lightness - 20
   end
-  
+
   it "should return a copy of itself, darkened by a percentage" do
     color = Paleta::Color.new(94, 161, 235)
     lightness = color.lightness
@@ -152,13 +173,13 @@ describe Paleta::Color do
     copy.lightness.should == lightness - 20
     color.lightness.should == lightness
   end
-  
+
   it "should quietly maintain a minimum of 0 when darkening" do
     color = Paleta::Color.new(94, 161, 235)
     color.darken!(300)
     color.lightness.should == 0
   end
-  
+
   it "should invert" do
     color = Paleta::Color.new(94, 161, 235)
     color.invert!
@@ -166,7 +187,7 @@ describe Paleta::Color do
     color.green.should == 94
     color.blue.should == 20
   end
-  
+
   it "should return an inverted copy of itself" do
     color = Paleta::Color.new(94, 161, 235)
     copy = color.invert
@@ -177,7 +198,7 @@ describe Paleta::Color do
     color.green.should == 161
     color.blue.should == 235
   end
-  
+
   it "should desaturate" do
     color = Paleta::Color.new(94, 161, 235)
     color.desaturate!
@@ -186,7 +207,7 @@ describe Paleta::Color do
     color.green.to_i.should == 164
     color.blue.to_i.should == 164
   end
-  
+
   it "should return a desaturated copy of itself" do
     color = Paleta::Color.new(94, 161, 235)
     copy = color.desaturate
@@ -199,38 +220,38 @@ describe Paleta::Color do
     color.green.should == 161
     color.blue.should == 235
   end
-  
+
   it "should become its complement" do
     color = Paleta::Color.new(:hsl, 90, 50, 50)
     color.complement!
     color.hue.to_i.should == 270
   end
-  
+
   it "should return its complement Color" do
     color = Paleta::Color.new(:hsl, 90, 50, 50)
     complement = color.complement
     complement.hue.to_i.should == 270
   end
-  
+
   it "should calculate its similarity to another Color" do
     color1 = Paleta::Color.new(94, 161, 235)
     color2 = Paleta::Color.new(237, 172, 33)
     color1.similarity(color2).round(5).should == 0.56091
-    
+
     color1 = Paleta::Color.new(237, 172, 33)
     color2 = Paleta::Color.new(237, 172, 33)
     color1.similarity(color2).should == 0
-        
+
     color1 = Paleta::Color.new(0, 0, 0)
     color2 = Paleta::Color.new(255, 255, 255)
     color1.similarity(color2).should == 1
   end
-  
+
   it "should maintain its HEX value" do
     color = Paleta::Color.new(94, 161, 235)
     color.hex.should == "5EA1EB"
   end
-  
+
   it "should update its HSB and RGB components when its HEX value is updated" do
     color = Paleta::Color.new(100, 100, 100)
     color.hex = "ffffff"
@@ -241,7 +262,7 @@ describe Paleta::Color do
     color.saturation.should == 0
     color.lightness.should == 100
   end
-  
+
   it "should return an array of component values" do
     c = Paleta::Color.new(30, 90, 120)
     rgb_array = [c.red, c.green, c.blue]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paleta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jordan Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A little library for creating, manipulating and comparing colors and color