color-converter 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21661f8d4684b788378faf7e5294fa9ac46f22c5
-  data.tar.gz: 18a2c8cc08696a3568c7c8b1680b8b2dc32718a5
+  metadata.gz: 93ca73eb327003cd451e0b28913b6b291041544c
+  data.tar.gz: a0ba32573c471494bf9bad0c94701fb531aa1aaf
 SHA512:
-  metadata.gz: 7e46fd6cc51a8b87c3ce20e9507f288c46f2d5809f382c475b5d7e482c8bc5919e236e82a8405576a27a208e3971011ebdc394475625f999d9b48916c449dd61
-  data.tar.gz: 0bc3b5d9ea124765a63aefbb27aa1e61a0be5f65cd90a8808c5350b242667f929e4c0bd4e8108a13d44fb7f5fbf1e47a398fff59be0998a7018b673abf6b08a7
+  metadata.gz: 21fd054616384a69070329f1cef03664bcc5941b59742dc81e81010a14058528febf6172a01ec7b594a8ebf0c460e8102705488db1204bb2e02132c8f92e9891
+  data.tar.gz: d1bd50de0146e73a1ab96e6d374cbd345e863ed00b3d0c13ae880bbdb99f5253680bb1faec4e0e9d645c39c2351c0e3840308d462068fce5532b1f5092d86663

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.0.0
 branches:
   only:
-  - master
+  - master

data/README.md

@@ -1,4 +1,8 @@
 # ColorConverter
