color_conversion 0.1.0 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 67ef203f22ffbece2c150be570dcd841c9ea476da8352afaa41b1ea1988ca7b9
+  data.tar.gz: 17f62d21d1073db851c7d0e732b32d1f3b36637ae27bbf781a3e869c58c65dad
+SHA512:
+  metadata.gz: 2dbacd4819c95094cfc6a296b1503a8950b7fdf9a50b3eba26cbd3613a8b07d0c2e0f257db45e202d4081f90944e60f1045f0e8569dc6456c66475ab1e39313c
+  data.tar.gz: 98beb5c98f321f891af4f06d49bd6b629417a886894c2e1d803335daf6e960d3c17dc31190f4b1734e0d8cef8ceec399f63b613be4cbc2564719a6bf812e1c35

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in color_parser.gemspec
 gemspec

data/README.md

@@ -4,51 +4,67 @@ This gem provides conversions for colors to and from Hex, RGB, and HSL.
 
 ## Examples
 
-Create a new color:
+Initialize a color:
 ```ruby
 # from hex
-color = Color.new("#FFFFFF")
-color = Color.new("#FFF")
+color = Color.new("#3366cc")
+color = Color.new("#36c")
 
-# from rgb and rgba
-color = Color.new(r: 255, g: 255, b: 255)
-color = Color.new(r: 255, g: 255, b: 255, a: 0.5)
+# from rgb(a)
+color = Color.new(r: 51, g: 102, b: 204)
+color = Color.new(r: 51, g: 102, b: 204, a: 0.5)
 
-# from hsl and hsla
-color = Color.new(h: 0, s: 100, l: 100)
-color = Color.new(h: 0, s: 100, l: 100, a: 0.5)
+# from hsl(a)
+color = Color.new(h: 225, s: 73, l: 57)
+color = Color.new(h: 225, s: 73, l: 57, a: 0.5)
+
+# from hsv/hsb
+color = Color.new(h: 220, s: 75, v: 80)
+color = Color.new(h: 220, s: 75, b: 80)
+
+# from cmyk
+color = Color.new(c: 74, m: 58, y: 22, k: 3)
 
 # from textual color
-color = Color.new("white")
+color = Color.new("blue")
 
-# from a css declaration
-color = Color.new("rgb(255,255,255)")
-color = Color.new("hsl(0,100%,100%)")
+# from a css rgb(a) string
+color = Color.new("rgb(51, 102, 204)")
+color = Color.new("rgba(51, 102, 204, 0.5)")
+
+# from a css hsl(a) string
+color = Color.new("hsl(225, 73%, 57%)")
+color = Color.new("hsl(225, 73%, 57%, 0.5)")
 ```
 
+Conversions
 
-Convert to RGB
 ```ruby
-Color.new("white").rgb
-=> {:r=>255, :g=>255, :b=>255}
-```
+color = Color.new(r: 70, g: 130, b: 180, a: 0.5)
 
-Convert to Hex
-```ruby
-Color.new("white").hex
-=> "#FFFFFF"
-```
+color.alpha
+=> 0.5
 
-Convert to HSL
-```ruby
-Color.new("white").hsl
-=> {:h=>0, :s=>100, :l=>100}
-```
+color.rgb
+=> {:r=>70, :g=>130, :b=>180}
 
-Convert to Name
-```ruby
-Color.new("#FFFFFF").name
-=> "white"
+color.hsl
+=> {:h=>207, :s=>44, :l=>49}
+
+color.hsv
+=> {:h=>207, :s=>61, :v=>71}
+
+color.hsb
+=> {:h=>207, :s=>61, :b=>71}
+
+color.cmyk
+=> {:c=>61, :m=>28, :y=>0, :k=>29}
+
+color.hex
+=> "#4682b4"
+
+color.name
+=> "steelblue"
 ```
 
 
@@ -57,7 +73,7 @@ Color.new("#FFFFFF").name
 To install ColorConversion, add the gem to your Gemfile: 
 
 ```ruby
-gem "color_conversion", "~> 0.1.0"
+gem "color_conversion"
 ```
 
 ## LICENSE

data/lib/color_conversion/color.rb

@@ -1,10 +1,16 @@
 module ColorConversion
   class Color
     extend Forwardable
-    def_delegators :@converter, :rgb, :hex, :hsl, :hsv, :hsb, :cymk, :alpha
+    def_delegators :@converter, :rgb, :hex, :hsl, :hsv, :hsb, :cmyk, :alpha
 
     def initialize(color)
       @converter = ColorConverter.factory(color)
     end
+
+    def ==(other)
+      return false unless other.is_a?(Color)
+
+      rgb == other.rgb && alpha == other.alpha
+    end
   end
-end
+end

data/lib/color_conversion/color_converter.rb

@@ -33,65 +33,15 @@ module ColorConversion
     end
     
     def hsl
-      r = @rgba[:r] / 255.0
-      g = @rgba[:g] / 255.0
-      b = @rgba[:b] / 255.0
-      min = [r, g, b].min
-      max = [r, g, b].max
-      delta = max - min
+      @r, @g, @b = rgb_array_frac
 
-      h = if max == min
-        0
-      elsif r == max
-        (g - b) / delta 
-      elsif g == max
-        2 + (b - r) / delta 
-      elsif b == max
-        4 + (r - g) / delta
-      end
-      
-      h = [h * 60, 360].min
-      h += 360 if h < 0
-      l = (min + max) / 2.0
-
-      s = if (max == min)
-        0
-      elsif (l <= 0.5)
-        delta / (max + min)
-      else
-        delta / (2.0 - max - min)
-      end
-
-      {h: h.round, s: (s * 100).round, l: (l * 100).round}
+      {h: hue, s: hsl_saturation, l: hsl_lightness}
     end
-    
-    def hsv
-      r = @rgba[:r].to_f
-      g = @rgba[:g].to_f
-      b = @rgba[:b].to_f
-      min = [r, g, b].min
-      
-      max = [r, g, b].max
-      delta = (max - min).to_f
-      
-      s = max == 0 ? 0 : (delta / max * 1000) / 10.0
-      
-      h = if max == min
-        0
-      elsif r == max
-        (g - b) / delta
-      elsif g == max
-        2 + (b - r) / delta 
-      elsif b == max
-        4 + (r - g) / delta
-      end
-      
-      h = [h * 60, 360].min      
-      h += 360 if h < 0
 
-      v = ((max / 255.0) * 1000) / 10.0
+    def hsv
+      @r, @g, @b = rgb_array
 
-      {h: h.round, s: s.round, v: v.round}
+      {h: hue, s: hsv_saturation, v: hsv_value}
     end
     
     def hsb
@@ -101,14 +51,12 @@ module ColorConversion
     end
     
     def cmyk
-      r = @rgba[:r] / 255.0
-      g = @rgba[:g] / 255.0
-      b = @rgba[:b] / 255.0
+      @r, @g, @b = rgb_array_frac
 
