color 2.1.0 → 2.1.2

data/lib/color/cielab.rb

@@ -140,7 +140,7 @@ class Color::CIELAB
     fx = a / 500.0 + fy
 
     xr = ((fx3 = fx**3) > Color::XYZ::E) ? fx3 : (116.0 * fx - 16) / Color::XYZ::K
-    yr = (l > Color::XYZ::EK) ? ((l + 16.0) / 116)**3 : l
+    yr = (l > Color::XYZ::EK) ? ((l + 16.0) / 116)**3 : l / Color::XYZ::K
     zr = ((fz3 = fz**3) > Color::XYZ::E) ? fz3 : (116.0 * fz - 16) / Color::XYZ::K
 
     ref = kwargs[:white] || args.first
@@ -149,6 +149,10 @@ class Color::CIELAB
     ref.scale(xr, yr, zr)
   end
 
+  ##
+  # Converts \CIELAB to Color::YIQ via Color::XYZ.
+  def to_yiq(...) = to_xyz(...).to_yiq(...)
+
   ##
   # Render the CSS `lab()` function for this \CIELAB object, adding an `alpha` if
   # provided.

data/lib/color/grayscale.rb

@@ -81,6 +81,10 @@ class Color::Grayscale
   ##
   def to_grayscale(...) = self
 
+  ##
+  # Converts \Grayscale to Color::XYZ via Color::RGB.
+  def to_xyz(...) = to_rgb(...).to_xyz(...)
+
   ##
   # Convert \Grayscale to Color::YIQ.
   #

data/lib/color/hsl.rb

@@ -93,8 +93,8 @@ class Color::HSL
   # fvd and van Dam, originally found at [1] (implemented similarly at [2]). This
   # simplifies the calculations with the following assumptions:
   #
-  # - Luminance values <= 0 always translate to Color::RGB::Black.
-  # - Luminance values >= 1 always translate to Color::RGB::White.
+  # - Luminance values <= 0 always translate to a black Color::RGB value.
+  # - Luminance values >= 1 always translate to a white Color::RGB value.
   # - Saturation values <= 0 always translate to a shade of gray using luminance as
   #   a percentage of gray.
   #
@@ -102,9 +102,9 @@ class Color::HSL
   # [2] http://support.microsoft.com/kb/29240
   def to_rgb(...)
     if near_zero_or_less?(l)
-      Color::RGB::Black
+      Color::RGB::Black000
     elsif near_one_or_more?(l)
-      Color::RGB::White
+      Color::RGB::WhiteFFF
     elsif near_zero?(s)
       Color::RGB.from_fraction(l, l, l)
     else

data/lib/color/rgb.rb

@@ -63,6 +63,9 @@ class Color::RGB
     super(r: normalize(r), g: normalize(g), b: normalize(b), names: names)
   end
 
+  Black000 = new(r: 0x00, g: 0x00, b: 0x00) # :nodoc:
+  WhiteFFF = new(r: 0xff, g: 0xff, b: 0xff) # :nodoc:
+
   ##
   # :attr_reader: name
   # The primary name for this \RGB color.
@@ -263,18 +266,18 @@ class Color::RGB
   def delta_e2000(other) = to_lab.delta_e2000(coerce(other).to_lab)
 
   ##
-  # Mix the \RGB hue with White so that the \RGB hue is the specified percentage of the
+  # Mix the \RGB hue with white so that the \RGB hue is the specified percentage of the
   # resulting color.
   #
   # Strictly speaking, this isn't a `lighten_by` operation, but it mostly works.
-  def lighten_by(percent) = mix_with(Color::RGB::White, percent)
+  def lighten_by(percent) = mix_with(Color::RGB::WhiteFFF, percent)
 
   ##
-  # Mix the \RGB hue with Black so that the \RGB hue is the specified percentage of the
+  # Mix the \RGB hue with black so that the \RGB hue is the specified percentage of the
   # resulting color.
   #
   # Strictly speaking, this isn't a `darken_by` operation, but it mostly works.
-  def darken_by(percent) = mix_with(Color::RGB::Black, percent)
+  def darken_by(percent) = mix_with(Color::RGB::Black000, percent)
 
   ##
   # Mix the mask color with the current color at the stated opacity percentage (0..100).

data/lib/color/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Color
-  VERSION = "2.1.0" # :nodoc:
+  VERSION = "2.1.2" # :nodoc:
 end

data/lib/color/xyz.rb

@@ -245,7 +245,7 @@ class Color::XYZ
       x * -0.9689307 + y * 1.8757561 + z * 0.0415175,
       x * 0.0557101 + y * -0.2040211 + z * 1.0569959
     ].map {
-      if _1.abs <= 0.0031308
+      if _1 <= 0.0031308
         _1 * 12.92
       else
         1.055 * (_1**(1 / 2.4)) - 0.055

data/test/test_cmyk.rb

@@ -30,31 +30,62 @@ module TestColor
       assert_in_tolerance(40, @cmyk.black)
     end
 
+    def test_inspect
+      assert_equal("CMYK [10.00% 20.00% 30.00% 40.00%]", @cmyk.inspect)
+    end
+
+    def test_css
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%, rgb(54.00% 48.00% 42.00%))", @cmyk.css)
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(54.00% 48.00% 42.00% / 0.50))", @cmyk.css(alpha: 0.5))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%)", @cmyk.css(fallback: false))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50)", @cmyk.css(alpha: 0.5, fallback: false))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%, rgb(0 0 100.00%))", @cmyk.css(fallback: Color::RGB::Blue))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00% / 0.50))", @cmyk.css(alpha: 0.5, fallback: Color::RGB::Blue))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00%))", @cmyk.css(alpha: 0.5, fallback: {color: Color::RGB::Blue}))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00% / 0.30))", @cmyk.css(alpha: 0.5, fallback: {color: Color::RGB::Blue, alpha: 0.3}))
+      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(54.00% 48.00% 42.00% / 0.30))", @cmyk.css(alpha: 0.5, fallback: {alpha: 0.3}))
+    end
+  end
+
+  class TestCMYKConversions < Minitest::Test
+    def setup
+      @cmyk = Color::CMYK.from_percentage(10, 20, 30, 40)
+    end
+
     def test_to_cmyk
-      assert(@cmyk.to_cmyk == @cmyk)
+      assert_equal(@cmyk, @cmyk.to_cmyk)
+      assert_kind_of(Color::CMYK, @cmyk.to_cmyk)
     end
 
     def test_to_grayscale
       gs = @cmyk.to_grayscale
       assert_kind_of(Color::Grayscale, gs)
       assert_in_tolerance(0.4185, gs.g)
-      assert_kind_of(Color::Grayscale, @cmyk.to_grayscale)
     end
 
-    # def test_to_hsl
-    #   hsl = @cmyk.to_hsl
-    #   assert_kind_of(Color::HSL, hsl)
-    #   assert_in_tolerance(0.48, hsl.l)
-    #   assert_in_tolerance(0.125, hsl.s)
-    #   assert_in_tolerance(0.08333, hsl.h)
-    # end
+    def test_to_hsl
+      hsl = @cmyk.to_hsl
+      assert_kind_of(Color::HSL, hsl)
+      assert_in_tolerance(0.48, hsl.l)
+      assert_in_tolerance(0.125, hsl.s)
+      assert_in_tolerance(0.08333, hsl.h)
+    end
+
+    def test_to_lab
+      lab = @cmyk.to_lab
+      assert_kind_of(Color::CIELAB, lab)
+      assert_in_tolerance(52.35269, lab.l)
+      assert_in_tolerance(3.268274, lab.a)
+      assert_in_tolerance(10.52531, lab.b)
+      assert_equal(Color::CIELAB.from_values(0, 0, 0), Color::CMYK.from_percentage(0, 0, 0, 100).to_lab)
+    end
 
     def test_to_rgb
-      rgb = @cmyk.to_rgb(rgb_method: :adobe)
-      assert_kind_of(Color::RGB, rgb)
-      assert_in_tolerance(0.5, rgb.r)
-      assert_in_tolerance(0.4, rgb.g)
-      assert_in_tolerance(0.3, rgb.b)
+      rgb_adobe = @cmyk.to_rgb(rgb_method: :adobe)
+      assert_kind_of(Color::RGB, rgb_adobe)
+      assert_in_tolerance(0.5, rgb_adobe.r)
+      assert_in_tolerance(0.4, rgb_adobe.g)
+      assert_in_tolerance(0.3, rgb_adobe.b)
 
       rgb = @cmyk.to_rgb
       assert_kind_of(Color::RGB, rgb)
@@ -63,28 +94,26 @@ module TestColor
       assert_in_tolerance(0.42, rgb.b)
     end
 
-    def test_inspect
-      assert_equal("CMYK [10.00% 20.00% 30.00% 40.00%]", @cmyk.inspect)
+    def test_to_xyz
+      xyz = @cmyk.to_xyz
+      assert_kind_of(Color::XYZ, xyz)
+      assert_in_tolerance(0.200995, xyz.x)
+      assert_in_tolerance(0.204594, xyz.y)
+      assert_in_tolerance(0.168249, xyz.z)
+      assert_equal(Color::XYZ.from_values(0, 0, 0), Color::CMYK.from_percentage(0, 0, 0, 100).to_xyz)
     end
 
-    def test_css
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%, rgb(54.00% 48.00% 42.00%))", @cmyk.css)
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(54.00% 48.00% 42.00% / 0.50))", @cmyk.css(alpha: 0.5))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%)", @cmyk.css(fallback: false))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50)", @cmyk.css(alpha: 0.5, fallback: false))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00%, rgb(0 0 100.00%))", @cmyk.css(fallback: Color::RGB::Blue))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00% / 0.50))", @cmyk.css(alpha: 0.5, fallback: Color::RGB::Blue))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00%))", @cmyk.css(alpha: 0.5, fallback: {color: Color::RGB::Blue}))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(0 0 100.00% / 0.30))", @cmyk.css(alpha: 0.5, fallback: {color: Color::RGB::Blue, alpha: 0.3}))
-      assert_equal("device-cmyk(10.00% 20.00% 30.00% 40.00% / 0.50, rgb(54.00% 48.00% 42.00% / 0.30))", @cmyk.css(alpha: 0.5, fallback: {alpha: 0.3}))
+    def test_to_yiq
+      yiq = @cmyk.to_yiq
+      assert_kind_of(Color::YIQ, yiq)
+      assert_in_tolerance(0.4911, yiq.y)
+      assert_in_tolerance(0.05502, yiq.i)
+      assert_in_tolerance(0.0, yiq.q)
+      assert_equal(Color::YIQ.from_values(0, 0, 0), Color::CMYK.from_percentage(0, 0, 0, 100).to_yiq)
     end
 
-    # def test_to_yiq
-    #   yiq = @cmyk.to_yiq
-    #   assert_kind_of(Color::YIQ, yiq)
-    #   assert_in_tolerance(0.4911, yiq.y)
-    #   assert_in_tolerance(0.05502, yiq.i)
-    #   assert_in_tolerance(0.0, yiq.q)
-    # end
+    def test_to_internal
+      assert_equal([0.0, 0.0, 0.0, 1.0], Color::CMYK.from_percentage(0, 0, 0, 100).to_internal)
+    end
   end
 end

data/test/test_grayscale.rb

@@ -39,6 +39,16 @@ module TestColor
       assert_in_tolerance(0.363, @gs.lighten_by(10).g)
     end
 
+    def test_inspect
+      assert_equal("Grayscale [33.00%]", @gs.inspect)
+    end
+  end
+
+  class TestGrayscaleConversions < Minitest::Test
+    def setup
+      @gs = Color::Grayscale.from_percentage(33)
+    end
+
     def test_to_cmyk
       cmyk = @gs.to_cmyk
       assert_kind_of(Color::CMYK, cmyk)
@@ -46,11 +56,12 @@ module TestColor
       assert_in_tolerance(0.0, cmyk.m)
       assert_in_tolerance(0.0, cmyk.y)
       assert_in_tolerance(0.67, cmyk.k)
+      assert_equal(Color::CMYK.from_percentage(0, 0, 0, 100), Color::Grayscale.from_percentage(0).to_cmyk)
     end
 
     def test_to_grayscale
       assert_equal(@gs, @gs.to_grayscale)
-      assert_equal(@gs, @gs.to_grayscale)
+      assert_kind_of(Color::Grayscale, @gs.to_grayscale)
     end
 
     def test_to_hsl
@@ -59,6 +70,16 @@ module TestColor
       assert_in_tolerance(0.0, hsl.h)
       assert_in_tolerance(0.0, hsl.s)
       assert_in_tolerance(0.33, hsl.l)
+      assert_equal(Color::HSL.from_values(0, 0, 0), Color::Grayscale.from_percentage(0).to_hsl)
+    end
+
+    def test_to_lab
+      lab = @gs.to_lab
+      assert_kind_of(Color::CIELAB, lab)
+      assert_in_tolerance(35.78746, lab.l)
+      assert_in_tolerance(0.0031199, lab.a)
+      assert_in_tolerance(-0.000639, lab.b)
+      assert_equal(Color::CIELAB.from_values(0, 0, 0), Color::Grayscale.from_percentage(0).to_lab)
     end
 
     def test_to_rgb
