husler 0.0.1 → 0.0.2

data/lib/husler.rb

@@ -10,13 +10,19 @@ module Husler
   #	Pass in HUSL values and get back RGB values, H ranges from 0 to 360, S and L from 0 to 100.
   #	RGB values will range from 0 to 1.
   def husl_to_rgb(h, s, l)
+    raise ArgumentError.new("h value (#{h}) must be in the range 0..360") unless (0..360).include? h
+    raise ArgumentError.new("s value (#{s}) must be in the range 0..100") unless (0..100).include? s
+    raise ArgumentError.new("l value (#{l}) must be in the range 0..100") unless (0..100).include? l
+
     xyz_rgb(luv_xyz(lch_luv(husl_lch([h, s, l]))))
   end
 
   #	Pass in RGB values ranging from 0 to 1 and get back HUSL values.
   #	H ranges from 0 to 360, S and L from 0 to 100.
   def rgb_to_husl(r, g, b)
-    lch_husl(luv_lch(xyz_luv(rgb_xyz([r, g, b]))))
+    rgb = [r, g, b]
+    raise ArgumentError.new("rgb values (#{r}, #{g}, #{b}) must all be in the range 0..1") if rgb.any? { |v| !(0..1).include? v }
+    lch_husl(luv_lch(xyz_luv(rgb_xyz(rgb))))
   end
 
   private
@@ -31,10 +37,10 @@ module Husler
     result = Float::INFINITY
 
     M.each do |m1, m2, m3|
-			top = ((0.99915 * m1 + 1.05122 * m2 + 1.14460 * m3) * sub2);
-			rbottom = (0.86330 * m3 - 0.17266 * m2);
-			lbottom = (0.12949 * m3 - 0.38848 * m1);
-			bottom = (rbottom * sin_h + lbottom * cos_h) * sub2;
+      top = ((0.99915 * m1 + 1.05122 * m2 + 1.14460 * m3) * sub2);
+      rbottom = (0.86330 * m3 - 0.17266 * m2);
+      lbottom = (0.12949 * m3 - 0.38848 * m1);
+      bottom = (rbottom * sin_h + lbottom * cos_h) * sub2;
 
       LIMITS.each do |t|
         c = (l * (top - 1.05122 * t) / (bottom + 0.17266 * sin_h * t));
@@ -46,11 +52,11 @@ module Husler
   end
 
   def dot_product l1, l2
-      sum = 0
-      for i in 0...l1.size
-          sum += l1[i] * l2[i]
-      end
-      sum
+    sum = 0
+    for i in 0...l1.size
+      sum += l1[i] * l2[i]
+    end
+    sum
   end
 
   def f(t)
@@ -63,7 +69,7 @@ module Husler
   end
 
   def from_linear(c)
-		c <= 0.0031308 ? (12.92 * c) : (1.055 * (c ** (1 / 2.4)) - 0.055)
+    c <= 0.0031308 ? (12.92 * c) : (1.055 * (c ** (1 / 2.4)) - 0.055)
   end
 
   def to_linear(c)
@@ -83,9 +89,10 @@ module Husler
   end
 
   def xyz_rgb(tuple)
-    tuple.map! do |v|
-      from_linear(dot_product(v, tuple))
+    (0...3).each do |i|
+      tuple[i] = from_linear(dot_product(M[i], tuple))
     end
+    tuple
   end
 
   def rgb_xyz(tuple)
@@ -100,16 +107,14 @@ module Husler
   def xyz_luv(tuple)
     x, y, z = *tuple
 
-		var_u = (4 * x) / (x + (15.0 * y) + (3 * z));
-		var_v = (9 * y) / (x + (15.0 * y) + (3 * z));
+    var_u = (4 * x) / (x + (15.0 * y) + (3 * z));
+    var_v = (9 * y) / (x + (15.0 * y) + (3 * z));
 
-		l = 116 * f(y / REF_Y) - 16;
-		u = 13 * l * (var_u - REF_U);
-		v = 13 * l * (var_v - REF_V);
+    l = 116 * f(y / REF_Y) - 16;
+    u = 13 * l * (var_u - REF_U);
+    v = 13 * l * (var_v - REF_V);
 
-    tuple[0] = l
-    tuple[1] = u
-    tuple[2] = v
+    tuple[0], tuple[1], tuple[2] = l, u, v
 
     tuple
   end
@@ -119,17 +124,15 @@ module Husler
 
     return tuple.map! { 0.0 } if l == 0
 
-		var_y = f_inv((l + 16) / 116.0)
-		var_u = u / (13.0 * l) + REF_U
-		var_v = v / (13.0 * l) + REF_V
+    var_y = f_inv((l + 16) / 116.0)
+    var_u = u / (13.0 * l) + REF_U
+    var_v = v / (13.0 * l) + REF_V
 
-		y = var_y * REF_Y
-		x = 0 - (9 * y * var_u) / ((var_u - 4.0) * var_v - var_u * var_v)
-		z = (9 * y - (15 * var_v * y) - (var_v * x)) / (3.0 * var_v)
+    y = var_y * REF_Y
+    x = 0 - (9 * y * var_u) / ((var_u - 4.0) * var_v - var_u * var_v)
+    z = (9 * y - (15 * var_v * y) - (var_v * x)) / (3.0 * var_v)
 
-		tuple[0] = x
-		tuple[1] = y
-		tuple[2] = z
+    tuple[0], tuple[1], tuple[2] = x, y, z
 
     tuple
   end
@@ -142,8 +145,7 @@ module Husler
     h = h_rad * 360.0 / 2.0 / PI
     h = h + 360 if h < 0
 
-    tuple[1] = c
-    tuple[2] = h
+    tuple[1], tuple[2] = c, h
 
     tuple
   end

data/lib/husler/version.rb

@@ -1,3 +1,3 @@
 module Husler
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: husler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: