redgreenblue 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b5f73bd443540e199b93625df5c7447491b502573abe5aa14089f895fd2700
-  data.tar.gz: c0a3c77946d5a4d0e6c43d5769385a6c5b72df52c9f7a4cfb52d09bdc50a5153
+  metadata.gz: 65191c26a6dcae9a6bb52abe182d376e0975b79672686120185c9a2b3d49e4e9
+  data.tar.gz: 3fb9dc542660f5edaec8283a2e74ec0687e369e05475bf6840344ca5cca0304f
 SHA512:
-  metadata.gz: 20b4959b4e82fdf67b48dbff3a0c82713a960c56a5bed7e32a78782cab40f1fb9d0f71c2d2fe93cef887a3c97a2590133a85d68b8d57912d7ec0bc4a0817febe
-  data.tar.gz: bdc13584341d62b90586cf768cd114079e223e64424e0e9e6c24e4398ae74746f2530ed7e2c7540071cf99a4df4afe3a2e7bdadd7c2d0d3dbc6e5d595047d7f7
+  metadata.gz: 4c0d6a47aa611822dba62189c14ebf38c0ef6315f08ac9b5eb9efe04b28487d2c95105c0e86536cb52fdc9ce36df445d060623a14e99f2dbab34df5e0d10e515
+  data.tar.gz: 756bdaa8c6859c685e51342ee8a6d34e7340ea0580bd79b4487443d97b04629ed1b7c8f1631bf3ac26a5570e6c243aba7f7b931243ea967f07d8437fa223d495

data/lib/redgreenblue.rb

@@ -21,9 +21,9 @@ end
 
   inspect view lazy
 
-  rgb565 bgr24bit gif terminal web gpl
+  rgb565 bgr24bit gif terminal web gpl mac
 
-  mix misc random
+  match mix misc random
 
   os
 

data/lib/redgreenblue/cie_1976.rb

@@ -28,7 +28,7 @@ class RGB
     cie_lch_ab_uv(type: :luv)
   end
 
-  # Returns the object's color distance from another RGB object, according to the CIE 1976 delta E formula.
+  # Returns the difference between this color and another color, according to the CIE 1976 delta E formula.
   #
   # Based on:
   # - http://www.brucelindbloom.com/Eqn_DeltaE_CIE76.html