@@ -67,6 +88,16 @@ module TestColor
       assert_in_tolerance(0.33, rgb.r)
       assert_in_tolerance(0.33, rgb.g)
       assert_in_tolerance(0.33, rgb.b)
+      assert_equal(Color::RGB.from_values(0, 0, 0), Color::Grayscale.from_percentage(0).to_rgb)
+    end
+
+    def test_to_xyz
+      xyz = @gs.to_xyz
+      assert_kind_of(Color::XYZ, xyz)
+      assert_in_tolerance(0.08457, xyz.x)
+      assert_in_tolerance(0.08898, xyz.y)
+      assert_in_tolerance(0.09688, xyz.z)
+      assert_equal(Color::XYZ.from_values(0, 0, 0), Color::Grayscale.from_percentage(0).to_xyz)
     end
 
     def test_to_yiq
@@ -75,10 +106,11 @@ module TestColor
       assert_in_tolerance(0.33, yiq.y)
       assert_in_tolerance(0.0, yiq.i)
       assert_in_tolerance(0.0, yiq.q)
+      assert_equal(Color::YIQ.from_values(0, 0, 0), Color::Grayscale.from_percentage(0).to_yiq)
     end
 
-    def test_inspect
-      assert_equal("Grayscale [33.00%]", @gs.inspect)
+    def test_to_internal
+      assert_equal([0.0], Color::Grayscale.from_percentage(0).to_internal)
     end
   end
 end

data/test/test_hsl.rb

@@ -66,66 +66,102 @@ module TestColor
       assert_equal "hsl(145.00deg 20.00% 30.00% / 1.00)", @hsl.css(alpha: 1)
     end
 
+    def test_mix_with
+      red = Color::RGB::Red.to_hsl
+      yellow = Color::RGB::Yellow.to_hsl
+      assert_in_tolerance 0, red.hue
+      assert_in_tolerance 60, yellow.hue
+      ry25 = red.mix_with yellow, 0.25
+      assert_in_tolerance 15, ry25.hue
+      ry50 = red.mix_with yellow, 0.50
+      assert_in_tolerance 30, ry50.hue
+      ry75 = red.mix_with yellow, 0.75
+      assert_in_tolerance 45, ry75.hue
+    end
+
+    def test_inspect
+      assert_equal "HSL [145.00deg 20.00% 30.00%]", @hsl.inspect
+    end
+  end
+
+  class TestHSLConversions < Minitest::Test
+    def setup
+      @hsl = Color::HSL.from_values(145, 20, 30)
+    end
+
     def test_to_cmyk
       cmyk = @hsl.to_cmyk
-      assert_kind_of Color::CMYK, cmyk
-      assert_in_tolerance 0.3223, cmyk.c
-      assert_in_tolerance 0.2023, cmyk.m
-      assert_in_tolerance 0.2723, cmyk.y
-      assert_in_tolerance 0.4377, cmyk.k
+      assert_kind_of(Color::CMYK, cmyk)
+      assert_in_tolerance(0.3223, cmyk.c)
+      assert_in_tolerance(0.2023, cmyk.m)
+      assert_in_tolerance(0.2723, cmyk.y)
+      assert_in_tolerance(0.4377, cmyk.k)
+      assert_equal(Color::CMYK.from_percentage(0, 0, 0, 100), Color::HSL.from_values(0, 0, 0).to_cmyk)
     end
 
     def test_to_grayscale
       gs = @hsl.to_grayscale
-      assert_kind_of Color::Grayscale, gs
-      assert_in_tolerance 30, gs.gray
+      assert_kind_of(Color::Grayscale, gs)
+      assert_in_tolerance(30, gs.gray)
+      assert_equal(Color::Grayscale.from_fraction(0), Color::HSL.from_values(0, 0, 0).to_grayscale)
+    end
+
+    def test_to_hsl
+      assert_equal(@hsl, @hsl.to_hsl)
+      assert_kind_of(Color::HSL, @hsl.to_hsl)
+    end
+
+    def test_to_lab
+      lab = @hsl.to_lab
+      assert_kind_of(Color::CIELAB, lab)
+      assert_in_tolerance(36.19817, lab.l)
+      assert_in_tolerance(-15.6, lab.a)
+      assert_in_tolerance(6.72317, lab.b)
+      assert_equal(Color::CIELAB.from_values(0, 0, 0), Color::HSL.from_values(0, 0, 0).to_lab)
     end
 
     def test_to_rgb
       rgb = @hsl.to_rgb
-      assert_kind_of Color::RGB, rgb
-      assert_in_tolerance 0.24, rgb.r
-      assert_in_tolerance 0.36, rgb.g
-      assert_in_tolerance 0.29, rgb.b
+      assert_kind_of(Color::RGB, rgb)
+      assert_in_tolerance(0.24, rgb.r)
+      assert_in_tolerance(0.36, rgb.g)
+      assert_in_tolerance(0.29, rgb.b)
 
       # The following tests address a bug reported by Jean Krohn on June 6,
       # 2006 and exercise some previously unexercised code in to_rgb.
-      assert_equal Color::RGB::Black, Color::HSL.from_values(75, 75, 0)
-      assert_equal Color::RGB::White, Color::HSL.from_values(75, 75, 100)
-      assert_equal Color::RGB::Gray80, Color::HSL.from_values(75, 0, 80)
+      assert_equal(Color::RGB::Black, Color::HSL.from_values(75, 75, 0))
+      assert_equal(Color::RGB::White, Color::HSL.from_values(75, 75, 100))
+      assert_equal(Color::RGB::Gray80, Color::HSL.from_values(75, 0, 80))
 
       # The following tests a bug reported by Adam Johnson on 29 October
       # 2010.
       rgb = Color::RGB.from_fraction(0.34496, 0.1386, 0.701399)
       c = Color::HSL.from_values(262, 67, 42).to_rgb
-      assert_in_tolerance rgb.r, c.r, "Red"
-      assert_in_tolerance rgb.g, c.g, "Green"
-      assert_in_tolerance rgb.b, c.b, "Blue"
+      assert_in_tolerance(rgb.r, c.r, "Red")
+      assert_in_tolerance(rgb.g, c.g, "Green")
+      assert_in_tolerance(rgb.b, c.b, "Blue")
     end
 
-    def test_to_yiq
-      yiq = @hsl.to_yiq
-      assert_kind_of Color::YIQ, yiq
-      assert_in_tolerance 0.3161, yiq.y
-      assert_in_tolerance 0.0, yiq.i
-      assert_in_tolerance 0.0, yiq.q
+    def test_to_xyz
+      xyz = @hsl.to_xyz
+      assert_kind_of(Color::XYZ, xyz)
+      assert_in_tolerance(0.069805, xyz.x)
+      assert_in_tolerance(0.091115, xyz.y)
+      assert_in_tolerance(0.078593, xyz.z)
+      assert_equal(Color::XYZ.from_values(0, 0, 0), Color::HSL.from_values(0, 0, 0).to_xyz)
     end
 
-    def test_mix_with
-      red = Color::RGB::Red.to_hsl
-      yellow = Color::RGB::Yellow.to_hsl
-      assert_in_tolerance 0, red.hue
-      assert_in_tolerance 60, yellow.hue
-      ry25 = red.mix_with yellow, 0.25
-      assert_in_tolerance 15, ry25.hue
-      ry50 = red.mix_with yellow, 0.50
-      assert_in_tolerance 30, ry50.hue
-      ry75 = red.mix_with yellow, 0.75
-      assert_in_tolerance 45, ry75.hue
+    def test_to_yiq
+      yiq = @hsl.to_yiq
+      assert_kind_of(Color::YIQ, yiq)
+      assert_in_tolerance(0.3161, yiq.y)
+      assert_in_tolerance(0.0, yiq.i)
+      assert_in_tolerance(0.0, yiq.q)
+      assert_equal(Color::YIQ.from_values(0, 0, 0), Color::HSL.from_values(0, 0, 0).to_yiq)
     end
 
-    def test_inspect
-      assert_equal "HSL [145.00deg 20.00% 30.00%]", @hsl.inspect
+    def test_to_internal
+      assert_equal([0.0, 0.0, 0.0], Color::HSL.from_values(0, 0, 0).to_internal)
     end
   end
 end

data/test/test_rgb.rb

@@ -91,97 +91,6 @@ module TestColor
       assert_in_tolerance(0.5, Color::RGB::Blue.mix_with(Color::RGB::Red, 50).b)
     end
 