+[![Gem Version](https://badge.fury.io/rb/color-converter.png)](http://badge.fury.io/rb/color-converter)
+[![Build Status](https://travis-ci.org/dkan/color-converter.png?branch=master)](https://travis-ci.org/dkan/color-converter)
+[![Dependency Status](https://gemnasium.com/dkan/color-converter.png)](https://gemnasium.com/dkan/color-converter)
+[![Coverage Status](https://coveralls.io/repos/dkan/color-converter/badge.png)](https://coveralls.io/r/dkan/color-converter)
 
 ColorConverter is a simple way to convert between hexcolor, RGB, and CMYK values.
 
@@ -12,24 +16,20 @@ And then execute:
 
     $ bundle install
 
-## Usage
-
-Convert to hexcolor example:
+## Usage:
 
+    require 'color_converter'
+    
     # Returns a hexcolor code string
     # e.g. "#FFFFFF"
     ColorConverter.hex(255, 255, 255)
     ColorConverter.hex(0, 0, 0, 0)
-
-Convert to RGB example:
-
+    
     # Returns an array of color values
     # e.g. [r, g, b]
     ColorConverter.rgb('#FFFFFF')
     ColorConverter.rgb(0, 0, 0, 0)
-
-Convert to CMYK example:
-
+    
     # Returns an array of color values
     # e.g. [c, m, y, k]
     ColorConverter.cmyk('#000000')

data/lib/color_converter.rb

@@ -1,6 +1,7 @@
 require "color_converter/version"
 
 module ColorConverter
+  HEX = "0123456789ABCDEF".freeze
 
   # Takes RGB or CMYK values as parameters and returns hexcolor code in
   # a string. Raises errors for incorrect inputs.
@@ -16,13 +17,13 @@ module ColorConverter
 
     return values[0] if values.count == 1
 
-    # Raise error if values aren't Fixnums.
-    values.each { |v| raise "Expecting Fixnum." unless v.class == Fixnum }
+    # Raise error if values aren't Integers.
+    ensure_all_integers! values
 
     hex_array = values
-    hex_array = rgb(values[0], values[1], values[2], values[3]) if values.count == 4
+    hex_array = rgb(*values) if values.count == 4
     "#" + hex_array.map do |v|
-      "0123456789ABCDEF"[(v-v%16)/16] + "0123456789ABCDEF"[v%16]
+      HEX[(v-v%16)/16] + HEX[v%16]
     end.join
   end
 
@@ -41,11 +42,11 @@ module ColorConverter
     return values if values.count == 3
 
     if values.count == 1
-      hex_to_rgb(values[0])
+      hex_to_rgb(*values)
     elsif values.count == 4
-      # Raise error if values aren't Fixnums.
-      values.each { |v| raise "Expecting Fixnum." unless v.class == Fixnum }
-      cmyk_to_rgb(values[0], values[1], values[2], values[3])
+      # Raise error if values aren't Integers.
+      ensure_all_integers! values
+      cmyk_to_rgb(*values)
     end
   end
 
@@ -65,12 +66,11 @@ module ColorConverter
 
     # Set cmky_array to array of RGB values.
     cmyk_array = values
-    cmyk_array = rgb(values[0]) if values.count == 1
+    cmyk_array = rgb(*values) if values.count == 1
 
-    # Raise error if values aren't Fixnums
-    cmyk_array.each { |v| raise "Expecting Fixnum." unless v.class == Fixnum }
-
-    rgb_to_cmyk(cmyk_array[0], cmyk_array[1], cmyk_array[2])
+    # Raise error if values aren't Integers
+    ensure_all_integers! cmyk_array
+    rgb_to_cmyk(*cmyk_array)
   end
 
   # Returns RGB values in array from hexcolor code.
@@ -123,4 +123,9 @@ module ColorConverter
   def self.correct_values? (values)
     [1, 3, 4].include? values.count
   end
+
+  # Raise error if values are not Integers.
+  def self.ensure_all_integers! (values)
+    raise "Expecting Integers." unless values.all?(&:integer?)
+  end
 end

data/lib/color_converter/version.rb

@@ -1,5 +1,5 @@
 module Color
   module Converter
-    VERSION = "0.0.1"
+    VERSION = "1.0.0"
   end
 end

data/spec/color_converter_spec.rb

@@ -2,70 +2,70 @@ require 'spec_helper'
 
 describe ColorConverter do
   context "#hex" do
-    it "should convert RGB to hexcolor" do
+    it "converts RGB to hexcolor" do
       ColorConverter.hex(0, 0, 0).should eq "#000000"
       ColorConverter.hex(210, 105, 30).should eq "#D2691E"
     end
 
-    it "should convert CMYK to hexcolor" do
+    it "converts CMYK to hexcolor" do
       ColorConverter.hex(0, 50, 86, 18).should eq "#D2691E"
     end
 
-    it "should return parameter if 1 value is entered" do
+    it "returns parameter if 1 value is entered" do
       ColorConverter.hex("#D2691E").should eq "#D2691E"
     end
 
-    it "should raise error if incorrect number of values is entered" do
+    it "raises error if incorrect number of values is entered" do
       expect { ColorConverter.hex(0, 0, 0, 0, 0) }.to raise_error
     end
 
-    it "should expect proper values" do
+    it "expects proper values" do
       expect { ColorConverter.hex("hello", "world", "foobar", "baz") }.to raise_error
       expect { ColorConverter.hex("hello", "world", "foobar") }.to raise_error
     end
   end
 
   context "#rgb" do
-    it "should convert hexcolor to RGB" do
+    it "converts hexcolor to RGB" do
       ColorConverter.rgb("#D2691E").should eq [210, 105, 30]
     end
 
-    it "should convert CMYK to RGB" do
+    it "converts CMYK to RGB" do
       ColorConverter.rgb(0, 50, 86, 18).should eq [210, 105, 30]
     end
 
-    it "should return parameter if 3 values are entered" do
+    it "returns parameter if 3 values are entered" do
       ColorConverter.rgb(210, 105, 30).should eq [210, 105, 30]
     end
 
-    it "should raise error if incorrect number of values is entered" do
+    it "raises error if incorrect number of values is entered" do
       expect { ColorConverter.rgb(0, 0) }.to raise_error
     end
 
-    it "should expect proper values" do
+    it "expects proper values" do
       expect { ColorConverter.rgb("hello", "world", "foobar", "baz") }.to raise_error
       expect { ColorConverter.rgb("hello") }.to raise_error
     end
   end
 
   context "#cmyk" do
-    it "should convert hexcolor to CMYK" do
+    it "converts hexcolor to CMYK" do
       ColorConverter.cmyk("#D2691E").should eq [0, 50, 86, 18]
     end
 
-    it "should convert RGB to CMYK" do
+    it "converts RGB to CMYK" do
       ColorConverter.cmyk(210, 105, 30).should eq [0, 50, 86, 18]
     end
 
-    it "should return parameter if 4 values are entered" do
+    it "returns parameter if 4 values are entered" do
       ColorConverter.cmyk(0, 50, 86, 18).should eq [0, 50, 86, 18]
     end
 
-    it "should raise error if incorrect number of values is entered" do
+    it "raises error if incorrect number of values is entered" do
       expect { ColorConverter.cmyk(0, 0, 0, 0, 0) }.to raise_error
     end
 
-    it "should expect proper values" do
+    it "expects proper values" do
       expect { ColorConverter.cmyk("hello", "world", "foobar") }.to raise_error
       expect { ColorConverter.cmyk("hello") }.to raise_error
     end

data/spec/spec_helper.rb

@@ -4,6 +4,11 @@ require 'bundler/setup'
 
 require 'simplecov'
 require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
 SimpleCov.start
 
 require 'rack/test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Damien Kan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler