color_calculator 0.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb265697fa59d6dd79763755e743efeb50051c9
-  data.tar.gz: bbd472be88da168b8dcc4a82f9bbbc936bf2bd93
+  metadata.gz: c07fc4c3003a07a1504d0814fa9d6de586750340
+  data.tar.gz: 7d3f50d42bc4e3e7455b7f568df58311f863f9b8
 SHA512:
-  metadata.gz: 1193d2cb045d199418b1a6fad751797dac69f8e6a950731718da26b1febfaccbe61e6a442be3ece73489d649bf4709dd9ff342a89f38a60ad3c689566128411f
-  data.tar.gz: 7a1d4432fc6257e7bc55698f2c1c3ed7b69216ef01ef722cb0dc8d3bd512dca93b9c7e694d6a5939af85e192bc9bac3f0e327a6bac67df8e5a51a88878ba9e90
+  metadata.gz: 7d4388fd40c9f0b7a199a791c30dd090e21c7e2fd287f42f88610e820a00f48f672aaef089a51e0779ecdd877f356b824465f57679ddc3342c7302e1ca430cce
+  data.tar.gz: ed5ff908d20a4b03739dd31fbd8f8add01e3127e6f190290f9b04969227cf5dba2d2e0d07f12d519cc2576f3efb3843b2ebe86b7b362c9b0a0d3345310a16974

data/lib/color_calculator/calculation/delta_e_2000.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../clump/lab'
+require_relative '../shared/constants'
 
 module ColorCalculator
   module Calculation
@@ -11,9 +12,6 @@ module ColorCalculator
         end
       end
 
-      RADIANS_TO_DEGREES = 180.to_f / Math::PI
-      DEGREES_TO_RADIANS = 1.to_f / RADIANS_TO_DEGREES
-
       K_OF_L = 1
       K_OF_C = 1
       K_OF_H = 1
@@ -65,7 +63,7 @@ module ColorCalculator
         [
           2,
           Math.sqrt(c_prime_reference * c_prime_sample),
-          Math.sin(Rational(delta_little_h_prime, 2) * DEGREES_TO_RADIANS),
+          Math.sin(Rational(delta_little_h_prime, 2) * Constants::DEGREES_TO_RADIANS),
         ].reduce(:*)
       end
 
@@ -74,7 +72,7 @@ module ColorCalculator
       end
 
       def r_of_t
-        -1 * Math.sin(2 * delta_theta * DEGREES_TO_RADIANS) * r_of_c
+        -1 * Math.sin(2 * delta_theta * Constants::DEGREES_TO_RADIANS) * r_of_c
       end
 
       %i[reference sample].each do |lab|
@@ -115,7 +113,10 @@ module ColorCalculator
         define_method("little_h_prime_#{lab}") do
           return 0 if [send(lab).beta, send("a_prime_#{lab}")].all? { |el| el == 0 }
 
-          (Math.atan2(send(lab).beta, send("a_prime_#{lab}")) * RADIANS_TO_DEGREES) % 360
+          (
+            Math.atan2(send(lab).beta, send("a_prime_#{lab}")) *
+              Constants::RADIANS_TO_DEGREES
+          ) % 360
         end
       end
 
@@ -174,10 +175,10 @@ module ColorCalculator
       def big_t
         [
           1,
-          -0.17 * Math.cos((little_h_bar_prime - 30) * DEGREES_TO_RADIANS),
-          0.24 * Math.cos(2 * little_h_bar_prime * DEGREES_TO_RADIANS),
-          0.32 * Math.cos((3 * little_h_bar_prime + 6) * DEGREES_TO_RADIANS),
-          -0.2 * Math.cos((4 * little_h_bar_prime - 63) * DEGREES_TO_RADIANS),
+          -0.17 * Math.cos((little_h_bar_prime - 30) * Constants::DEGREES_TO_RADIANS),
+          0.24 * Math.cos(2 * little_h_bar_prime * Constants::DEGREES_TO_RADIANS),
+          0.32 * Math.cos((3 * little_h_bar_prime + 6) * Constants::DEGREES_TO_RADIANS),
+          -0.2 * Math.cos((4 * little_h_bar_prime - 63) * Constants::DEGREES_TO_RADIANS),
         ].reduce(:+)
       end
 

data/lib/color_calculator/clump.rb

@@ -2,7 +2,7 @@
 
 require_relative 'clump/abstract'
 require_relative 'clump/lab'
-require_relative 'clump/lch_ab'
+require_relative 'clump/lch'
 require_relative 'clump/rgb'
 require_relative 'clump/xyz'
 

data/lib/color_calculator/clump/{lch_ab.rb → lch.rb}

@@ -4,7 +4,7 @@ require_relative 'abstract'
 
 module ColorCalculator
   module Clump
-    class LchAb < Abstract
+    class Lch < Abstract
       class << self
         def attributes
           %i[lightness chroma hue]

data/lib/color_calculator/conversion.rb

@@ -1,10 +1,48 @@
 # frozen_string_literal: true
 
-require_relative 'conversion/lab_to_lch_ab'
+require_relative 'conversion/lab_to_lch'
+require_relative 'conversion/lab_to_xyz'
+require_relative 'conversion/lch_to_lab'
+require_relative 'conversion/rgb_to_lch'
 require_relative 'conversion/rgb_to_xyz'
-require_relative 'conversion/rgb_to_lch_ab'
 require_relative 'conversion/xyz_to_lab'
+require_relative 'conversion/xyz_to_rgb'
 
 module ColorCalculator
-  module Conversion; end
+  module Conversion
+    NOOP = -> (value) { value }
+
+    # Doesn't seem like it's worth it to build a proper graph for this yet.
+    # This map is fine, even if it is a bit repetitive.
+    MAP = {
+      lab: {
+        lab: NOOP,
+        lch: LabToLch.to_proc,
+        rgb: [LabToXyz, XyzToRgb].map(&:to_proc).reduce(:>>),
+        xyz: LabToXyz.to_proc
+      },
+      lch: {
+        lab: LchToLab.to_proc,
+        lch: NOOP,
+        rgb: [LchToLab, LabToXyz, XyzToRgb].map(&:to_proc).reduce(:>>),
+        xyz: [LchToLab, LabToXyz].map(&:to_proc).reduce(:>>)
+      },
+      rgb: {
+        lab: [RgbToXyz, XyzToLab].map(&:to_proc).reduce(:>>),
+        lch: [RgbToXyz, XyzToLab, LabToLch].map(&:to_proc).reduce(:>>),
+        rgb: NOOP,
+        xyz: RgbToXyz.to_proc
+      },
+      xyz: {
+        lab: XyzToLab.to_proc,
+        lch: [XyzToLab, LabToLch].map(&:to_proc).reduce(:>>),
+        rgb: XyzToRgb.to_proc,
+        xyz: NOOP
+      }
+    }
+
+    def self.build(from, to)
+      MAP[from][to]
+    end
+  end
 end

data/lib/color_calculator/conversion/{lab_to_lch_ab.rb → lab_to_lch.rb}

@@ -1,22 +1,21 @@
 # frozen_string_literal: true
 
 require_relative '../clump/lab'
-require_relative '../clump/lch_ab'
+require_relative '../clump/lch'
 require_relative '../shared/composable'
+require_relative '../shared/constants'
 
 module ColorCalculator
   module Conversion
-    class LabToLchAb
+    class LabToLch
       extend ColorCalculator::Composable
 
-      RADIANS_TO_DEGREES = 180 / Math::PI
-
       def initialize(lab)
         @lab = lab
       end
 
       def call
-        ColorCalculator::Clump::LchAb.new(lightness, chroma, hue)
+        ColorCalculator::Clump::Lch.new(lightness, chroma, hue)
       end
 
       private
@@ -32,7 +31,7 @@ module ColorCalculator
       end
 
       def hue
-        val = Math.atan2(lab.beta, lab.alpha) * RADIANS_TO_DEGREES
+        val = Math.atan2(lab.beta, lab.alpha) * Constants::RADIANS_TO_DEGREES
 
         return val if val >= 0
 

data/lib/color_calculator/conversion/lab_to_xyz.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require_relative '../clump/lab'
+require_relative '../clump/xyz'
+require_relative '../shared/composable'
+
+module ColorCalculator
+  module Conversion
+    class LabToXyz
+      extend ColorCalculator::Composable
+
+      def initialize(lab)
+        @lab = lab
+      end
+
+      def call
+        Clump::Xyz.new(x, y, z)
+      end
+
+      private
+
+      attr_reader :lab
+
+      def x
+        x_of_r * Constants::D50.fetch(:x)
+      end
+
+      def y
+        y_of_r * Constants::D50.fetch(:y)
+      end
+
+      def z
+        z_of_r * Constants::D50.fetch(:z)
+      end
+
+      def f_of_x
+        Rational(lab.alpha, 500) + f_of_y
+      end
+
+      def f_of_y
+        Rational(lab.lightness + 16, 116)
+      end
+
+      def f_of_z
+        f_of_y - Rational(lab.beta, 200)
+      end
+
+      def x_of_r
+        val = f_of_x ** 3
+        return val if val > Constants::EPSILON
+
+        Rational(116 * f_of_x - 16, Constants::KAPPA)
+      end
+
+      def y_of_r
+        if lab.lightness > (Constants::KAPPA * Constants::EPSILON)
+          return Rational(Rational(lab.lightness + 16, 116)) ** 3
+        end
+
+        Rational(lab.lightness, Constants::KAPPA)
+      end
+
+      def z_of_r
+        val = f_of_z ** 3
+        return val if val > Constants::EPSILON
+
+        Rational(116 * f_of_z - 16, Constants::KAPPA)
+      end
+    end
+  end
+end

data/lib/color_calculator/conversion/lch_to_lab.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative '../clump/lab'
+require_relative '../clump/lch'
+require_relative '../shared/composable'
+require_relative '../shared/constants'
+
+module ColorCalculator
+  module Conversion
+    class LchToLab
+      extend Composable
+
+      def initialize(lch)
+        @lch = lch
+      end
+
+      def call
+        Clump::Lab.new(lightness, alpha, beta)
+      end
+
+      private
+
+      attr_reader :lch
+
+      def lightness
+        lch.lightness
+      end
+
+      def alpha
+        lch.chroma * Math.cos(lch.hue * Constants::DEGREES_TO_RADIANS)
+      end
+
+      def beta
+        lch.chroma * Math.sin(lch.hue * Constants::DEGREES_TO_RADIANS)
+      end
+    end
+  end
+end

data/lib/color_calculator/conversion/{rgb_to_lch_ab.rb → rgb_to_lch.rb}

@@ -3,11 +3,11 @@
 require_relative '../shared/composable'
 require_relative '../conversion/rgb_to_xyz'
 require_relative '../conversion/xyz_to_lab'
-require_relative '../conversion/lab_to_lch_ab'
+require_relative '../conversion/lab_to_lch'
 
 module ColorCalculator
   module Conversion
-    class RgbToLchAb
+    class RgbToLch
       extend ColorCalculator::Composable
 
       def initialize(rgb)
@@ -30,7 +30,7 @@ module ColorCalculator
         [
           ColorCalculator::Conversion::RgbToXyz,
           ColorCalculator::Conversion::XyzToLab,
-          ColorCalculator::Conversion::LabToLchAb
+          ColorCalculator::Conversion::LabToLch
         ]
       end
     end

data/lib/color_calculator/conversion/xyz_to_lab.rb

@@ -3,26 +3,23 @@
 require_relative '../clump/lab'
 require_relative '../clump/xyz'
 require_relative '../shared/composable'
+require_relative '../shared/constants'
 
 module ColorCalculator
   module Conversion
     class XyzToLab
       extend ColorCalculator::Composable
 
-      D50 = { x: 0.964220, y: 1.000000, z: 0.825210 }
-      EPSILON = 0.008856
-      KAPPA = 903.3
-
       APPLE = -> (value) do
         value ** Rational(1, 3)
       end
 
       BANANA = -> (value) do
-        ((KAPPA * value) + 16) / 116
+        ((Constants::KAPPA * value) + 16) / 116
       end
 
       FRUIT = -> (value) do
-        (value > EPSILON ? APPLE : BANANA).call(value)
+        (value > Constants::EPSILON ? APPLE : BANANA).call(value)
       end
 
       def initialize(xyz)
@@ -51,7 +48,7 @@ module ColorCalculator
 
       %i[x y z].each do |symbol|
         define_method("#{symbol}_scaled") do
-          xyz.public_send(symbol) / D50.fetch(symbol)
+          xyz.public_send(symbol) / Constants::D50.fetch(symbol)
         end
       end
     end

data/lib/color_calculator/conversion/xyz_to_rgb.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative '../clump/rgb'
+require_relative '../clump/xyz'
+
+require_relative '../shared/composable'
+require_relative '../shared/constants'
+
+module ColorCalculator
+  module Conversion
+    class XyzToRgb
+      extend ColorCalculator::Composable
+
+      XYZ_TO_RGB_TRANSFORM_D50 = [
+        [3.1338561, -1.6168667, -0.4906146],
+        [-0.9787684, 1.9161415, 0.0334540],
+        [0.0719453, -0.2289914, 1.4052427]
+      ]
+
+      RGB_COMPAND = -> (value) do
+        if value <= 0.0031308
+          12.92 * value
+        else
+          1.055 * (value ** Rational(10, 24)) - 0.055
+        end
+      end 
+
+      def initialize(xyz)
+        @xyz = xyz
+      end
+
+      def call
+        Clump::Rgb.new(red, green, blue, normalized: true)
+      end
+
+      private
+
+      attr_reader :xyz
+
+      def red
+        RGB_COMPAND.call(linear_rgb.fetch(:red))
+      end
+
+      def green
+        RGB_COMPAND.call(linear_rgb.fetch(:green))
+      end
+
+      def blue
+        RGB_COMPAND.call(linear_rgb.fetch(:blue))
+      end
+
+      def linear_rgb
+        Hash[
+          %i[red green blue].zip(
+            XYZ_TO_RGB_TRANSFORM_D50.map do |row|
+              %i[x y z].map.with_index do |xyz_val, index|
+                row[index] * xyz.public_send(xyz_val)
+              end.sum
+            end
+          )
+        ]
+      end
+    end
+  end
+end

data/lib/color_calculator/shared/constants.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ColorCalculator
+  module Constants
+    RADIANS_TO_DEGREES = Rational(180, Math::PI)
+
+    DEGREES_TO_RADIANS = Rational(Math::PI, 180)
+
+    D50 = { x: 0.964220, y: 1.000000, z: 0.825210 }
+
+    EPSILON = 0.008856
+
+    KAPPA = 903.3
+  end
+end

data/lib/color_calculator/version.rb

@@ -3,5 +3,5 @@
 require_relative '../color_calculator'
 
 module ColorCalculator
-  VERSION = '0.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color_calculator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nathan Seither
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies: []
 description: You can do color math now!
 email:
@@ -25,15 +25,19 @@ files:
 - lib/color_calculator/clump.rb
 - lib/color_calculator/clump/abstract.rb
 - lib/color_calculator/clump/lab.rb
-- lib/color_calculator/clump/lch_ab.rb
+- lib/color_calculator/clump/lch.rb
 - lib/color_calculator/clump/rgb.rb
 - lib/color_calculator/clump/xyz.rb
 - lib/color_calculator/conversion.rb
-- lib/color_calculator/conversion/lab_to_lch_ab.rb
-- lib/color_calculator/conversion/rgb_to_lch_ab.rb
+- lib/color_calculator/conversion/lab_to_lch.rb
+- lib/color_calculator/conversion/lab_to_xyz.rb
+- lib/color_calculator/conversion/lch_to_lab.rb
+- lib/color_calculator/conversion/rgb_to_lch.rb
 - lib/color_calculator/conversion/rgb_to_xyz.rb
 - lib/color_calculator/conversion/xyz_to_lab.rb
+- lib/color_calculator/conversion/xyz_to_rgb.rb
 - lib/color_calculator/shared/composable.rb
+- lib/color_calculator/shared/constants.rb
 - lib/color_calculator/version.rb
 homepage: https://github.com/Supernats/color_calculator
 licenses: