decolmor 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1633188a81e5b270b4e7ba878d9b72df23a864ea98e299428cef3cfb0948b906
-  data.tar.gz: 5db8fee23dd5652b66943a715058ae04ea47bdbaaf3ceeed6711407e23fc5fff
+  metadata.gz: 54f8407f171d29fb366e8a75caa8dde7f133bfe8d035495936ccc467272ed135
+  data.tar.gz: 982d9f6c6e640a5485783d189c00bb9d0edeae24dbf4e05ac4a77d8f38513742
 SHA512:
-  metadata.gz: b9cf4ffd31d01c26bd2d78337ef316bcb81bd7ad06bc7471a5ccc4738e90103a6443008517a289889a0e0c9cc94e6e0387b188e08508f4ae01f312cf90c5ecd2
-  data.tar.gz: 602694cadb39dbef406d503ca75e632a650e571710a30a1f1a7935b8aec425b6583e03148f1bc5a07f8128cd63e6b478b0bea5b442f9be1a7a34bd8833ce391d
+  metadata.gz: 25f9e5569646ce8d1bcc4744caa7a1b372e2ff146a1087b1c0785077353e12dda0687052b93a3ae689c7ce3c871a58979424fb95961e609a979990415327370a
+  data.tar.gz: 9ffb5732412c5771da28c3344806aab52d278b7374de18b368bf38713ad93933983629ffc8bd8f9f48fe8cc61ef93854387773d55880af0b3ce333230bb823a0

data/CHANGELOG.md

@@ -3,3 +3,13 @@
 ## 1.0.0 (September 13, 2021)
 
 * Initial release
+
+## 1.1.0 (September 14, 2021)
+
+* ::hex_to_rgb
+  * change default rounding 5 => 3 for Alpha channel  
+    *reason: 3 digits is enough for a lossless conversion `0..255` -> `0..1` -> `0..255`*
+  * for the Alpha channel you can now set rounding as the second argument:  
+  `Decolmor::hex_to_rgb(hex, 2)`
+  * support short version of HEX  
+  e.g: `#CF3`, `0F9`, `#0F9F`

data/NEWS.md

@@ -1,4 +1,9 @@
 # News
 
 ## 1.0.0 (September 13, 2021)
+
   * First version
+  
+## 1.1.0 (September 14, 2021)
+
+  * `::hex_to_rgb` Now supports short version of HEX and rounding for the alpha channel

data/README.md

@@ -1,9 +1,9 @@
 # Decolmor
