color_decomposition 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3e2459586c1089713d950211118369334dd380
-  data.tar.gz: 7febaebbff5ed6b25d45fff3b0a724d29ecf984a
+  metadata.gz: fc3e803bc5908b9cb25b57251e06591ad0a62e37
+  data.tar.gz: 59e3d925eaadaf333b1d343b1f5ed31a286fa2eb
 SHA512:
-  metadata.gz: 786af0e7a8fb9d336f4be8aec8f6a873607ac98d150d5111576bf0f41691355f823f876dcd9b0e0793c44a1f49698c7f5b1a4315efe9019d2003b9cfa956a6e7
-  data.tar.gz: b5cf8c04d802782c02c262b1eb278e3453955503d5c2d684e7306b57c390d48cbcda6fa44dd8ddf2ea7663d19b0c5c6c09f52d082b84e6ef671a847300e296cc
+  metadata.gz: 79860c07be844b1533ef40103479c5480423fe6ecfea658336340a2f7537c17b1141bc60076884b82124a99d785189296071d0a14415da648a80c7dda7702722
+  data.tar.gz: 109c3186fc6287c349db46ae18ed668d11ce86379a0b70befd7362e83813f12940abdb5917dc95acaf30a6de2b3fd14e60df50774a7b99920094e7e8f46b822b

data/README.md

@@ -73,11 +73,11 @@ require 'color_decomposition'
 
 include ColorDecomposition
 
-color1 = Color.new({r: 255, g: 120, b: 60})
+color1 = Color.new(r: 255, g: 120, b: 60)
 puts color1.xyz # {:x=>48.77208180663368, :y=>35.01918603060906, :z=>8.46377233268254}
 puts color1.lab # {:l=>65.76360001472788, :a=>47.86642591164642, :b=>55.61626679147632}
 
-color2 = Color.new({r: 80, g: 49, b: 220})
+color2 = Color.new(r: 80, g: 49, b: 220)
 puts Comparator.ciede2000(color1.lab, color2.lab) # 57.24131929494836
 ```
 

data/lib/color_decomposition/color/color.rb

@@ -9,37 +9,37 @@ module ColorDecomposition
     end
 
     def xyz
-      r = xyz_channel(@rgb[:r] / 255.0)
-      g = xyz_channel(@rgb[:g] / 255.0)
-      b = xyz_channel(@rgb[:b] / 255.0)
-
-      # sRGB D65 illuminant and 2 degrees observer values
-      s = Matrix[[0.4124, 0.3576, 0.1805],
-                 [0.2126, 0.7152, 0.0722],
-                 [0.0193, 0.1192, 0.9505]]
-
-      xyz = s * Matrix[[r], [g], [b]] * 100
-      { x: xyz[0, 0], y: xyz[1, 0], z: xyz[2, 0] }
+      @xyz ||= begin
+        r = xyz_channel(@rgb[:r] / 255.0)
+        g = xyz_channel(@rgb[:g] / 255.0)
+        b = xyz_channel(@rgb[:b] / 255.0)
+
+        # sRGB D65 illuminant and 2 degrees observer values
+        s = Matrix[[0.4124, 0.3576, 0.1805],
+                   [0.2126, 0.7152, 0.0722],
+                   [0.0193, 0.1192, 0.9505]]
+
+        xyz = s * Matrix[[r], [g], [b]] * 100
+        { x: xyz[0, 0], y: xyz[1, 0], z: xyz[2, 0] }
+      end
     end
 
     def lab
-      xyz_to_lab(xyz)
+      @lab ||= begin
+        # CIEXYZ white point values (D65)
+        x = lab_channel(xyz[:x] / 95.047)
+        y = lab_channel(xyz[:y] / 100.000)
+        z = lab_channel(xyz[:z] / 108.883)
+
+        l = 116 * y - 16
+        a = 500 * (x - y)
+        b = 200 * (y - z)
+        { l: l.clamp(0, 100), a: a, b: b }
+      end
     end
 
     private
 
-    def xyz_to_lab(xyz)
-      # CIEXYZ white point values (D65)
-      x = lab_channel(xyz[:x] / 95.047)
-      y = lab_channel(xyz[:y] / 100.000)
-      z = lab_channel(xyz[:z] / 108.883)
-
-      l = 116 * y - 16
-      a = 500 * (x - y)
-      b = 200 * (y - z)
-      { l: l.clamp(0, 100), a: a, b: b }
-    end
-
     def xyz_channel(color)
       if color > 0.04045
         ((color + 0.055) / 1.055)**2.4

data/lib/color_decomposition/version.rb

@@ -1,3 +1,3 @@
 module ColorDecomposition
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: color_decomposition
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonas Bleyl