Putting lab stuff into its own area, and correcting references to lab objects to reflect

Author: daveheitzman

lib/color.rb

@@ -138,10 +138,10 @@ def normalize_word(value)
   alias_method :normalize_16bit, :normalize_word
 end
 
-require "color/rgb"
 require "color/cmyk"
+require "color/css"
 require "color/grayscale"
 require "color/hsl"
-require "color/yiq"
-require "color/css"
 require "color/lab"
+require "color/rgb"
+require "color/yiq"

lib/color/rgb.rb

@@ -227,12 +227,11 @@ def to_lab(color_space = :sRGB, reference_white = [95.047, 100.00, 108.883])
       end
     }
 
-    Color::LAB.new((116 * fy) - 16, 500 * (fx - fy), 200 * (fy - fz))
-    # {
-    #   :L => ((116 * fy) - 16),
-    #   :a => (500 * (fx - fy)),
-    #   :b => (200 * (fy - fz))
-    # }
+    Color::LAB.new({
+      L: ((116 * fy) - 16),
+      a: (500 * (fx - fy)),
+      b: (200 * (fy - fz))
+    })
   end
 
   # Mix the RGB hue with White so that the RGB hue is the specified
@@ -324,28 +323,25 @@ def adjust_hue(percent)
   # provided colours. Returns +nil+ if +color_list+ is empty or if there is
   # no colour within the +threshold_distance+.
   #
-  # +threshold_distance+ is used to determine the minimum colour distance
-  # permitted. Uses the CIE Delta E 1994 algorithm (CIE94) to find near
-  # matches based on perceived visual colour. The default value (1000.0) is
-  # an arbitrarily large number. The values <tt>:jnd</tt> and
-  # <tt>:just_noticeable</tt> may be passed as the +threshold_distance+ to
-  # use the value <tt>2.3</tt>.
-  def closest_match(color_list, threshold_distance = 1000.0)
+  # threshhold_distance removed to instead allow choice of algorithms used to calculate the contrast
+  # between each color.
+  def closest_match(color_list, algorithm = :delta_e94, options = {})
     color_list = [color_list].flatten(1)
     return nil if color_list.empty?
 
-    threshold_distance = case threshold_distance
-    when :jnd, :just_noticeable
-      2.3
-    else
-      threshold_distance.to_f
-    end
-    lab = to_lab
-    closest_distance = threshold_distance
+    # threshold_distance = case threshold_distance
+    #                      when :jnd, :just_noticeable
+    #                        2.3
+    #                      else
+    #                        threshold_distance.to_f
+    #                      end
+    # lab = to_lab
+    closest_distance = 999_999.9
     best_match = nil
 
     color_list.each do |c|
-      distance = Color::LAB.delta_e94(lab, c.to_lab)
+      # distance = Color::LAB.delta_e94(lab, c.to_lab)
+      distance = contrast(c, algorithm) # delta_e94(lab, c.to_lab)
       if distance < closest_distance
         closest_distance = distance
         best_match = c
@@ -694,3 +690,5 @@ def html_hexify(hex)
 end
 
 require "color/rgb/colors"
+require "color/rgb/metallic"
+require "color/rgb/contrast"

lib/color/rgb/contrast.rb

@@ -1,4 +1,4 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 class Color::RGB
   # Outputs how much contrast this color has with another RGB color.
@@ -22,8 +22,6 @@ def contrast(other, algorithm = nil)
     end
   end
 
-  private
-
   # Provides the luminosity difference between two rbg vals
   def diff_luminosity(other)
     other = coerce(other)

test/test_rgb.rb

@@ -414,7 +414,7 @@ def test_inspect
       assert_equal("RGB [#ffffff]", Color::RGB::White.inspect)
     end
 
-    def test_delta_e2000_lab
+    def test_delta_e2000
       # test data:
       # http://www.ece.rochester.edu/~gsharma/ciede2000/
       # http://www.ece.rochester.edu/~gsharma/ciede2000/dataNprograms/CIEDE2000.xls