string_dot_gradient 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d3884abc820fe0e165c6bd457b9fdb6ad5a65daa2e0a50228d26d66cfd81e83
-  data.tar.gz: d2aa74283174640d6f80b68237804311bb80542405421aca50cc0e54f8b32aaf
+  metadata.gz: baaf12a84ca6429f8d3a85cf87e208dcdf1900e5b8fdb2193b6bdb6802b5e3be
+  data.tar.gz: e3bbba2902b6cc3dd9b0c37fb1cd3e983a5c3d0ca979478eccdf077a0d6d4e1c
 SHA512:
-  metadata.gz: 6f1b712b76b2fd010b4995967f57178c1949e4ded080e02c2e95e06848a8b8b729ac4e56c1d43fb698180163cd401979c3820f6659f9b80d4777c6c37092fdeb
-  data.tar.gz: 1bb3c798b4ab1c1d4814dac2470e90d0d79836aade65429e31b428fbb29a36260a60ff3e6a90c31e91a0ee2d8580bacb1c17fb215057a4e9da219e365fd82e6d
+  metadata.gz: 60d6427e5b4cb12ce92542cfb8f180ecf5eefe80d82528f16718660a4b24d6afdc56c94448eac709af6870f757cdb788a4a9d427fc89fd60557abcee7ffdb7cf
+  data.tar.gz: 0cdf009682bc2506cb83c1e65138737e724096fa6db8a7991d999e26a0899a1177d56fd361efdca724890c827e40487e1add6957746aa74617832cc98187561e

data/lib/string_dot_gradient/gradient.rb

@@ -49,7 +49,6 @@ class String
 		raise ArgumentError, "Given argument for colour is neither a String nor an Integer" if flatten_colours.any? { |x| !(x.is_a?(String) || x.is_a?(Integer)) }
 
 		all_rgbs = flatten_colours.map!(&method(:hex_to_rgb))
-
 		block_given = block_given?
 
 		r, g, b = all_rgbs[0]
@@ -62,13 +61,37 @@ class String
 			_r, _g, _b = r, g, b
 			n = c.length
 
-			r_max, r_min = r > r2 ? [r, r2] : [r2, r]
-			g_max, g_min = g > g2 ? [g, g2] : [g2, g]
-			b_max, b_min = b > b2 ? [b, b2] : [b2, b]
+			r_op = r_val = r_max = r_min = nil
+			g_op = g_val = g_max = g_min = nil
+			b_op = b_val = b_max = b_min = nil
+
+			r_comp_op = r_comp_val = nil
+			g_comp_op = g_comp_val = nil
+			b_comp_op = b_comp_val = nil
+
+			if r2 > r
+				r_op, r_val, r_max, r_min = :+, r2.fdiv(n), r2, r
+				r_comp_op, r_comp_val = :<=, r_max
+			elsif r2 < r
+				r_op, r_val, r_max, r_min = :-, r.fdiv(n), r, r2
+				r_comp_op, r_comp_val = :>=, r_min
+			end
 
-			r_meth = r == r2 ? :itself : r2 > r ? [:+, r2.fdiv(n)] : [:-, r.fdiv(n)]
-			g_meth = g == g2 ? :itself : g2 > g ? [:+, g2.fdiv(n)] : [:-, g.fdiv(n)]
-			b_meth = b == b2 ? :itself : b2 > b ? [:+, b2.fdiv(n)] : [:-, b.fdiv(n)]
+			if g2 > g
+				g_op, g_val, g_max, g_min = :+, g2.fdiv(n), g2, g
+				g_comp_op, g_comp_val = :<=, g_max
+			elsif g2 < g
+				g_op, g_val, g_max, g_min = :-, g.fdiv(n), g, g2
+				g_comp_op, g_comp_val = :>=, g_min
+			end
+
+			if b2 > b
+				b_op, b_val, b_max, b_min = :+, b2.fdiv(n), b2, b
+				b_comp_op, b_comp_val = :<=, b_max
+			elsif b2 < b
+				b_op, b_val, b_max, b_min = :-, b.fdiv(n), b, b2
+				b_comp_op, b_comp_val = :>=, b_min
+			end
 
 			if line_length != n || rotate
 				line_length = n
@@ -80,9 +103,9 @@ class String
 						_c = c[i]
 
 						if !(_c == ?\s.freeze || _c == ?\t.freeze)
-							_r = _r.send(*r_meth) unless _r > r_max || _r < r_min
-							_g = _g.send(*g_meth) unless _g > g_max || _g < g_min
-							_b = _b.send(*b_meth) unless _b > b_max || _b < b_min
+							_r = _r.send(r_op, r_val) if r_comp_op && _r.send(r_comp_op, r_comp_val)
+							_g = _g.send(g_op, g_val) if g_comp_op && _g.send(g_comp_op, g_comp_val)
+							_b = _b.send(b_op, b_val) if b_comp_op && _b.send(b_comp_op, b_comp_val)
 						end
 					else
 						# We also have duplication above,
@@ -90,9 +113,9 @@ class String
 						# we find some efficient solution. Using a proc or method
 						# for setting these values and calling that is a way
 						# to make code slower.
-						_r = _r.send(*r_meth) unless _r > r_max || _r < r_min
-						_g = _g.send(*g_meth) unless _g > g_max || _g < g_min
-						_b = _b.send(*b_meth) unless _b > b_max || _b < b_min
+						_r = _r.send(r_op, r_val) if r_comp_op && _r.send(r_comp_op, r_comp_val)
+						_g = _g.send(g_op, g_val) if g_comp_op && _g.send(g_comp_op, g_comp_val)
+						_b = _b.send(b_op, b_val) if b_comp_op && _b.send(b_comp_op, b_comp_val)
 					end
 
 					r_to_i = _r.to_i
@@ -160,7 +183,7 @@ class String
 		elsif clen == 6
 			colour.chars.each_slice(2).map { |x| x.join.to_i(16) }
 		else
-			sli = clen > 6 ? 'too long' : clen < 3 ? 'too short' : 'invalid'
+			sli = clen > 6 ? 'too long'.freeze : clen < 3 ? 'too short'.freeze : 'invalid'.freeze
 			raise ArgumentError, "Invalid Hex Colour ##{colour} (length #{sli})"
 		end
 	end

data/lib/string_dot_gradient/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StringDotGradient
-	VERSION = "0.1.3"
+	VERSION = "0.1.4"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: string_dot_gradient
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies: []
-description: An itty-bitty extension that adds gradient method to String class, for
-  Linux terminals
+description: An itty-bitty extension that adds gradient method to String class that
+  supports any hex colour, for Linux | Unix terminals only
 email:
 - souravgoswami@protonmail.com
 executables: []
@@ -33,7 +33,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -43,6 +43,6 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: An itty-bitty extension that adds gradient method to String class, for Linux
-  terminals
+summary: An itty-bitty extension that adds gradient method to String class that supports
+  any hex colour, for Linux | Unix terminals only
 test_files: []