@@ -61,7 +61,7 @@ class RGB
 
     f = [ x / xr, y / yr, z / zr ].map { |v|
       if v > ( 216.0 / 24389 )
-        v ** ( 1.0 / 3 ) # cube root
+        Math.cbrt v
       else
         ( 24389.0 / 27 * v + 16 ) / 116.0
       end
@@ -97,7 +97,7 @@ class RGB
 
     [
       l.round(8),
-      c = ( ( v1 ** 2 + v2 ** 2) ** ( 1.0 / 2 ) ).round(8),
+      c = Math.hypot(v1, v2).round(8),
       c == 0 ? nil : ( Math.atan2(v2, v1) * 180.0 / Math::PI ).modulo(360).round(8)
     ]
   end

data/lib/redgreenblue/lazy.rb

@@ -1,53 +1,73 @@
 class RGB
 
-  # Creates a white RGB object.
-  def self.white
-    new(1,1,1)
-  end
+  #----------------------------------------------------------------------#
+  #                            Class Methods                             #
+  #----------------------------------------------------------------------#
 
-  # Creates a black RGB object.
-  def self.black
-    new(0,0,0)
-  end
+  class << self
 
-  # Creates a grey RGB object. Defaults to lightness 0.5, a middle grey. Black equals grey(0), white equals grey(1).
-  #
-  # ::gray is an alias for ::grey.
-  def self.grey(lightness=0.5)
-    new(lightness, lightness, lightness)
-  end
+    # Creates a white RGB object.
+    def white
+      new(1,1,1)
+    end
 
-  # Alias gray for grey.
-  self.singleton_class.send(:alias_method, :gray, :grey)
+    # Creates a black RGB object.
+    def black
+      new(0,0,0)
+    end
 
-  # Creates a pure red RGB object.
-  def self.red
-    new(1,0,0)
-  end
+    # Creates a grey RGB object. Defaults to lightness 0.5, a middle grey. Black equals grey(0), white equals grey(1).
+    #
+    # ::gray is an alias for ::grey.
+    def grey(lightness=0.5)
+      new(lightness, lightness, lightness)
+    end
 
-  # Creates a pure green RGB object.
-  def self.green
-    new(0,1,0)
-  end
+    # Alias gray for grey.
+    alias gray grey
 
-  # Creates a pure blue RGB object.
-  def self.blue
-    new(0,0,1)
-  end
+    # Creates a pure red RGB object.
+    def red
+      new(1,0,0)
+    end
 
-  # Creates a yellow RGB object.
-  def self.yellow
-    new(1,1,0)
-  end
+    # Creates a pure green RGB object.
+    def green
+      new(0,1,0)
+    end
 
-  # Creates a cyan RGB object.
-  def self.cyan
-    new(0,1,1)
-  end
+    # Creates a pure blue RGB object.
+    def blue
+      new(0,0,1)
+    end
+
+    # Creates a yellow RGB object.
+    def yellow
+      new(1,1,0)
+    end
+
+    # Creates a cyan RGB object.
+    def cyan
+      new(0,1,1)
+    end
+
+    # Creates a magenta RGB object.
+    def magenta
+      new(1,0,1)
+    end
+
+    # Returns the 8 corners of the RGB cube.
+    def corners
+      [ black, red, yellow, green, cyan, blue, magenta, white ]
+    end
+
+    # Returns the centre of the RGB cube.
+    def centre
+      grey
+    end
+
+    alias center centre
 
-  # Creates a magenta RGB object.
-  def self.magenta
-    new(1,0,1)
   end
 
 end

data/lib/redgreenblue/mac.rb

@@ -0,0 +1,8 @@
+class RGB
+
+  # Returns the color in the format used by AppleScript (a 48-bit RGB triplet).
+  def applescript
+    "{%i, %i, %i}" % rrggbb
+  end
+
+end

data/lib/redgreenblue/match.rb

@@ -0,0 +1,21 @@
+class RGB
+
+  # Matches this color to a set of colors by calculating their euclidean distance.
+  #
+  # Returns the given set of colors with their distance from this color, sorted by distance (nearest color first).
+  # @example What is nearer: red, grey or white?
+  #  RGB.hex('f9c').match_distance [RGB.red, RGB.grey, RGB.white]
+  def match_distance(others)
+    others.map { |c| [ c, distance(c) ] }.sort_by { |a| a[1] }
+  end
+
+  # Matches this color to a set of colors using the CIE 1976 delta E formula.
+  #
+  # Returns the given set of colors with their difference from this color, sorted by difference (nearest color first).
+  # @example Find the 3 nearest CSS named colors
+  #  RGB.hex('f9c').match_de76(RGB.css).first(3)
+  def match_de76(others)
+    others.map { |c| [ c, de76(c) ] }.sort_by { |a| a[1] }
+  end
+
+end

data/lib/redgreenblue/os/mac.rb

@@ -3,7 +3,7 @@ class RGB
   # On Mac OS, shows the color picker to choose a color for the RGB object.
   # Not available on other platforms.
   def pick
-    result = RGB.mac_choose(rrggbb)
+    result = RGB.mac_choose(self)
     if result
       self.rrggbb = result
     end
@@ -14,7 +14,7 @@ class RGB
   #
   # If no default color is specified, the picker defaults to a middle grey.
   def self.pick(default_color=RGB.new)
-    result = RGB.mac_choose(default_color.rrggbb)
+    result = RGB.mac_choose(default_color)
     if result
       RGB.rrggbb result
     else
@@ -32,7 +32,7 @@ class RGB
   #
   # Applescript command documented here:
   # Standard Additions -> User Interaction -> choose color
-  def self.mac_choose(color)
+  def self.mac_choose(default_color)
 
     app = case ENV['TERM_PROGRAM']
       when /iTerm\.app/
@@ -44,7 +44,7 @@ class RGB
     script = <<~ENDSCRIPT
       tell application "#{app}"
         try
-          return choose color default color { #{color[0]}, #{color[1]}, #{color[2]} }
+          return choose color default color #{default_color.applescript}
         on error
           return ""
         end try

data/lib/redgreenblue/version.rb

@@ -1,7 +1,7 @@
 class RGB
 
   # redgreenblue version.
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 
   # Returns RGB::VERSION.
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redgreenblue
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -34,6 +34,8 @@ files:
 - lib/redgreenblue/inspect.rb
 - lib/redgreenblue/int.rb
 - lib/redgreenblue/lazy.rb
+- lib/redgreenblue/mac.rb
+- lib/redgreenblue/match.rb
 - lib/redgreenblue/math.rb
 - lib/redgreenblue/misc.rb
 - lib/redgreenblue/mix.rb