-    def test_to_cmyk
-      assert_kind_of(Color::CMYK, Color::RGB::Black.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(0, 0, 0, 100), Color::RGB::Black.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(0, 0, 100, 0), Color::RGB::Yellow.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(100, 0, 0, 0), Color::RGB::Cyan.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(0, 100, 0, 0), Color::RGB::Magenta.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(0, 100, 100, 0), Color::RGB::Red.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(100, 0, 100, 0), Color::RGB::Lime.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(100, 100, 0, 0), Color::RGB::Blue.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(10.32, 60.52, 10.32, 39.47), Color::RGB::Purple.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(10.90, 59.13, 59.13, 24.39), Color::RGB::Brown.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(0, 63.14, 18.43, 0), Color::RGB::Carnation.to_cmyk)
-      assert_equal(Color::CMYK.from_percentage(7.39, 62.69, 62.69, 37.32), Color::RGB::Cayenne.to_cmyk)
-    end
-
-    def test_to_grayscale
-      assert_kind_of(Color::Grayscale, Color::RGB::Black.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0), Color::RGB::Black.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Yellow.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Cyan.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Magenta.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Red.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Lime.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Blue.to_grayscale)
-      assert_equal(Color::Grayscale.from_fraction(0.2510), Color::RGB::Purple.to_grayscale)
-      assert_equal(Color::Grayscale.from_percentage(40.58), Color::RGB::Brown.to_grayscale)
-      assert_equal(Color::Grayscale.from_percentage(68.43), Color::RGB::Carnation.to_grayscale)
-      assert_equal(Color::Grayscale.from_percentage(27.65), Color::RGB::Cayenne.to_grayscale)
-    end
-
-    def test_to_hsl
-      assert_kind_of(Color::HSL, Color::RGB::Black.to_hsl)
-      assert_equal(Color::HSL.from_values(0, 0, 0), Color::RGB::Black.to_hsl)
-      assert_equal(Color::HSL.from_values(60, 100, 50), Color::RGB::Yellow.to_hsl)
-      assert_equal(Color::HSL.from_values(180, 100, 50), Color::RGB::Cyan.to_hsl)
-      assert_equal(Color::HSL.from_values(300, 100, 50), Color::RGB::Magenta.to_hsl)
-      assert_equal(Color::HSL.from_values(0, 100, 50), Color::RGB::Red.to_hsl)
-      assert_equal(Color::HSL.from_values(120, 100, 50), Color::RGB::Lime.to_hsl)
-      assert_equal(Color::HSL.from_values(240, 100, 50), Color::RGB::Blue.to_hsl)
-      assert_equal(Color::HSL.from_values(300, 100, 25.10), Color::RGB::Purple.to_hsl)
-      assert_equal(Color::HSL.from_values(0, 59.42, 40.59), Color::RGB::Brown.to_hsl)
-      assert_equal(Color::HSL.from_values(317.5, 100, 68.43), Color::RGB::Carnation.to_hsl)
-      assert_equal(Color::HSL.from_values(0, 100, 27.64), Color::RGB::Cayenne.to_hsl)
-
-      # The following tests a bug reported by Jean Krohn on 10 June 2006 where HSL
-      # conversion was not quite correct, resulting in a bad round-trip.
-      assert_equal("RGB [#008800]", Color::RGB.from_html("#008800").to_hsl.to_rgb.inspect)
-      refute_equal("RGB [#002288]", Color::RGB.from_html("#008800").to_hsl.to_rgb.inspect)
-
-      # The following tests a bug reported by Adam Johnson on 29 October
-      # 2010.
-      hsl = Color::HSL.from_values(262, 67, 42)
-      c = Color::RGB.from_fraction(0.34496, 0.1386, 0.701399).to_hsl
-      assert_in_tolerance hsl.h, c.h, "Hue"
-      assert_in_tolerance hsl.s, c.s, "Saturation"
-      assert_in_tolerance hsl.l, c.l, "Luminance"
-    end
-
-    def test_to_rgb
-      assert_same(Color::RGB::Black, Color::RGB::Black.to_rgb)
-    end
-
-    def test_to_yiq
-      assert_kind_of(Color::YIQ, Color::RGB::Black.to_yiq)
-      assert_equal(Color::YIQ.from_values(0, 0, 0), Color::RGB::Black.to_yiq)
-      assert_equal(Color::YIQ.from_values(88.6, 32.1, 0), Color::RGB::Yellow.to_yiq)
-      assert_equal(Color::YIQ.from_values(70.1, 0, 0), Color::RGB::Cyan.to_yiq)
-      assert_equal(Color::YIQ.from_values(41.3, 27.5, 52.3), Color::RGB::Magenta.to_yiq)
-      assert_equal(Color::YIQ.from_values(29.9, 59.6, 21.2), Color::RGB::Red.to_yiq)
-      assert_equal(Color::YIQ.from_values(58.7, 0, 0), Color::RGB::Lime.to_yiq)
-      assert_equal(Color::YIQ.from_values(11.4, 0, 31.1), Color::RGB::Blue.to_yiq)
-      assert_equal(Color::YIQ.from_values(20.73, 13.80, 26.25), Color::RGB::Purple.to_yiq)
-      assert_equal(Color::YIQ.from_values(30.89, 28.75, 10.23), Color::RGB::Brown.to_yiq)
-      assert_equal(Color::YIQ.from_values(60.84, 23.28, 27.29), Color::RGB::Carnation.to_yiq)
-      assert_equal(Color::YIQ.from_values(16.53, 32.96, 11.72), Color::RGB::Cayenne.to_yiq)
-    end
-
-    def test_to_lab
-      # Luminosity can be an absolute.
-      assert_in_tolerance(0.0, Color::RGB::Black.to_lab.l)
-      assert_in_tolerance(100.0, Color::RGB::White.to_lab.l)
-
-      # It's not really possible to have absolute
-      # numbers here because of how L*a*b* works, but
-      # negative/positive comparisons work
-      assert(Color::RGB::Green.to_lab.a < 0)
-      assert(Color::RGB::Magenta.to_lab.a > 0)
-      assert(Color::RGB::Blue.to_lab.b < 0)
-      assert(Color::RGB::Yellow.to_lab.b > 0)
-    end
-
     def test_closest_match
       # It should match Blue to Indigo (very simple match)
       match_from = [Color::RGB::Red, Color::RGB::Green, Color::RGB::Blue]
