string_dot_gradient 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d3884abc820fe0e165c6bd457b9fdb6ad5a65daa2e0a50228d26d66cfd81e83
-  data.tar.gz: d2aa74283174640d6f80b68237804311bb80542405421aca50cc0e54f8b32aaf
+  metadata.gz: 7f734ad48d80c57969e3fb4598f5a89fafdb35b30c2b5dddbc1bbbf1a835a829
+  data.tar.gz: 80c268d0c7754047bf1040d1ade34a3e9652180441ca3cbf23a0d67f8873d531
 SHA512:
-  metadata.gz: 6f1b712b76b2fd010b4995967f57178c1949e4ded080e02c2e95e06848a8b8b729ac4e56c1d43fb698180163cd401979c3820f6659f9b80d4777c6c37092fdeb
-  data.tar.gz: 1bb3c798b4ab1c1d4814dac2470e90d0d79836aade65429e31b428fbb29a36260a60ff3e6a90c31e91a0ee2d8580bacb1c17fb215057a4e9da219e365fd82e6d
+  metadata.gz: 0102ffe6acc5355cc7d29dea013439eb245fc5ec11415eea6cc91f1025a6128f639120b74d29d0dec44ebf085f73d41411d6027480b4270dc832d17e5e353cf7
+  data.tar.gz: d0d2c157c03af2a8688fcba1ade8d5177e0d8656512b9293a26672faf9dddb492a530e409df9e6ffa5f32f75f05d0c6c041ac13f4cc0a75c4067b4fc59bf9144

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
 
@@ -49,79 +48,90 @@ 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]
-		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|
 			_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_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 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_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
-						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_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
-					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
+			chomped = !!c.chomp!(''.freeze)
+
+			len = c.length
+			n_variable = exclude_spaces ? c.delete("\t\s".freeze).length : len
+			n_variable -= 1
+			n_variable = 1 if n_variable < 1
+
+			# 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 = :+, r2.-(r).fdiv(n_variable)
+			elsif r2 < r
+				r_op, r_val = :-, r.-(r2).fdiv(n_variable)
+			end
+
+			if g2 > g
+				g_op, g_val = :+, g2.-(g).fdiv(n_variable)
+			elsif g2 < g
+				g_op, g_val = :-, g.-(g2).fdiv(n_variable)
 			end
 
+			if b2 > b
+				b_op, b_val = :+, b2.-(b).fdiv(n_variable)
+			elsif b2 < b
+				b_op, b_val = :-, b.-(b2).fdiv(n_variable)
+			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
@@ -137,6 +147,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!
@@ -160,7 +172,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.8"
 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.8
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-12 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: []