string_dot_gradient 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baaf12a84ca6429f8d3a85cf87e208dcdf1900e5b8fdb2193b6bdb6802b5e3be
-  data.tar.gz: e3bbba2902b6cc3dd9b0c37fb1cd3e983a5c3d0ca979478eccdf077a0d6d4e1c
+  metadata.gz: 229c7c52d938962d064671617bd9c8ae622df4a52fa5dd7df0b4485ec14e55a1
+  data.tar.gz: 0d926f9ed11056c3870c3964a7497c345b890582e8816296baa2c38eaa07836d
 SHA512:
-  metadata.gz: 60d6427e5b4cb12ce92542cfb8f180ecf5eefe80d82528f16718660a4b24d6afdc56c94448eac709af6870f757cdb788a4a9d427fc89fd60557abcee7ffdb7cf
-  data.tar.gz: 0cdf009682bc2506cb83c1e65138737e724096fa6db8a7991d999e26a0899a1177d56fd361efdca724890c827e40487e1add6957746aa74617832cc98187561e
+  metadata.gz: 9baf8ae5b7a5e0285db981cc3d4426493cd44864f40a44cbefecde30b7742602f5424275bfe676a330dd9a8eb5c9117c4c50b055811c76d072c2f9c632ab7e07
+  data.tar.gz: 3186f138e9036fc98801a0810913524c16508a2468126c41a9482d3043b0accaf41bbcbf9aa2c6600365e30d043e6b311aaec8db6b43d83eea6cfe3e75f47565

data/lib/string_dot_gradient/gradient.rb

@@ -1,6 +1,6 @@
 class String
 	##
-	# = gradient(*arg_colours, bg: false, exclude_spaces: true)    # => string or nil
+	# = gradient(*arg_colours, bg: false, exclude_spaces: true, bold: false, blink: false)    # => string or nil
 	#
 	# Prettifies your string by adding gradient colours.
 	#
@@ -40,8 +40,13 @@ class String
 	# This is because \r wipes out the previous characters, and using \u0000 in
 	# 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
+	#
+	# The option bold makes texts bold, but it also makes the string bigger.
+	# Set bold to anything truthy or falsey, but better just go with true and false or nil
+	#
+	# The option blink makes the texts blink on supported terminals.
+	# Set blink to anything truthy or falsey, but better just go with true and false or nil
+	def gradient(*arg_colours, bg: false, exclude_spaces: true, bold: false, blink: false)
 		temp = ''
 		flatten_colours = arg_colours.flatten
 
@@ -51,100 +56,91 @@ class String
 		all_rgbs = flatten_colours.map!(&method(:hex_to_rgb))
 		block_given = block_given?
 
-		r, g, b = all_rgbs[0]
-		r2, g2, b2 = all_rgbs[1]
+		# r, g, b => starting r, g, b
+		# r2, g2, b2 => stopping r, g, b
+		r, g, b = *all_rgbs[0]
+		r2, g2, b2 = *all_rgbs[1]
 		rotate = all_rgbs.length > 2
 
 		init = bg ? 48 : 38
 
 		each_line do |c|
+			temp << "\e[1m".freeze if bold
+			temp << "\e[5m".freeze if blink
+
 			_r, _g, _b = r, g, b
-			n = c.length
+			chomped = !!c.chomp!(''.freeze)
 
-			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
+			len = c.length
+			n_variable = exclude_spaces ? c.delete("\t\s".freeze).length : len
+			n_variable -= 1
+			n_variable = 1 if n_variable < 1
 
-			r_comp_op = r_comp_val = nil
-			g_comp_op = g_comp_val = nil
-			b_comp_op = b_comp_val = nil
+			# colour operator, colour value
+			r_op = r_val  = nil
+			g_op = g_val = nil
+			b_op = b_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
+				r_op, r_val = :+, r2.-(r).fdiv(n_variable)
 			elsif r2 < r
-				r_op, r_val, r_max, r_min = :-, r.fdiv(n), r, r2
-				r_comp_op, r_comp_val = :>=, r_min
+				r_op, r_val = :-, r.-(r2).fdiv(n_variable)
 			end
 
 			if g2 > g
-				g_op, g_val, g_max, g_min = :+, g2.fdiv(n), g2, g
-				g_comp_op, g_comp_val = :<=, g_max
+				g_op, g_val = :+, g2.-(g).fdiv(n_variable)
 			elsif g2 < g
-				g_op, g_val, g_max, g_min = :-, g.fdiv(n), g, g2
-				g_comp_op, g_comp_val = :>=, g_min
+				g_op, g_val = :-, g.-(g2).fdiv(n_variable)
 			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
+				b_op, b_val = :+, b2.-(b).fdiv(n_variable)
 			elsif b2 < b
-				b_op, b_val, b_max, b_min = :-, b.fdiv(n), b, b2
-				b_comp_op, b_comp_val = :>=, b_min
+				b_op, b_val = :-, b.-(b2).fdiv(n_variable)
 			end
 
-			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,
-					]
-				end
-			end
+			# To avoid the value getting adding | subtracted from the initial character
+			_r = _r.send(r_op, r_val * -1) if r_op
+			_g = _g.send(g_op, g_val * -1) if g_op
+			_b = _b.send(b_op, b_val * -1) if b_op
 
 			i = -1
-			while (i += 1) < n
+			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_op
+					_g = _g.send(g_op, g_val) if g_op
+					_b = _b.send(b_op, b_val) if b_op
+				end
+
+				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
-				yield "\e[0m".freeze
+				yield ret
 			else
-				temp << "\e[0m".freeze
+				temp << ret
 			end
 
 			if rotate
@@ -160,6 +156,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.4"
+	VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_dot_gradient
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-01-14 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