string_dot_gradient 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705f4872e8c680732b71c8d5e1e70f2287418d4b38278f92bbf801bb3d838f5a
-  data.tar.gz: bc0c962ecd6615bc40ec1c58f1c90131a752651f1165b6962898e046f38511bf
+  metadata.gz: 73df78b09463b558f80961be83861765cf026a674b0be3ab76213f1b1f5c8aed
+  data.tar.gz: 6e561b3415470f06426aab38fc0d97a51289cf82a9ef68bab9b14646d33983fb
 SHA512:
-  metadata.gz: 234f82023c22e4f0acffc3456eee6080b73cfad4516a34cb645a6a1dcc9a742c743e09368f71e15187721805ada57e3d2fbc892413677eb0daa0889bb98c6cbd
-  data.tar.gz: '095bc1362d552dae0d1e8e56808fc993a92f47a529ef584fd0fdbbc6705cda1cb40237beb06b64d0ba0f28fe828b3179b76712f652e522658a110104bfbc1d57'
+  metadata.gz: 5772433cb33f8756a01efb8a7b2723624ff8874270a6205e9c51f12ba29113cf95fb3a6a924003e416da3c5e4aa676144297df7b7ab6c1c05b4f455fc991fd83
+  data.tar.gz: a35256dc944c405e5652d0cab8792c18f89f2592e0cf1bf918e690f5312b53863ad9048140eeb271d238fd17689f6675510ffc5239737b7d77e09f57f0a239e8

data/lib/string_dot_gradient/gradient.rb

@@ -41,7 +41,6 @@ class String
 	# a string is uncommon, and developers are requested to delete
 	# \u0000 from string if such situations arise.
 	def gradient(*arg_colours, bg: false, exclude_spaces: true)
-		colours, line_length = [], -1
 		temp = ''
 		flatten_colours = arg_colours.flatten
 
@@ -61,8 +60,9 @@ class String
 			_r, _g, _b = r, g, b
 			chomped = !!c.chomp!(''.freeze)
 
-			n = c.length
-			n_variable = exclude_spaces ? c.delete("\t\s".freeze).length : n
+			len = c.length
+			n_variable = exclude_spaces ? c.delete("\t\s".freeze).length : len
+			n_variable = 1 if n_variable == 0
 
 			r_op = r_val = r_max = r_min = nil
 			g_op = g_val = g_max = g_min = nil
@@ -97,71 +97,47 @@ class String
 			end
 
 			# To avoid the value getting adding | subtracted from the initial character
-			# Note that duplication is fine if we don't get a little bit performance loss
 			_r = _r.send(r_op, r_val * -1) if r_comp_op && _r.send(r_comp_op, r_comp_val)
 			_g = _g.send(g_op, g_val * -1) if g_comp_op && _g.send(g_comp_op, g_comp_val)
 			_b = _b.send(b_op, b_val * -1) if b_comp_op && _b.send(b_comp_op, b_comp_val)
 
-			if line_length != n || rotate
-				line_length = n
-				colours.clear
-
-				i = -1
-				while (i += 1) < n
-					if exclude_spaces
-						_c = c[i]
-
-						if !(_c == ?\s.freeze || _c == ?\t.freeze)
-							_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,
-						# But we are not going to remove this code unless
-						# 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_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
-					g_to_i = _g.to_i
-					b_to_i = _b.to_i
-
-					colours << [
-						r_to_i < 0 ? 0 : r_to_i > 255 ? 255 : r_to_i,
-						g_to_i < 0 ? 0 : g_to_i > 255 ? 255 : g_to_i,
-						b_to_i < 0 ? 0 : b_to_i > 255 ? 255 : b_to_i,
-					]
+			i = -1
+			while (i += 1) < len
+				_c = c[i]
+
+				if !exclude_spaces || (exclude_spaces && !(_c == ?\s.freeze || _c == ?\t.freeze))
+					_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
-			end
 
-			i = -1
-			while (i += 1) < n
+				r_to_i = _r.to_i
+				g_to_i = _g.to_i
+				b_to_i = _b.to_i
+
+				f_r = r_to_i < 0 ? 0 : r_to_i > 255 ? 255 : r_to_i
+				f_g = g_to_i < 0 ? 0 : g_to_i > 255 ? 255 : g_to_i
+				f_b = b_to_i < 0 ? 0 : b_to_i > 255 ? 255 : b_to_i
+
+				ret = "\e[#{init};2;#{f_r};#{f_g};#{f_b}m#{_c}"
+
 				if block_given
-					yield "\e[#{init};2;#{colours[i][0]};#{colours[i][1]};#{colours[i][2]}m#{c[i]}"
+					yield ret
 				else
-					temp.concat(
-						"\e[#{init};2;#{colours[i][0]};#{colours[i][1]};#{colours[i][2]}m#{c[i]}"
-					)
+					temp << ret
 				end
 			end
 
+			ret = if !c.empty?
+				chomped ? "\e[0m\n".freeze : "\e[0m".freeze
+			elsif chomped
+				?\n.freeze
+			end
+
 			if block_given
-				if !c.empty?
-					yield(chomped ? "\e[0m\n".freeze : "\e[0m".freeze)
-				elsif chomped && c.empty?
-					yield(?\n.freeze)
-				end
+				yield ret
 			else
-				if !c.empty?
-					temp.concat(chomped ? "\e[0m\n".freeze : "\e[0m".freeze)
-				elsif chomped && c.empty?
-					temp.concat(?\n.freeze)
-				end
+				temp << ret
 			end
 
 			if rotate
@@ -177,6 +153,8 @@ class String
 	private
 	def hex_to_rgb(hex)
 		# Duplicate colour, even if colour is nil
+		# This workaround is for Ruby 2.0 to Ruby 2.2
+		# Which won't allow duplicate nil.
 		colour = hex && hex.dup.to_s || ''
 		colour.strip!
 		colour.downcase!

data/lib/string_dot_gradient/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_dot_gradient
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies: []
 description: An itty-bitty extension that adds gradient method to String class that
   supports any hex colour, for Linux | Unix terminals only