color 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0f595f559249d4eed1b1a71514d9b31caf458544b10d791b954b68d42ae169
-  data.tar.gz: 1d6680d9805b0556a7b865b5bf9bced7b089ed72c8889a7187ac30a082826efb
+  metadata.gz: 40ce91bfc8f772f3a22829e81620a7ed6b5cbc0c17b2b779c2680811df98adfb
+  data.tar.gz: c694153e0f54a6b310df3412379e2b57beaf393b72a70e659d6ce5b4489ab9e2
 SHA512:
-  metadata.gz: 6bb3c94216b72f936f2252de8b698ff28e8fbc240bee72fa5cd4d016f3a911de3755b8ba892cbe857a8f3f4a9aeaef4bd79132e14c4230eff2f047690a8940d2
-  data.tar.gz: 275c0cdaed2c2474eedc59a915910dca1573a95f35f7cf41a5758f60284dbb3402454b56c17fb0d833de0b57047dddde25df09f2211585fe5957be68ee1791f2
+  metadata.gz: f6276623790aed0ec56a46e3e86cd00e76d5579bb8d71044f3d58532af59c834c55ce15202ff2a64514a817810236b01f1fe22484a54ea9ee093e0f997312323
+  data.tar.gz: 3207d0833c0a85159e77816b71d9c312c5d78f40c5f5fe00022d615ecbe19f24fd06bcbfbce9562085a925473544d2ced2e4ce472ee8d456f5d310f9ff6261db

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 2.1.0 / 2025-07-20
+
+Color 2.1.0 fixes a computation bug where CIE XYZ values were improperly clamped
+and adds more Color::XYZ white points for standard illuminants.
+
+- Fixes a bug where standard illuminant white points were improperly clamped and
+  was seen in `Color::RGB#to_lab` since CIELAB conversions must go through the
+  XYZ color model. Even though we were using the D65 white point, the Z value
+  was being clamped to 1.0 instead of the correct value of ≅1.08. Reported by
+  @r-plus in [#45][issue-45] and fixed in [#45][pr-46].
+
+  The resulting Color::LAB values are not _exactly_ the same values under Color
+  1.8, but they are within fractional differences deemed acceptable.
+
+- Added more white points for standard illuminants in the Color::XYZ::WP2
+  constant. The values here were derived from the
+  [White points of standard illuminants][wp-std-illuminant] using the `xyY` to
+  `XYZ` conversion formula where `X = (x * Y) / y` and
+  `Z = ((1 - x - y) * Y) / y`. Only the values for CIE 1931 2° were computed.
+  The values for Color::XYZ::D50 and Color::XYZ::D65 were replaced with these
+  computed values.
+
 ## 2.0.1 / 2025-07-05
 
 Color 2.0.1 is a minor documentation update.
@@ -309,6 +331,9 @@ ownership to contribute it to this project under the licence terms.
 [css-device-cmyk]: https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/device-cmyk
 [issue-10]: https://github.com/halostatue/color/issues/10
 [issue-30]: https://github.com/halostatue/color/issues/30
+[issue-45]: https://github.com/halostatue/color/issues/45
 [pr-11]: https://github.com/halostatue/color/pull/11
-[pr-8]: https://github.com/halostatue/color/pulls/8
 [pr-36]: https://github.com/halostatue/color/pull/36
+[pr-46]: https://github.com/halostatue/pull/46
+[pr-8]: https://github.com/halostatue/color/pulls/8
+[wp-std-illuminant]: https://en.wikipedia.org/wiki/Standard_illuminant#White_points_of_standard_illuminants

data/CONTRIBUTORS.md

@@ -7,5 +7,6 @@
 - Aaron Hill (CIE94 color matching)
 - Luke Bennellick
 - @stiff (CIELAB color support)
+- @r-plus
 - Matthew Draper
 - Charles Nutter

data/README.md

@@ -22,9 +22,11 @@ reliably converted to relative color spaces (like RGB) without color profiles.
 When necessary for conversions, Color provides D65 and D50 reference white
 values in Color::XYZ.
 
-Color 2.0 is a major release, dropping support for all versions of Ruby prior to
-3.2 as well as removing or renaming a number of features. The main breaking
-changes are:
+Color 2.1 fixes a Color::XYZ bug where the values were improperly clamped and
+adds more Color::XYZ white points for standard illuminants. It builds on the
+Color 2.0 major release, dropping support for all versions of Ruby prior to 3.2
+as well as removing or renaming a number of features. The main breaking changes
+are:
 
 - Color classes are immutable Data objects; they are no longer mutable.
 - RGB named colors are no longer loaded on gem startup, but must be required

data/lib/color/version.rb

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

data/lib/color/xyz.rb

@@ -83,15 +83,18 @@ class Color::XYZ
   # 0 and 1 and `x` and `z` must be fractional valiues greater than or equal to 0.
   #
   # ```ruby
-  # Color::XYZ.from_fraction(0.95047, 1.0, 1.0.883)
+  # Color::XYZ.from_fraction(0.95047, 1.0, 1.0883)
   # Color::XYZ.new(0.95047, 1.0, 1.08883)
   # Color::XYZ[x: 0.95047, y: 1.0, z: 1.08883]
   # ```
   def initialize(x:, y:, z:)
+    # The X and Z values in the XYZ color model are technically unbounded. With Y scaled
+    # to 1.0, we will clamp X to 0.0..2.2 and Z to 0.0..2.8.
+
     super(
-      x: normalize(x, 0.0..1.0),
+      x: normalize(x, 0.0..2.2),
       y: normalize(y),
-      z: normalize(z, 0.0..1.0)
+      z: normalize(z, 0.0..2.8)
     )
   end
 
@@ -105,11 +108,70 @@ class Color::XYZ
   K = 24389r/27r # :nodoc:
   EK = E * K # :nodoc:
 
-  # The D65 standard illuminant white point
-  D65 = new(0.95047, 1.0, 1.08883)
+  ##
+  # White points for standard illuminants at 2° (CIE 1931).
+  WP2 = {
+    A: new(1.09849161234507, 1.0, 0.355798257454902),
+    B: new(0.9909274480248, 1.0, 0.853132732288615),
+    C: new(0.980705971659919, 1.0, 1.18224949392713),
+    D50: new(0.964211994421199, 1.0, 0.825188284518828),
+    D55: new(0.956797052643698, 1.0, 0.921480586017327),
+    D65: new(0.950430051970945, 1.0, 1.08880649180926),
+    D75: new(0.949722089884072, 1.0, 1.22639352072415),
+    D93: new(0.953014035205816, 1.0, 1.41274275520851),
+    E: new(1, 1.0, 1.0000300003),
+    F1: new(0.92833634773327, 1.0, 1.03664719660806),
+    F2: new(0.991446614618029, 1.0, 0.673159423379253),
+    F3: new(1.03753487192493, 1.0, 0.49860512300279),
+    F4: new(1.0914726375561, 1.0, 0.388132609288601),
+    F5: new(0.908719701138108, 1.0, 0.987228866815325),
+    F6: new(0.973091283635895, 1.0, 0.601905497618128),
+    F7: new(0.950171560440895, 1.0, 1.08629642000425),
+    F8: new(0.96412543554007, 1.0, 0.823331010452962),
+    F9: new(1.00364797081623, 1.0, 0.678683511708377),
+    F10: new(0.961735119213027, 1.0, 0.817123325737787),
+    F11: new(1.00898894280487, 1.0, 0.642616604353936),
+    F12: new(1.08046289656537, 1.0, 0.392275166291635),
+    "FL3.0": new(1.09273493677163, 1.0, 0.3868088271758),
+    "FL3.1": new(1.01981788966256, 1.0, 0.658275307980718),
+    "FL3.2": new(0.916836289619075, 1.0, 0.990985751671998),
+    "FL3.3": new(1.09547365817462, 1.0, 0.377937175364828),
+    "FL3.4": new(1.02096949891068, 1.0, 0.702342047930283),
+    "FL3.5": new(0.968888888888889, 1.0, 0.808888888888889),
+    "FL3.6": new(1.08380716934487, 1.0, 0.388380716934487),
+    "FL3.7": new(0.996868475991649, 1.0, 0.612734864300626),
+    "FL3.8": new(0.974380395433027, 1.0, 0.810359231411863),
+    "FL3.9": new(0.970505617977528, 1.0, 0.838483146067416),
+    "FL3.10": new(0.944962143273151, 1.0, 0.967093768200349),
+    "FL3.11": new(1.08422095615556, 1.0, 0.392865989596235),
+    "FL3.12": new(1.02846401718582, 1.0, 0.656820622986037),
+    "FL3.13": new(0.955112219451372, 1.0, 0.815738431698531),
+    "FL3.14": new(0.951034063260341, 1.0, 1.09032846715328),
+    HP1: new(1.28433734939759, 1.0, 0.125301204819277),
+    HP2: new(1.14911014911015, 1.0, 0.255892255892256),
+    HP3: new(1.05570552147239, 1.0, 0.398282208588957),
+    HP4: new(1.00395048722676, 1.0, 0.62970766394522),
+    HP5: new(1.01696741179639, 1.0, 0.676272555884729),
+    "LED-B1": new(1.11819519372241, 1.0, 0.3339872486513),
+    "LED-B2": new(1.08599202392822, 1.0, 0.406530408773679),
+    "LED-B3": new(1.0088638195004, 1.0, 0.677142089712597),
+    "LED-B4": new(0.977155910908053, 1.0, 0.87835522558538),
+    "LED-B5": new(0.963535228677379, 1.0, 1.12669962917182),
+    "LED-BH1": new(1.10034431874078, 1.0, 0.359075258239056),
+    "LED-RGB1": new(1.08216575635241, 1.0, 0.292567086202802),
+    "LED-V1": new(1.12462908011869, 1.0, 0.348170128585559),
+    "LED-V2": new(1.00158940397351, 1.0, 0.647417218543046),
+    ID50: new(0.952803997779012, 1.0, 0.823431426985008),
+    ID65: new(0.939522225582099, 1.0, 1.08436649531297)
+  }.freeze
 
-  # The D50 standard illuminant white point
-  D50 = new(0.96421, 1.0, 0.82521)
+  ##
+  # The D50 standard illuminant white point at 2° (CIE 1931).
+  D50 = WP2[:D50]
+
+  ##
+  # The D65 standard illuminant white point at 2° (CIE 1931).
+  D65 = WP2[:D65]
 
   ##
   # Coerces the other Color object into \XYZ.

data/lib/color.rb

@@ -17,8 +17,10 @@
 # spaces (like RGB) without color profiles. When necessary for conversions, \Color
 # provides \D65 and \D50 reference white values in Color::XYZ.
 #
-# Color 2.0 is a major release, dropping support for all versions of Ruby prior to 3.2 as
-# well as removing or renaming a number of features. The main breaking changes are:
+# Color 2.1 fixes a Color::XYZ bug where the values were improperly clamped and adds more
+# Color::XYZ white points for standard illuminants. It builds on the Color 2.0 major
+# release, dropping support for all versions of Ruby prior to 3.2 as well as removing or
+# renaming a number of features. The main breaking changes are:
 #
 # - Color classes are immutable Data objects; they are no longer mutable.
 # - RGB named colors are no longer loaded on gem startup, but must be required explicitly

data/test/test_rgb.rb

@@ -317,6 +317,15 @@ module TestColor
       end
     end
 
+    def test_fix_45_invalid_rgb_to_lab
+      assert_equal(
+        Color::CIELAB[56.2562, 88.1033, -18.8203],
+        Color::RGB.by_hex("#ff00aa").to_lab
+      )
+
+      assert_equal("#ff00aa", Color::RGB.by_hex("#ff00aa").to_lab.to_rgb.html)
+    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
     # # wrong.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: color
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Austin Ziegler
@@ -223,9 +223,11 @@ description: |-
   When necessary for conversions, Color provides D65 and D50 reference white
   values in Color::XYZ.
 
-  Color 2.0 is a major release, dropping support for all versions of Ruby prior to
-  3.2 as well as removing or renaming a number of features. The main breaking
-  changes are:
+  Color 2.1 fixes a Color::XYZ bug where the values were improperly clamped and
+  adds more Color::XYZ white points for standard illuminants. It builds on the
+  Color 2.0 major release, dropping support for all versions of Ruby prior to 3.2
+  as well as removing or renaming a number of features. The main breaking changes
+  are:
 
   - Color classes are immutable Data objects; they are no longer mutable.
   - RGB named colors are no longer loaded on gem startup, but must be required