color_contrast_calc 0.5.0 → 0.9.0

data/lib/color_contrast_calc/utils.rb

@@ -12,11 +12,14 @@ module ColorContrastCalc
   module Utils
     using Shim unless //.respond_to? :match?
 
+    MIN_OPACITY = 0
+    MAX_OPACITY = 1.0
+
     HSL_UPPER_LIMIT = [360, 100, 100].freeze
 
     private_constant :HSL_UPPER_LIMIT
 
-    HEX_RE = /\A#?[0-9a-f]{3}([0-9a-f]{3})?\z/i
+    HEX_RE = /\A#?[0-9a-f]{3}([0-9a-f]{3})?\z/i.freeze
 
     private_constant :HEX_RE
 
@@ -196,11 +199,9 @@ module ColorContrastCalc
     # @return [true, false] true if a valid HSL value is passed
 
     def self.valid_hsl?(hsl)
-      return false unless hsl.length == 3
-      hsl.each_with_index do |c, i|
-        return false if !c.is_a?(Numeric) || c < 0 || c > HSL_UPPER_LIMIT[i]
+      hsl.length == 3 && hsl.each_with_index.all? do |c, i|
+        c.is_a?(Numeric) && c >= 0 && c <= HSL_UPPER_LIMIT[i]
       end
-      true
     end
 
     ##
@@ -236,6 +237,89 @@ module ColorContrastCalc
     def self.uppercase?(str)
       !/[[:lower:]]/.match?(str)
     end
+
+    module Hwb
+      HWB_UPPER_LIMIT = [360, 100, 100].freeze
+
+      def normalize_hwb(hwb)
+        # https://www.w3.org/TR/2019/WD-css-color-4-20191105/
+        h, w, b = hwb
+
+        achromatic_percent = w + b
+        denominator = achromatic_percent > 100 ? achromatic_percent : 100
+
+        normalized_w = w.to_f / denominator
+        normalized_b = b.to_f / denominator
+
+        [h, normalized_w, normalized_b]
+      end
+
+      private :normalize_hwb
+
+      ##
+      # Convert an HWB value to an RGB value.
+      #
+      # @param hwb [Array<Float>] HWB value represented as an array of numbers
+      # @return [Array<Integer>] RGB value represented as an array of integers
+
+      def hwb_to_rgb(hwb)
+        hue, white, black = normalize_hwb(hwb)
+        rgb = Utils.hsl_to_rgb([hue, 100, 50])
+
+        rgb.map do |c|
+          ((c * (1.0 - white - black)) + white * 255).round
+        end
+      end
+
+      ##
+      # Convert an HWB value to hex color code.
+      #
+      # @param hwb [Array<Float>] HWB value represented as an array of numbers
+      # @return [String] Hex color code such as "#ffff00"
+
+      def hwb_to_hex(hwb)
+        rgb_to_hex(hwb_to_rgb(hwb))
+      end
+
+      ##
+      # Convert an RGB value to an HWB value.
+      #
+      # @param rgb [Array<Integer>] RGB value represented as an array of
+      #   integers
+      # @return [Array<Float>] HWB value represented as an array of numbers
+
+      def rgb_to_hwb(rgb)
+        # https://www.w3.org/TR/2020/WD-css-color-4-20201112/
+        hsl = Utils.rgb_to_hsl(rgb)
+        white = rgb.min
+        black = 255 - rgb.max
+        [hsl[0], white * 100 / 255.0, black * 100 / 255.0]
+      end
+
+      ##
+      # Convert hex color code to an HWB value.
+      #
+      # @param hex_code [String] Hex color code such as "#ffff00"
+      # @return [Array<Float>] HWB value represented as an array of numbers
+
+      def hex_to_hwb(hex_code)
+        rgb_to_hwb(Utils.hex_to_rgb(hex_code))
+      end
+
+      ##
+      # Check if a given array is a valid representation of HWB color.
+      #
+      # @param hwb [Array<Float>] HWB value represented as an array of numbers
+      # @return [true, false] true if a valid HWB value is passed
+
+      def valid_hwb?(hwb)
+        hwb.length == 3 && hwb.each_with_index.all? do |c, i|
+          c.is_a?(Numeric) && c >= 0 && c <= HWB_UPPER_LIMIT[i]
+        end
+      end
+    end
+
+    extend Hwb
   end
 
   ##

data/lib/color_contrast_calc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ColorContrastCalc
-  VERSION = '0.5.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color_contrast_calc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
 description: 
 email:
 - hashimoto.naoki@gmail.com
@@ -112,12 +112,15 @@ files:
 - lib/color_contrast_calc.rb
 - lib/color_contrast_calc/checker.rb
 - lib/color_contrast_calc/color.rb
+- lib/color_contrast_calc/color_function_parser.rb
 - lib/color_contrast_calc/converter.rb
 - lib/color_contrast_calc/data/color_keywords.json
 - lib/color_contrast_calc/deprecated.rb
+- lib/color_contrast_calc/invalid_color_representation_error.rb
 - lib/color_contrast_calc/shim.rb
 - lib/color_contrast_calc/sorter.rb
 - lib/color_contrast_calc/threshold_finder.rb
+- lib/color_contrast_calc/transparency_calc.rb
 - lib/color_contrast_calc/utils.rb
 - lib/color_contrast_calc/version.rb
 homepage: https://github.com/nico-hn/color_contrast_calc_rb/
@@ -132,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Utility that helps you choose colors with sufficient contrast, WCAG 2.0 in