string_dot_gradient 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06603caa967d156eea0acf41986eddbd09f651a4f21d64da62edbaa029b878b9
-  data.tar.gz: f5d3c0fbc4b9bfc9caf61ea56b2f4c0518a457ce90a35c9c1425376c5a707963
+  metadata.gz: edc1903ceea6827357c02ef0efdea7dcf1de66b9e6487f61b43ab01932eae822
+  data.tar.gz: 561e461b724a013786533e03ce752756f224cc8d6aaee6f064ace18ccf7a1e11
 SHA512:
-  metadata.gz: a03febddbf80cb165467b627e5f91709626d4f1dd0e56d84e1c023f41b450971d6043bddc408ce7a5bba774a3f0f3151d52112598dcefbcb58d1568d6f5836b4
-  data.tar.gz: 9908f51246f7fbf885fa94e4499f0684241cb4159110fb472adfdf8e545251dae8bc8b9628e770a9478ad9217255c71b81f61163d98616ef49ad9494fd14ea5e
+  metadata.gz: c072842423ac1aadda79d3c445c6a0e7b347b5ddc67c62ee2a6a9195571e6c23b82485014e514af9d8fb363ad82ab411dd7d71568744cc90463845968f407874
+  data.tar.gz: c302d7acbfca9b35d182fe8b2a0406d6882487cc242b18c2d050b600ea9d087a49f2c9bb85db580c5d91b7207e6f193c4543e142a8700596c099888395353f22

data/lib/string_dot_gradient.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "string_dot_gradient/version"
+require_relative 'string_dot_gradient/version'
+require 'string_dot_gradient/hex_to_rgb.rb'
 require 'string_dot_gradient/gradient.rb'

data/lib/string_dot_gradient/gradient.rb

@@ -58,6 +58,8 @@ class String
 		overline: false
 		)
 
+		space, tab = ?\s.freeze, ?\t.freeze
+
 		block_given = block_given?
 		temp = ''
 		flatten_colours = arg_colours.flatten
@@ -87,7 +89,7 @@ class String
 
 		all_rgbs = flatten_colours.map!(&method(:hex_to_rgb))
 
-		yield style if block_given
+		yield style if block_given && style
 
 		# r, g, b => starting r, g, b
 		# r2, g2, b2 => stopping r, g, b
@@ -109,6 +111,11 @@ class String
 			n_variable = 1 if n_variable < 1
 
 			# colour operator, colour value
+			#
+			# r_op, g_op, b_op are also flags to determine
+			# if the r, g, and b values respectively should change or not
+			# For example, if the given blues are equal, the b_op is nil
+			# So it won't change the colour in the ouput
 			r_op = r_val  = nil
 			g_op = g_val = nil
 			b_op = b_val = nil
@@ -140,7 +147,7 @@ class String
 			while (i += 1) < len
 				_c = c[i]
 
-				if !exclude_spaces || (exclude_spaces && !(_c == ?\s.freeze || _c == ?\t.freeze))
+				if !exclude_spaces || (_c != space && _c != tab)
 					_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
@@ -150,11 +157,11 @@ class String
 				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
+				clamped_r = r_to_i < 0 ? 0 : r_to_i > 255 ? 255 : r_to_i
+				clamped_g = g_to_i < 0 ? 0 : g_to_i > 255 ? 255 : g_to_i
+				clamped_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}"
+				ret = "\e[#{init};2;#{clamped_r};#{clamped_g};#{clamped_b}m#{_c}"
 
 				if block_given
 					yield ret
@@ -264,36 +271,4 @@ class String
 
 		block_given ? nil : ret
 	end
-
-	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!
-		colour[0] = ''.freeze if colour[0] == ?#.freeze
-
-		# out of range
-		oor = colour.scan(/[^a-f0-9]/)
-
-		unless oor.empty?
-			invalids = colour.chars.map { |x|
-				oor.include?(x) ? "\e[1;31m#{x}\e[0m" : x
-			}.join
-
-			raise ArgumentError, "\e[0mHex Colour \e[1m##{invalids} is Out of Range\e[0m"
-		end
-
-		clen = colour.length
-		if clen == 3
-			colour.chars.map { |x| x.<<(x).to_i(16) }
-		elsif clen == 6
-			colour.chars.each_slice(2).map { |x| x.join.to_i(16) }
-		else
-			sli = clen > 6 ? 'too long'.freeze : clen < 3 ? 'too short'.freeze : 'invalid'.freeze
-			raise ArgumentError, "Invalid Hex Colour ##{colour} (length #{sli})"
-		end
-	end
 end

data/lib/string_dot_gradient/hex_to_rgb.rb

@@ -0,0 +1,53 @@
+class String
+	# Fast conversion to RGB when Integer is passed.
+	# For example: 0xffffff for white,
+	# 0x000000 or 0x0 for black, 0x00aa00 for deep green
+	# 0xff50a6 for pink, 0xff5555 for light red, etc.
+	#
+	# Similarly:
+	# (255 * 256 * 256) + (255 * 256) + (255) => 0xffffff
+	# (0 * 256 * 256) + (0 * 256) + 0 => 0x0
+	# (255 * 256 * 256) + (85 * 256) + 85 => #ff5555
+	# (85 * 256 * 256) + (85 * 256) + 255 => #5555ff
+	# (255 * 256 * 256) + (170 * 256) + 0 => 0xffaa00
+	# (0 * 256 * 256) + (170 * 256) + 0 => 0x00aa00
+	def hex_to_rgb(hex)
+		return [
+			255 & hex >> 16,
+			255 & hex >> 8,
+			255 & hex
+		] if hex.is_a?(Integer)
+
+		# 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!
+		colour[0] = ''.freeze if colour[0] == ?#.freeze
+
+		# out of range
+		oor = colour.scan(/[^a-f0-9]/)
+
+		unless oor.empty?
+			invalids = colour.chars.map { |x|
+				oor.include?(x) ? "\e[1;31m#{x}\e[0m" : x
+			}.join
+
+			raise ArgumentError, "\e[0mHex Colour \e[1m##{invalids} is Out of Range\e[0m"
+		end
+
+		clen = colour.length
+
+		if clen == 3
+			colour.chars.map { |x| x.<<(x).to_i(16) }
+		elsif clen == 6
+			colour.chars.each_slice(2).map { |x| x.join.to_i(16) }
+		else
+			sli = clen > 6 ? 'too long'.freeze : clen < 3 ? 'too short'.freeze : 'invalid'.freeze
+			raise ArgumentError, "Invalid Hex Colour ##{colour} (length #{sli})"
+		end
+	end
+
+	private(:hex_to_rgb)
+end

data/lib/string_dot_gradient/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_dot_gradient
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-06-25 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 terminals
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - lib/string_dot_gradient.rb
 - lib/string_dot_gradient/gradient.rb
+- lib/string_dot_gradient/hex_to_rgb.rb
 - lib/string_dot_gradient/version.rb
 homepage: https://github.com/Souravgoswami/string_dot_gradient
 licenses:
@@ -40,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.2.19
 signing_key:
 specification_version: 4
 summary: An itty-bitty extension that adds "gradient" method to String class that