-      k = [1.0 - r, 1.0 - g, 1.0 - b].min
-      c = (1.0 - r - k) / (1.0 - k)
-      m = (1.0 - g - k) / (1.0 - k)
-      y = (1.0 - b - k) / (1.0 - k)
+      k = [1.0 - @r, 1.0 - @g, 1.0 - @b].min
+      c = (1.0 - @r - k) / (1.0 - k)
+      m = (1.0 - @g - k) / (1.0 - k)
+      y = (1.0 - @b - k) / (1.0 - k)
 
       {c: (c * 100).round, 
        m: (m * 100).round, 
@@ -119,6 +67,78 @@ module ColorConversion
     def alpha
       @rgba[:a]
     end
+    
+    def name
+      NameConverter.name_for_rgb(rgb)
+    end
+    
+    
+    protected
+
+    def rgb_array
+      [@rgba[:r].to_f, @rgba[:g].to_f, @rgba[:b].to_f]
+    end
+    
+    def rgb_array_frac
+      [@rgba[:r] / 255.0, @rgba[:g] / 255.0, @rgba[:b] / 255.0]
+    end
+    
+    def min
+      [@r, @g, @b].min
+    end
+    
+    def max
+      [@r, @g, @b].max
+    end
+    
+    def delta
+      max - min
+    end
+
+    def hue
+      h = if max == min
+        0
+      elsif @r == max
+        (@g - @b) / delta
+      elsif @g == max
+        2 + (@b - @r) / delta
+      elsif @b == max
+        4 + (@r - @g) / delta
+      end
+
+      h = [h * 60, 360].min      
+      h += 360 if h < 0
+      h.round
+    end
+
+    # hsv
+    def hsv_saturation
+      sat = max == 0 ? 0 : (delta / max * 1000) / 10.0
+      sat.round
+    end
+    
+    def hsv_value
+      val = ((max / 255.0) * 1000) / 10.0
+      val.round
+    end
+
+    # hsl
+    def hsl_saturation
+      s = if max == min
+        0
+      elsif hsl_lightness / 100.0 <= 0.5
+        delta / (max + min)
+      else
+        delta / (2.0 - max - min)
+      end
+
+      (s * 100).round
+    end
+    
+    def hsl_lightness
+      light = (min + max) / 2.0 * 100
+      light.round
+    end
 
   end
 end

data/lib/color_conversion/converters/hsl_converter.rb

@@ -15,7 +15,7 @@ module ColorConversion
       l = hsl[:l].to_s.gsub(/[^0-9\.]/, "").to_f / 100.0
       a = hsl[:a] ? hsl[:a].to_s.gsub(/[^0-9\.]/, "").to_f : 1.0
 
-      return [l * 255, l * 255, l * 255] if s == 0
+      return greyscale(l, a) if s == 0
 
       t2 = if l < 0.5
         l * (1 + s)
@@ -47,5 +47,11 @@ module ColorConversion
       
       {r: rgb[0], g: rgb[1], b: rgb[2], a: a}
     end
+
+    def greyscale(luminosity, alpha)
+      rgb_equal_value = (luminosity * 255).round
+      { r: rgb_equal_value, g: rgb_equal_value, b: rgb_equal_value, a: alpha }
+    end
+
   end
 end

data/lib/color_conversion/converters/name_converter.rb

@@ -6,6 +6,11 @@ module ColorConversion
 
       color_names.include?(color.downcase.to_sym)
     end
+    
+    def self.name_for_rgb(rgb)
+      name = color_names.find {|k,v| v == [rgb[:r], rgb[:g], rgb[:b]] }
+      name[0].to_s if name
+    end
 
     private
     
@@ -13,7 +18,7 @@ module ColorConversion
       rgb = self.class.color_names[name.downcase.to_sym]
       {r: rgb[0], g: rgb[1], b: rgb[2], a: 1.0}
     end
-    
+
     def self.color_names
       {aliceblue:  [240,248,255],
        antiquewhite: [250,235,215],

data/lib/color_conversion/version.rb

@@ -1,3 +1,3 @@
 module ColorConversion
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/spec/color_converter_spec.rb

@@ -45,8 +45,8 @@ describe ColorConverter do
     end
   end
 
-  describe ".cymk" do 
-    it "converts color to cymk" do 
+  describe ".cmyk" do 
+    it "converts color to cmyk" do 
       conv = RgbConverter.new(r: 64, g: 104, b: 193)
 
       cmyk = {c: 67, m: 46, y: 0, k: 24}
@@ -54,6 +54,18 @@ describe ColorConverter do
     end
   end
   
+  describe ".name" do 
+    it "converts color to name" do 
+      conv = RgbConverter.new(r: 255, g: 0, b: 0)
+      expect(conv.name).to eq "red"
+    end
+    
+    it "returns nil if no name found" do 
+      conv = RgbConverter.new(r: 255, g: 0, b: 1)
+      expect(conv.name).to be_nil
+    end
+  end
+  
   describe ".alpha" do 
     it "finds alpha for color" do 
       conv = RgbConverter.new(r: 51, g: 102, b: 204, a: 0.5)

data/spec/color_spec.rb

@@ -1,94 +1,142 @@
 require 'spec_helper'
 
-describe Color do 
-  
-  describe ".new with color string" do 
+describe Color do
 
-    it "should initialize color by lower hex" do 
+  describe ".new with color string" do
+
+    it "should initialize color by lower hex" do
       color = Color.new("#3366cc")
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by hex with hash" do 
+    it "should initialize color by hex with hash" do
       color = Color.new("#3366CC")
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by short hex" do 
+    it "should initialize color by short hex" do
       color = Color.new("#36C")
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by rgb string" do 
+    it "should initialize color by rgb string" do
       color = Color.new("rgb(51, 102, 204)")
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by rgba string" do 
+    it "should initialize color by rgba string" do
       color = Color.new("rgba(51, 102, 204, 0.2)")
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
       expect(color.alpha).to eq 0.2
     end
 
-    it "should initialize color by hsl string" do 
+    it "should initialize color by hsl string" do
       color = Color.new("hsl(225, 73%, 57%)")
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
     end
 
-    it "should initialize color by hsla string" do 
-      color = Color.new("hsla(225, 73%, 57%, 0.5)")      
+    it "should initialize color by hsla string" do
+      color = Color.new("hsla(225, 73%, 57%, 0.5)")
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
       expect(color.alpha).to eq 0.5
     end
-    
-    it "should initialize color by textual string" do 
+
+    it "should initialize color by textual string" do
       color = Color.new("royalblue")
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
     end
 
-    it "should initialize color by textual string case" do 
+    it "should initialize color by textual string case" do
       color = Color.new("RoyalBlue")
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
     end
   end
 
 
-  describe ".new" do 
-    it "should initialize color by rgb" do 
+  describe ".new" do
+    it "should initialize color by rgb" do
       color = Color.new(r: 51, g: 102, b: 204)
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by rgba" do 
+    it "should initialize color by rgba" do
       color = Color.new(r: 51, g: 102, b: 204, a: 0.5)
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
       expect(color.alpha).to eq 0.5
     end
 
-    it "should initialize color by hsl" do 
+    it "should initialize color by hsl" do
       color = Color.new(h: 225, s: 73, l: 57)
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
     end
 
-    it "should initialize color by hsla" do 
+    it "should initialize color by hsla" do
       color = Color.new(h: 225, s: 73, l: 57, a: 0.5)
       expect(color.rgb).to eq(r: 65, g: 105, b: 225)
       expect(color.alpha).to eq 0.5
     end
-    
-    it "should initialize color by hsv" do 
+
+    it "should initialize color by hsv" do
       color = Color.new(h: 220, s: 75, v: 80)
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by hsb" do 
+    it "should initialize color by hsb" do
       color = Color.new(h: 220, s: 75, b: 80)
       expect(color.rgb).to eq(r: 51, g: 102, b: 204)
     end
 
-    it "should initialize color by cmyk" do 
+    it "should initialize color by cmyk" do
       color = Color.new(c: 74, m: 58, y: 22, k: 3)
       expect(color.rgb).to eq(r: 64, g: 104, b: 193)
     end
   end
+
+  describe ".==" do
+    it "should be equal when same color" do
+      color_1 = Color.new("#3366cc")
+      color_2 = Color.new("#3366cc")
+
+      expect(color_1).to eq(color_2)
+    end
+
+    it "should be equal when logically same color" do
+      color_1 = Color.new("#3366cc")
+      color_2 = Color.new(r: 51, g: 102, b: 204)
+
+      expect(color_1).to eq(color_2)
+    end
+
+    it "should be equal when same color and alpha" do
+      color_1 = Color.new(r: 51, g: 102, b: 204, a: 0.2)
+      color_2 = Color.new("rgba(51, 102, 204, 0.2)")
+
+      expect(color_1).to eq(color_2)
+    end
+
+    it "should not be equal when same color but not same alpha" do
+      color_1 = Color.new(r: 51, g: 102, b: 204, a: 0.2)
+      color_2 = Color.new(r: 51, g: 102, b: 204, a: 0.2)
+
+      expect(color_1).to eq(color_2)
+    end
+
+    it "should not be equal when not same object" do
+      color_1 = Color.new(r: 51, g: 102, b: 204, a: 0.4)
+      color_like = Struct.new(:r, :g, :b, :alpha, keyword_init: true) do
+        def rgb
+          {r: r, g: g, b: b}
+        end
+      end
+      color_2 = color_like.new(r: 51, g: 102, b: 204, alpha: 0.4)
+
+      expect(color_1).not_to eq(color_2)
+    end
+
+    it "should not be equal when other is nil" do
+      color_1 = Color.new(r: 51, g: 102, b: 204, a: 0.4)
+
+      expect(color_1).not_to eq(nil)
+    end
+  end
 end

data/spec/converters/cmyk_converter_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe CmykConverter do 
   describe ".matches?" do 
     it "should match args with cmyk hash" do 
-      expect(CmykConverter.matches?(c: 87, m: 69, y: 13, k: 1)).to be_true
+      expect(CmykConverter.matches?(c: 87, m: 69, y: 13, k: 1)).to be true
     end
 
     it "should not match args without cmyk hash" do 
-      expect(CmykConverter.matches?(h: 225, s: 73, v: 57)).to be_false
+      expect(CmykConverter.matches?(h: 225, s: 73, v: 57)).to be false
     end
     
     it "should not match a string" do 
-      expect(CmykConverter.matches?("#ffffff")).to be_false
+      expect(CmykConverter.matches?("#ffffff")).to be false
     end
   end
   

data/spec/converters/hex_converter_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 describe HexConverter do 
   describe ".matches?" do 
     it "should match args with hex string" do 
-      expect(HexConverter.matches?("#FFFFFF")).to be_true
+      expect(HexConverter.matches?("#FFFFFF")).to be true
     end
 
     it "should match args with short hex string" do 
-      expect(HexConverter.matches?("#FFF")).to be_true
+      expect(HexConverter.matches?("#FFF")).to be true
     end
 
     it "should match args with lower case hex string" do 
-      expect(HexConverter.matches?("#ffffff")).to be_true
+      expect(HexConverter.matches?("#ffffff")).to be true
     end
 
     it "should not match args without hex string" do 
-      expect(HexConverter.matches?("asdf")).to be_false
+      expect(HexConverter.matches?("asdf")).to be false
     end
 
     it "should not match args without hex string" do 
-      expect(HexConverter.matches?(h: 225, s: 73, l: 57)).to be_false
+      expect(HexConverter.matches?(h: 225, s: 73, l: 57)).to be false
     end
   end
 
@@ -30,4 +30,4 @@ describe HexConverter do
       expect(conv.rgba).to eq rgba
     end
   end
-end
+end

data/spec/converters/hsl_converter_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe HslConverter do 
   describe ".matches?" do 
     it "should match args with hsl hash" do 
-      expect(HslConverter.matches?(h: 225, s: 73, l: 57)).to be_true
+      expect(HslConverter.matches?(h: 225, s: 73, l: 57)).to be true
     end
 
     it "should match args with hsla hash" do 
-      expect(HslConverter.matches?(h: 225, s: 73, l: 57, a: 0.5)).to be_true
+      expect(HslConverter.matches?(h: 225, s: 73, l: 57, a: 0.5)).to be true
     end
 
     it "should not match args without hsl hash" do 
-      expect(HslConverter.matches?(h: 225, s: 73, v: 57)).to be_false
+      expect(HslConverter.matches?(h: 225, s: 73, v: 57)).to be false
     end
     
     it "should not match a string" do 
-      expect(HslConverter.matches?("#ffffff")).to be_false
+      expect(HslConverter.matches?("#ffffff")).to be false
     end
   end
   
@@ -37,5 +37,11 @@ describe HslConverter do
       rgba = {r: 65, g: 105, b: 225, a: 0.5}
       expect(conv.rgba).to eq rgba
     end
+
+    it 'should return equal values when saturation is 0' do
+      conv = HslConverter.new(h: "225", s: "0%", l: "20%", a: "0.5")
+      rgba = {r: 51, g: 51, b: 51, a: 0.5}
+      expect(conv.rgba).to eq rgba
+    end
   end
-end
+end

data/spec/converters/hsl_string_converter_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe HslStringConverter do 
   describe ".matches?" do 
     it "should match args with hsl string" do 
-      expect(HslStringConverter.matches?("hsl(225, 73%, 57%)")).to be_true
+      expect(HslStringConverter.matches?("hsl(225, 73%, 57%)")).to be true
     end
 
     it "should match args with hsla string" do 
-      expect(HslStringConverter.matches?("hsla(225, 73%, 57%, 0.5)")).to be_true
+      expect(HslStringConverter.matches?("hsla(225, 73%, 57%, 0.5)")).to be true
     end
 
     it "should not match args without hsl string" do 
-      expect(HslStringConverter.matches?(h: 225, s: 73, l: 57)).to be_false
+      expect(HslStringConverter.matches?(h: 225, s: 73, l: 57)).to be false
     end
   end
   
@@ -28,4 +28,4 @@ describe HslStringConverter do
       expect(conv.rgba).to eq rgba
     end
   end
-end
+end

data/spec/converters/hsv_converter_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe HsvConverter do 
   describe ".matches?" do 
     it "should match args with hsv hash" do 
-      expect(HsvConverter.matches?(h: 225, s: 73, v: 57)).to be_true
+      expect(HsvConverter.matches?(h: 225, s: 73, v: 57)).to be true
     end
 
     it "should match args with hsb hash" do 
-      expect(HsvConverter.matches?(h: 225, s: 73, b: 57)).to be_true
+      expect(HsvConverter.matches?(h: 225, s: 73, b: 57)).to be true
     end
 
     it "should not match args without hsv hash" do 
-      expect(HsvConverter.matches?(h: 225, s: 73, l: 57)).to be_false
+      expect(HsvConverter.matches?(h: 225, s: 73, l: 57)).to be false
     end
     
     it "should not match a string" do 
-      expect(HsvConverter.matches?("#ffffff")).to be_false
+      expect(HsvConverter.matches?("#ffffff")).to be false
     end
   end
   
@@ -33,4 +33,4 @@ describe HsvConverter do
     end
 
   end
-end
+end

data/spec/converters/name_converter_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe NameConverter do 
   describe ".matches?" do 
     it "should match args with name string" do 
-      expect(NameConverter.matches?("blue")).to be_true
+      expect(NameConverter.matches?("blue")).to be true
     end
 
     it "should match args with color insensitive string" do 
-      expect(NameConverter.matches?("RoyalBlue")).to be_true
-      expect(NameConverter.matches?("royalblue")).to be_true
+      expect(NameConverter.matches?("RoyalBlue")).to be true
+      expect(NameConverter.matches?("royalblue")).to be true
     end
 
     it "should not match args without name string" do 
-      expect(NameConverter.matches?("#ffffff")).to be_false
+      expect(NameConverter.matches?("#ffffff")).to be false
     end
   end
   
@@ -23,4 +23,4 @@ describe NameConverter do
       expect(conv.rgba).to eq rgba
     end
   end
-end
+end

data/spec/converters/null_converter_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe NullConverter do 
   describe ".matches?" do 
     it "should always match" do 
-      expect(NullConverter.matches?("blue")).to be_true
-      expect(NullConverter.matches?(r: 51, g: 102, b: 204)).to be_true
+      expect(NullConverter.matches?("blue")).to be true
+      expect(NullConverter.matches?(r: 51, g: 102, b: 204)).to be true
     end
   end
   
@@ -16,4 +16,4 @@ describe NullConverter do
       }.to raise_error(InvalidColorError)
     end
   end
-end
+end

data/spec/converters/rgb_converter_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe RgbConverter do 
   describe ".matches?" do 
     it "should match args with rgb hash" do 
-      expect(RgbConverter.matches?(r: 51, g: 102, b: 204)).to be_true
+      expect(RgbConverter.matches?(r: 51, g: 102, b: 204)).to be true
     end
 
     it "should match args with rgba hash" do 
-      expect(RgbConverter.matches?(r: 51, g: 102, b: 204, a: 0.5)).to be_true
+      expect(RgbConverter.matches?(r: 51, g: 102, b: 204, a: 0.5)).to be true
     end
 
     it "should not match args without rgb hash" do 
-      expect(RgbConverter.matches?(h: 225, s: 73, l: 57)).to be_false
+      expect(RgbConverter.matches?(h: 225, s: 73, l: 57)).to be false
     end
     
     it "should not match a string" do 
-      expect(RgbConverter.matches?("#ffffff")).to be_false
+      expect(RgbConverter.matches?("#ffffff")).to be false
     end
   end
   
@@ -38,4 +38,4 @@ describe RgbConverter do
       expect(conv.rgba).to eq rgba
     end
   end
-end
+end

data/spec/converters/rgb_string_converter_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe RgbStringConverter do 
   describe ".matches?" do 
     it "should match args with rgb string" do 
-      expect(RgbStringConverter.matches?("rgb(51, 102, 204)")).to be_true
+      expect(RgbStringConverter.matches?("rgb(51, 102, 204)")).to be true
     end
 
     it "should match args with rgba string" do 
-      expect(RgbStringConverter.matches?("rgba(51, 102, 204, 0.2)")).to be_true
+      expect(RgbStringConverter.matches?("rgba(51, 102, 204, 0.2)")).to be true
     end
 
     it "should not match args without rgb string" do 
-      expect(RgbStringConverter.matches?(r: 51, g: 102, b: 204)).to be_false
+      expect(RgbStringConverter.matches?(r: 51, g: 102, b: 204)).to be false
     end
   end
   
@@ -42,4 +42,4 @@ describe RgbStringConverter do
       }.to raise_error(InvalidColorError)
     end
   end
-end
+end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: color_conversion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Derek DeVries
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Convert colors to hex/rgb/hsv
@@ -98,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -135,27 +124,25 @@ files:
 homepage: https://github.com/devrieda/color_conversion
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.3.7
+signing_key:
+specification_version: 4
 summary: Convert colors to hex/rgb/hsv
 test_files:
 - spec/color_converter_spec.rb
@@ -171,4 +158,3 @@ test_files:
 - spec/converters/rgb_string_converter_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
-has_rdoc: