color_code 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f527e031efdd1ce7f01204b4a50d88c17262b4a
-  data.tar.gz: 8f9a266229c2e531967018d668cf920c5857165d
+  metadata.gz: 63030412515c10648352e99699cad7a3f198967d
+  data.tar.gz: f16b9030f80f7cbea5c1ee06a8cb97977a40f182
 SHA512:
-  metadata.gz: c29053d03da90cb6da8ab339d06a4cb492dff55b24ca959b27bb0be379fd766187d717985a8f6f2bd5b3e48dfd2bcba00d7a09b6575c8c86734ab353b505b6df
-  data.tar.gz: d3fc53dc448cbb57a40bc9d421258a999b41313711490b8ed23036238a6ae550f2f8ac0de1fb60ab9aed66218622a6e8e61d2cd0951548bf6e2874e89e96a2fe
+  metadata.gz: 146ac28ae23934309aa38d3af96fa4e1304509ae0c0d14f3e8e029eeeeb937d42c37e09d007d6e1cde1c490dbea6165aae1c585f6597a914766be2c52e12a86b
+  data.tar.gz: 60b0573a3819dccbc785d4714a4fb07a35324ae924e83c7a5de38bd89a28bf52f5f40e63f637ccc67d9f0499b86a3af864cbcfedc0ff05247d718d30b3303098

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-RGB class
+### RGB class
 
 ```ruby
 rgb = ColorCode::RGB.new(r: 255, g: 0, b: 0)
@@ -28,7 +28,15 @@ rgb.to_s # => '#ff0000'
 rbg.to_hash # => { r: 255, g: 0, b: 0 }
 ```
 
-HSL class
+### HSV class
+
+```ruby
+hsv = ColorCode::HSV.new(h: 0, s: 100, v: 100)
+hsv.to_s # => '#ff0000'
+hsv.to_hash # => { h: 0, s: 100, v: 100 }
+```
+
+### HSL class
 
 ```ruby
 hsl = ColorCode::HSL.new(h: 0, s: 100, l: 50)
@@ -36,24 +44,43 @@ hsl.to_s # => '#ff0000'
 hsl.to_hash # => { h: 0, s: 100, l: 50 }
 ```
 
-convert RGB to HSL
+### convert RGB to HSV
+
+```ruby
+rgb = ColorCode::RGB.new(r: 255, g: 0, b: 0)
+rgb.to_s # => '#ff0000'
+hsv = rgb.to_hsv
+hsv.to_s # => '#ff0000'
+```
+
+### convert HSL to RGB
 
 ```ruby
-rgb = ColorCode::RGB.new(r: 255, g: 0, b: 0) 
+hsv = ColorCode::HSV.new(h: 0, s: 100, v: 100)
+hsv.to_s # => '#ff0000'
+rgb = hsv.to_rgb
+rgb.to_s # => '#ff0000'
+```
+
+### convert RGB to HSL
+
+```ruby
+rgb = ColorCode::RGB.new(r: 255, g: 0, b: 0)
 rgb.to_s # => '#ff0000'
 hsl = rgb.to_hsl
-hsl.to_s # => '#ff0000' 
+hsl.to_s # => '#ff0000'
 ```
 
-convert HSL to RGB
+### convert HSL to RGB
 
 ```ruby
-hsl = ColorCode::HSL.new(h: 0, s: 100, l: 50) 
+hsl = ColorCode::HSL.new(h: 0, s: 100, l: 50)
 hsl.to_s # => '#ff0000'
 rgb = hsl.to_rgb
 rgb.to_s # => '#ff0000'
 ```
 
+
 ## Contributing
 
 1. Fork it ( https://github.com/shiro16/color_code/fork )

data/lib/color_code/hsl.rb

@@ -1,5 +1,7 @@
 module ColorCode
   class HSL
+    include HueSaturation
+
     attr_accessor :h, :s, :l
 
     def initialize(code=nil, h: 0, s: 0, l: 0)
@@ -16,11 +18,6 @@ module ColorCode
       raise ArgumentError.new('invalid value')
     end
 
-    def to_s
-      rgb = convert_rgb.map { |hue| '%02x' % hue }.join
-      "##{rgb}"
-    end
-
     def to_a
       [@h, @s, @l]
     end
@@ -29,48 +26,21 @@ module ColorCode
       { h: @h, s: @s, l: @l }
     end
 
-    def to_rgb
-      r, g, b = convert_rgb
-      ColorCode::RGB.new(r: r, g: g, b: b)
-    end
-
     private
-    def convert_rgb
+    def convert_max
       if @l < 50
-        max = 2.55 * (@l + @l * @s.quo(100).to_f)
-        min = 2.55 * (@l - @l * @s.quo(100).to_f)
+        2.55 * (@l + @l * @s.quo(100).to_f)
       else
-        max = 2.55 * (@l + (100 - @l) * @s.quo(100).to_f)
-        min = 2.55 * (@l - (100 - @l) * @s.quo(100).to_f)
+        2.55 * (@l + (100 - @l) * @s.quo(100).to_f)
       end
+    end
 
-      case @h
-      when 0...60
-        r = max
-        g = (@h.quo(60).to_f) * (max - min) + min
-        b = min
-      when 60...120
-        r = ((120 - @h).quo(60).to_f) * (max - min) + min
-        g = max
-        b = min
-      when 120...180
-        r = min
-        g = max
-        b = ((@h - 120).quo(60).to_f) * (max - min) + min
-      when 180...240
-        r = min
-        g = ((240 - @h).quo(60).to_f) * (max - min) + min
-        b = max
-      when 240...300
-        r = ((@h - 240).quo(60).to_f) * (max - min) + min
-        g = min
-        b = max
-      when 300..360
-        r = max
-        g = min
-        b = ((360 - @h).quo(60).to_f) * (max - min) + min
+    def convert_min
+      if @l < 50
+        2.55 * (@l - @l * @s.quo(100).to_f)
+      else
+        2.55 * (@l - (100 - @l) * @s.quo(100).to_f)
       end
-      [r.round, g.round, b.round]
     end
   end
 end

data/lib/color_code/hsv.rb

@@ -1,5 +1,7 @@
 module ColorCode
   class HSV
+    include HueSaturation
+
     attr_accessor :h, :s, :v
 
     def initialize(code=nil, h: 0, s: 0, v: 0)
@@ -16,11 +18,6 @@ module ColorCode
       raise ArgumentError.new('invalid value')
     end
 
-    def to_s
-      rgb = convert_rgb.map { |hue| '%02x' % hue }.join
-      "##{rgb}"
-    end
-
     def to_a
       [@h, @s, @v]
     end
@@ -29,43 +26,22 @@ module ColorCode
       { h: @h, s: @s, v: @v }
     end
 
-    def to_rgb
-      r, g, b = convert_rgb
-      ColorCode::RGB.new(r: r, g: g, b: b)
+    def distance(hsv)
+      diff = if @h > hsv.h
+               [@h - hsv.h, hsv.h - @h + 360].min
+             else
+               [hsv.h - @h, @h - hsv.h + 360].min
+             end
+      Math.sqrt(diff**2 + (@s - hsv.s)**2 + (@v - hsv.v)**2)
     end
 
     private
-    def convert_rgb
-      max = @v * 255 / 100.to_f
-      min = (@s / 100.to_f * max - max) * -1
+    def convert_max
+      @v * 255 / 100.to_f
+    end
 
-      case @h
-      when 0...60
-        r = max
-        g = (@h.quo(60).to_f) * (max - min) + min
-        b = min
-      when 60...120
-        r = ((120 - @h).quo(60).to_f) * (max - min) + min
-        g = max
-        b = min
-      when 120...180
-        r = min
-        g = max
-        b = ((@h - 120).quo(60).to_f) * (max - min) + min
-      when 180...240
-        r = min
-        g = ((240 - @h).quo(60).to_f) * (max - min) + min
-        b = max
-      when 240...300
-        r = ((@h - 240).quo(60).to_f) * (max - min) + min
-        g = min
-        b = max
-      when 300..360
-        r = max
-        g = min
-        b = ((360 - @h).quo(60).to_f) * (max - min) + min
-      end
-      [r.round, g.round, b.round]
+    def convert_min
+      (@s / 100.to_f * convert_max - convert_max) * -1
     end
   end
 end

data/lib/color_code/hue_saturation.rb

@@ -0,0 +1,48 @@
+module ColorCode
+  module HueSaturation
+    def to_s
+      rgb = convert_rgb.map { |hue| '%02x' % hue }.join
+      "##{rgb}"
+    end
+
+    def to_rgb
+      r, g, b = convert_rgb
+      ColorCode::RGB.new(r: r, g: g, b: b)
+    end
+
+    private
+    def convert_rgb
+      max = convert_max
+      min = convert_min
+
+      case @h
+      when 0...60
+        r = max
+        g = (@h.quo(60).to_f) * (max - min) + min
+        b = min
+      when 60...120
+        r = ((120 - @h).quo(60).to_f) * (max - min) + min
+        g = max
+        b = min
+      when 120...180
+        r = min
+        g = max
+        b = ((@h - 120).quo(60).to_f) * (max - min) + min
+      when 180...240
+        r = min
+        g = ((240 - @h).quo(60).to_f) * (max - min) + min
+        b = max
+      when 240...300
+        r = ((@h - 240).quo(60).to_f) * (max - min) + min
+        g = min
+        b = max
+      when 300..360
+        r = max
+        g = min
+        b = ((360 - @h).quo(60).to_f) * (max - min) + min
+      end
+
+      [r.round, g.round, b.round]
+    end
+  end
+end

data/lib/color_code/rgb.rb

@@ -31,6 +31,10 @@ module ColorCode
       ColorCode::HSV.new(h: h, s:hsv_s, v:v)
     end
 
+    def distance(rgb)
+      Math.sqrt((@r - rgb.r)**2 + (@g - rgb.g)**2 + (@b - rgb.b)**2)
+    end
+
     private
     def parse_code(code)
       raise ArgumentError.new('invalid value') unless md = code.match(/^#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})$/)

data/lib/color_code/version.rb

@@ -1,3 +1,3 @@
 module ColorCode
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/color_code.rb

@@ -1,4 +1,5 @@
 require 'color_code/version'
+require 'color_code/hue_saturation'
 require 'color_code/rgb'
 require 'color_code/hsl'
 require 'color_code/hsv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color_code
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - shiro16
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/color_code.rb
 - lib/color_code/hsl.rb
 - lib/color_code/hsv.rb
+- lib/color_code/hue_saturation.rb
 - lib/color_code/rgb.rb
 - lib/color_code/version.rb
 homepage: ''
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: classes to handle the color code