@@ -325,6 +234,80 @@ module TestColor
 
       assert_equal("#ff00aa", Color::RGB.by_hex("#ff00aa").to_lab.to_rgb.html)
     end
+  end
+
+  class TestRGBConversions < Minitest::Test
+    def test_to_cmyk
+      assert_kind_of(Color::CMYK, Color::RGB::Black.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(0, 0, 0, 100), Color::RGB::Black.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(0, 0, 100, 0), Color::RGB::Yellow.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(100, 0, 0, 0), Color::RGB::Cyan.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(0, 100, 0, 0), Color::RGB::Magenta.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(0, 100, 100, 0), Color::RGB::Red.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(100, 0, 100, 0), Color::RGB::Lime.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(100, 100, 0, 0), Color::RGB::Blue.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(10.32, 60.52, 10.32, 39.47), Color::RGB::Purple.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(10.90, 59.13, 59.13, 24.39), Color::RGB::Brown.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(0, 63.14, 18.43, 0), Color::RGB::Carnation.to_cmyk)
+      assert_equal(Color::CMYK.from_percentage(7.39, 62.69, 62.69, 37.32), Color::RGB::Cayenne.to_cmyk)
+    end
+
+    def test_to_grayscale
+      assert_kind_of(Color::Grayscale, Color::RGB::Black.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0), Color::RGB::Black.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Yellow.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Cyan.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Magenta.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Red.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Lime.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.5), Color::RGB::Blue.to_grayscale)
+      assert_equal(Color::Grayscale.from_fraction(0.2510), Color::RGB::Purple.to_grayscale)
+      assert_equal(Color::Grayscale.from_percentage(40.58), Color::RGB::Brown.to_grayscale)
+      assert_equal(Color::Grayscale.from_percentage(68.43), Color::RGB::Carnation.to_grayscale)
+      assert_equal(Color::Grayscale.from_percentage(27.65), Color::RGB::Cayenne.to_grayscale)
+    end
+
+    def test_to_hsl
+      assert_kind_of(Color::HSL, Color::RGB::Black.to_hsl)
+      assert_equal(Color::HSL.from_values(0, 0, 0), Color::RGB::Black.to_hsl)
+      assert_equal(Color::HSL.from_values(60, 100, 50), Color::RGB::Yellow.to_hsl)
+      assert_equal(Color::HSL.from_values(180, 100, 50), Color::RGB::Cyan.to_hsl)
+      assert_equal(Color::HSL.from_values(300, 100, 50), Color::RGB::Magenta.to_hsl)
+      assert_equal(Color::HSL.from_values(0, 100, 50), Color::RGB::Red.to_hsl)
+      assert_equal(Color::HSL.from_values(120, 100, 50), Color::RGB::Lime.to_hsl)
+      assert_equal(Color::HSL.from_values(240, 100, 50), Color::RGB::Blue.to_hsl)
+      assert_equal(Color::HSL.from_values(300, 100, 25.10), Color::RGB::Purple.to_hsl)
+      assert_equal(Color::HSL.from_values(0, 59.42, 40.59), Color::RGB::Brown.to_hsl)
+      assert_equal(Color::HSL.from_values(317.5, 100, 68.43), Color::RGB::Carnation.to_hsl)
+      assert_equal(Color::HSL.from_values(0, 100, 27.64), Color::RGB::Cayenne.to_hsl)
+
+      # The following tests a bug reported by Jean Krohn on 10 June 2006 where HSL
+      # conversion was not quite correct, resulting in a bad round-trip.
+      assert_equal("RGB [#008800]", Color::RGB.from_html("#008800").to_hsl.to_rgb.inspect)
+      refute_equal("RGB [#002288]", Color::RGB.from_html("#008800").to_hsl.to_rgb.inspect)
+
+      # The following tests a bug reported by Adam Johnson on 29 October
+      # 2010.
+      hsl = Color::HSL.from_values(262, 67, 42)
+      c = Color::RGB.from_fraction(0.34496, 0.1386, 0.701399).to_hsl
+      assert_in_tolerance hsl.h, c.h, "Hue"
+      assert_in_tolerance hsl.s, c.s, "Saturation"
+      assert_in_tolerance hsl.l, c.l, "Luminance"
+    end
+
+    def test_to_lab
+      # Luminosity can be an absolute.
+      assert_in_tolerance(0.0, Color::RGB::Black.to_lab.l)
+      assert_in_tolerance(100.0, Color::RGB::White.to_lab.l)
+
+      # It's not really possible to have absolute
+      # numbers here because of how L*a*b* works, but
+      # negative/positive comparisons work
+      assert(Color::RGB::Green.to_lab.a < 0)
+      assert(Color::RGB::Magenta.to_lab.a > 0)
+      assert(Color::RGB::Blue.to_lab.b < 0)
+      assert(Color::RGB::Yellow.to_lab.b > 0)
+    end
 
     # # An RGB color round-tripped through CIELAB should still have more or less the same
     # # RGB values, but this doesn't really work because the color math here is slightly
@@ -340,5 +323,36 @@ module TestColor
     #     assert_in_tolerance(c1.b, c2.b)
     #   end
     # end
+
+    def test_to_rgb
+      assert_same(Color::RGB::Black, Color::RGB::Black.to_rgb)
+    end
+
+    def test_to_xyz
+      assert_kind_of(Color::XYZ, Color::RGB::Black.to_xyz)
+      assert_equal(Color::XYZ.from_values(0, 0, 0), Color::RGB::Black.to_xyz)
+      assert_equal(Color::XYZ.from_fraction(0.4124564, 0.2126729, 0.0193339), Color::RGB::Red.to_xyz)
+      assert_equal(Color::XYZ.from_fraction(0.0771865, 0.1543731, 0.0257288), Color::RGB::Green.to_xyz)
+      assert_equal(Color::XYZ.from_fraction(0.1804375, 0.072175, 0.9503041), Color::RGB::Blue.to_xyz)
+    end
+
+    def test_to_yiq
+      assert_kind_of(Color::YIQ, Color::RGB::Black.to_yiq)
+      assert_equal(Color::YIQ.from_values(0, 0, 0), Color::RGB::Black.to_yiq)
+      assert_equal(Color::YIQ.from_values(88.6, 32.1, 0), Color::RGB::Yellow.to_yiq)
+      assert_equal(Color::YIQ.from_values(70.1, 0, 0), Color::RGB::Cyan.to_yiq)
+      assert_equal(Color::YIQ.from_values(41.3, 27.5, 52.3), Color::RGB::Magenta.to_yiq)
+      assert_equal(Color::YIQ.from_values(29.9, 59.6, 21.2), Color::RGB::Red.to_yiq)
+      assert_equal(Color::YIQ.from_values(58.7, 0, 0), Color::RGB::Lime.to_yiq)
+      assert_equal(Color::YIQ.from_values(11.4, 0, 31.1), Color::RGB::Blue.to_yiq)
+      assert_equal(Color::YIQ.from_values(20.73, 13.80, 26.25), Color::RGB::Purple.to_yiq)
+      assert_equal(Color::YIQ.from_values(30.89, 28.75, 10.23), Color::RGB::Brown.to_yiq)
+      assert_equal(Color::YIQ.from_values(60.84, 23.28, 27.29), Color::RGB::Carnation.to_yiq)
+      assert_equal(Color::YIQ.from_values(16.53, 32.96, 11.72), Color::RGB::Cayenne.to_yiq)
+    end
+
+    def test_to_internal
+      assert_equal([0.0, 0.0, 0.0], Color::RGB::Black.to_internal)
+    end
   end
 end