-[![Gem Version](https://badge.fury.io/rb/decolmor.svg)](http://badge.fury.io/rb/decolmor)
+[![Gem Version](https://badge.fury.io/rb/decolmor.svg)](https://badge.fury.io/rb/decolmor)
 [![Build Status](https://app.travis-ci.com/ChildrenofkoRn/decolmor.svg?token=ssJ5zvqjK7iZ4F1TaeQn&branch=main)](https://app.travis-ci.com/ChildrenofkoRn/decolmor)
 [![codecov](https://codecov.io/gh/ChildrenofkoRn/decolmor/branch/main/graph/badge.svg?token=5P4OQUXC3N)](https://codecov.io/gh/ChildrenofkoRn/decolmor)
 
-Gem for converting the color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK  
+Gem for converting color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK  
 The Alpha channel (transparency) is supported.  
 There is also a simple RGB generator.  
 
@@ -46,6 +46,7 @@ This is enough to loselessly convert RGB -> HSL/HSV/HSB/CMYK -> RGB:
     Decolmor::hsl_to_rgb(hsl)  # => [224, 23, 131]
 ```
 If you convert between HSL <==> HSV (HSB) with a rounding of 2, you can get more accurate results.  
+This can also be useful if you use HSL/HSB for intermediate changes and then go back to RGB.  
 You can change rounding globally:
 ```ruby
     Decolmor::hsx_round = 2
@@ -58,13 +59,24 @@ You can also specify rounding as a second argument when calling the method:
 ```
 In this case, the global rounding will be ignored.
 If you need to get integers, use 0.
-	
+
+## HEX to RGB(A)
+ - with & without prefix `#`
+ - short HEX are supported (including Alpha)
+ - can be set rounding for the Alpha channel
+
 ## Alpha channel
-When converting from HEX to RGBA Alpha channel is converted to a value from the range `0..1` with rounding 5:
+When converting from HEX to RGBA Alpha channel is converted to a value from the range `0..1` with rounding 3:  
+ - 3 digits is enough for a lossless conversion `0..255` -> `0..1` -> `0..255`
 ```ruby
-    Decolmor::hex_to_rgb('#19988BB8')  # => [25, 152, 139, 0.72157]
+    Decolmor::hex_to_rgb('#19988BB8')  # => [25, 152, 139, 0.722]
 ```
 Consequently, when converting to HEX from RGBA, Alpha from the range `0..1` is assumed.  
+You can also set rounding for Alpha channel as a second argument:
+```ruby
+    Decolmor::hex_to_rgb('#19988BB8', 2)  # => [25, 152, 139, 0.72]
+```
+This only works for converting HEX to RGBA.  
 In other cases (conversions between RGB/HSL/HSV/HSB/CMYK) Alpha channel remains unchanged.
 
 ## HSV or HSB
@@ -100,7 +112,7 @@ The results when rounded to an integer will be the same as when using graphics e
 
 ## Supported Methods
  - Setter global rounding for conversion to HSL/HSV/HSB/CMYK
-   - Decolmor::hsx_round =
+   - hsx_round =
  - HEX <==> RGB(A)
    - hex_to_rgb
    - rgb_to_hex

data/decolmor.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |spec|
   spec.version       = Decolmor::VERSION
   spec.licenses      = ['MIT']
   spec.summary       = "Converter color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK"
-  spec.description   = "Gem for converting color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK\n" \
+  spec.description   = "Converter color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK.\n" \
                        "The Alpha channel (transparency) is supported.\n" \
                        "There is also a simple RGB generator."
   spec.authors       = ["ChildrenofkoRn"]

data/lib/decolmor/main.rb

@@ -2,9 +2,15 @@ module Decolmor
 
   #========= HEX <==> RGB(A) =============================================
 
-  def self.hex_to_rgb(hex)
-    rgb = hex.gsub('#','').scan(/../).map(&:hex).map(&:to_i)
-    rgb.size == 4 ? rgb + [(rgb.delete_at(3) / 255.to_f).round(5)] : rgb
+  def self.hex_to_rgb(hex, alpha_round = 3)
+    hex = hex.gsub('#','')
+    hex = if [3, 4].include? hex.length
+            hex.chars.map{ |char| char * 2 }
+          else
+            hex.scan(/../)
+          end
+    rgb = hex.map(&:hex)
+    rgb.size == 4 ? rgb + [(rgb.delete_at(3) / 255.to_f).round(alpha_round)] : rgb
   end
 
   def self.rgb_to_hex(rgb)

data/lib/decolmor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Decolmor
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/decolmor_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Decolmor do
       end
 
       it "HEX w alpha channel and prefix # to RGBA" do
-        docs "alpha into range 0..1 and rounding 5"
+        docs "alpha into range 0..1 and rounding 3"
         color = colors.keys.sample
         alphas.each_pair do |hex_alpha, alpha|
           hex = format('%s%s', color, hex_alpha)
@@ -46,6 +46,16 @@ RSpec.describe Decolmor do
         end
       end
 
+      it "set rounding for alpha channel" do
+        color = colors.keys.sample
+        alphas.each_pair do |hex_alpha, alpha|
+          rounding = 2
+          hex = format('%s%s', color, hex_alpha)
+          rgba = colors[color][:rgb] + [alpha[:rgb].round(rounding)]
+          expect( Decolmor::hex_to_rgb(hex, rounding) ).to eq rgba
+        end
+      end
+
       it "HEX w alpha channel and w/o prefix # to RGBA" do
         color = colors.keys.sample
 
@@ -55,6 +65,14 @@ RSpec.describe Decolmor do
           expect( Decolmor::hex_to_rgb(hex) ).to eq rgba
         end
       end
+
+      it "HEX short version to RGB(A)" do
+        colors = {'6FC' => [102, 255, 204], '#9C3' => [153, 204, 51], '36FF' => [51, 102, 255, 1]}
+
+        colors.each_pair do |hex_short, rgb|
+          expect( Decolmor::hex_to_rgb(hex_short) ).to eq rgb
+        end
+      end
     end
 
     describe ".rgb_to_hex" do

data/spec/factories/alpha.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
 
     values = samples.each_with_object(Hash.new) do |value, hash|
       hex = "%02X" % value
-      range_01  = (value / 255.to_f).round(5)
+      range_01  = (value / 255.to_f).round(3)
       hash[hex] = {rgb: range_01, rgb_255: value}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decolmor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ChildrenofkoRn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 description: |-
-  Gem for converting color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK
+  Converter color spaces from/to: HEX/RGB/HSL/HSV/HSB/CMYK.
   The Alpha channel (transparency) is supported.
   There is also a simple RGB generator.
 email: Rick-ROR@ya.ru