human_colour 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48c9c44e725f9a50838c47d15d75fdae3ed1867530731cd7cb7a36fdd9968f7
-  data.tar.gz: 85940a6afd94a1ec214b75321072b10681b18529a5df0554797f53adf06f756c
+  metadata.gz: 35d42d47bf0db3146c6f60d76ac09cd2e077b6dbf90d32802d59b9af4b17eac5
+  data.tar.gz: 63a243961773667626d4da42d5a1c722235ae9be7ae27ac8e982af48308cd58e
 SHA512:
-  metadata.gz: 5657ca4c638bc705d22cb39790b40c074da91e62fffd03a3d64ebc08e471b586f0399d752a6c98d32db920b11620c084111ee37cccb739dbac4489bba3fd1660
-  data.tar.gz: b69e4a4c8fa0e369cb612be81af014904caa7ea36a069273195f404dcdf81848eb4e93506c4e8374dbac682870fbeb3cc1d6eff287a0d044502c3f71df63a004
+  metadata.gz: 8284993d26bef8beffa6bfb3ca15d12de68913b74bf39adb3c9b5ac011cf5e348a35e853cc2a61dfacb4869f76ec9745daf71600c1fc78d5478ecff2533a5255
+  data.tar.gz: d786c21653b76d156415e0e20106970995ebc2123b6a0452246042bc3630aebf7fc44670c99ec3a7b2ab8a3a5f173329ebba7da58615837adff4fe3feb2250ed

data/README.md

@@ -1,5 +1,7 @@
 # HumanColour
 
+[![Gem Version](https://badge.fury.io/rb/human_colour.svg?icon=si%3Arubygems&icon_color=%23ffffff)](https://badge.fury.io/rb/human_colour)
+
 Simple gem for taking an RGB colour string, and converting it into a human-friendly name.
 
 ## Installation
@@ -19,12 +21,17 @@ gem install human_colour
 ## Usage
 
 ```ruby
+  require "human_colour"
+
   HumanColour.parse("rgb(128,64,0)")
-  #=> "dark orange"
+  #=> "brown"
 
-  # Return a colour based on the provided locale
+  # Return a colour based on the provided locale (:de, :en, :es, :fr, :it, :pt)
   HumanColour.parse("rgb(128,64,0)", locale: :es)
-  #=> "naranja oscuro"
+  #=> "marrón"
+
+  HumanColour.parse("rgb(255, 128, 255", locale: :de)
+  #=> "hell lila"
 ```
 
 ![alt text](https://github.com/mconnell/human_colour/blob/main/doc/colours.png?raw=true)

data/lib/human_colour/locales.rb

@@ -10,6 +10,7 @@ module HumanColour
       },
       colour: {
         red: "red",
+        brown: "brown",
         orange: "orange",
         yellow: "yellow",
         green: "green",
@@ -18,6 +19,7 @@ module HumanColour
         pink: "pink",
         grey: "grey",
         black: "black",
+        near_black: "near black",
         white: "white"
       }
     },
@@ -29,6 +31,7 @@ module HumanColour
       },
       colour: {
         red: "rojo",
+        brown: "marrón",
         orange: "naranja",
         yellow: "amarillo",
         green: "verde",
@@ -37,6 +40,7 @@ module HumanColour
         pink: "rosa",
         grey: "gris",
         black: "negro",
+        near_black: "casi negro",
         white: "blanco"
       }
     },
@@ -48,6 +52,7 @@ module HumanColour
       },
       colour: {
         red: "rosso",
+        brown: "marrone",
         orange: "arancione",
         yellow: "giallo",
         green: "verde",
@@ -56,6 +61,7 @@ module HumanColour
         pink: "rosa",
         grey: "grigio",
         black: "nero",
+        near_black: "quasi nero",
         white: "bianco"
       }
     },
@@ -67,6 +73,7 @@ module HumanColour
       },
       colour: {
         red: "rouge",
+        brown: "brun",
         orange: "orange",
         yellow: "jaune",
         green: "vert",
@@ -75,6 +82,7 @@ module HumanColour
         pink: "rose",
         grey: "gris",
         black: "noir",
+        near_black: "presque noir",
         white: "blanc"
       }
     },
@@ -86,6 +94,7 @@ module HumanColour
       },
       colour: {
         red: "rot",
+        brown: "braun",
         orange: "orange",
         yellow: "gelb",
         green: "grün",
@@ -94,6 +103,7 @@ module HumanColour
         pink: "rosa",
         grey: "grau",
         black: "schwarz",
+        near_black: "fast schwarz",
         white: "weiß"
       }
     },
@@ -105,6 +115,7 @@ module HumanColour
       },
       colour: {
         red: "vermelho",
+        brown: "marrom",
         orange: "laranja",
         yellow: "amarelo",
         green: "verde",
@@ -113,6 +124,7 @@ module HumanColour
         pink: "rosa",
         grey: "cinza",
         black: "preto",
+        near_black: "quase preto",
         white: "branco"
       }
     }

data/lib/human_colour/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HumanColour
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/human_colour.rb

@@ -18,12 +18,14 @@ module HumanColour
     green = matches[2].to_i / 255.0
     blue  = matches[3].to_i / 255.0
 
+    return LOCALES[locale][:colour][:near_black] if [red, green, blue].all? { |v| v < 0.126 }
+
     l = lightness(red: red, green: green, blue: blue)
     d = delta(red: red, green: green, blue: blue)
     s = saturation(delta: d, lightness: l)
     h = hue(delta: d, red: red, green: green, blue: blue)
-    t = tone(lightness: l, hue: h)
-    c = colour(saturation: s, hue: h)
+    c = colour(saturation: s, hue: h, lightness: l)
+    t = tone(lightness: l, hue: h, base: c)
 
     localised_tone   = LOCALES[locale][:tone][t]
     localised_colour = LOCALES[locale][:colour][c]
@@ -70,9 +72,12 @@ module HumanColour
   end
   private_class_method :hue
 
-  def self.tone(lightness:, hue:)
-    return nil if (260..320).cover?(hue) && lightness >= 0.22 && lightness < 0.28
-    return :dark if lightness < 0.28
+  def self.tone(lightness:, hue:, base:)
+    return nil if (260..320).cover?(hue) && lightness.between?(0.22, 0.28)
+    return nil if base == :brown
+
+    # All other hues
+    return :dark  if lightness < 0.28
     return :light if lightness > 0.74
 
     nil
@@ -80,8 +85,9 @@ module HumanColour
   private_class_method :tone
 
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
-  def self.colour(saturation:, hue:)
+  def self.colour(saturation:, hue:, lightness:)
     return :grey if saturation < 0.15
+    return :brown if (15..50).cover?(hue) && lightness < 0.5
 
     case hue
     when 0...15, 355..360 then :red

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: human_colour
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Connell