howzit 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28505fefd411902ebd75d786f31e6967822aaff975dbb1f55bb13994e583b792
-  data.tar.gz: 105e760d5595f4b8664969b6258240d17fb16ede995d3698e2d7bb4a36276824
+  metadata.gz: d34bc56b28033e3f708225b2706bca8d0c2ccaa3d727f9193855412940071e68
+  data.tar.gz: 0f78cefe615f34c31590e206081c01d3b7229da6e1045ea215872fc71ba2942c
 SHA512:
-  metadata.gz: 338ad20ebae27dc9d504671df84789be608fd73b123b1a7966ae5cd6c160c7543d21596df6c6b4268fb827f732d80f581d8cb15520f02b19cb27014f4903ff51
-  data.tar.gz: 6283e6c567425ea667e399ca338ccdea86023157b9b58709d1f006fd94f8b71286eba18f6c170a25d2cae4bbc571f79b0a667936ec162967115b7cdb8b374684
+  metadata.gz: e22946b9e257c6d13ce3d950584049f31c570aa618e047e6041ea1ef5b3a9ca85322124ef6fcc04a41dac4860b3441045265a4080886df13d31322b7bd88ad80
+  data.tar.gz: 120350fb80cea5353cc79dbe8f63e5adec7d14b45fa6df526cc3de349a8d54a797bf283467d4d45f4156a34b3ea2d06c8915f9b66b7e1eff6cf0d95fd6f777a7

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 2.1.3
+
+2023-03-07 11:21
+
+#### FIXED
+
+- Annoying warning about color template format string having too many arguments
+
+### 2.1.2
+
+2023-03-07 10:24
+
+#### IMPROVED
+
+- Merge metadata into named variables so they're also available as ${NAME}
+
 ### 2.1.1
 
 2023-03-07 09:47

data/lib/howzit/colors.rb

@@ -227,7 +227,7 @@ module Howzit
       def template(input)
         input = input.join(' ') if input.is_a? Array
         fmt = input.gsub(/%/, '%%')
-        fmt = fmt.gsub(/(?<!\\u)\{(\w+)\}/i) do
+        fmt = fmt.gsub(/(?<!\\u|\$)\{(\w+)\}/i) do
           Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
         end
 
@@ -237,7 +237,7 @@ module Howzit
                    Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
                    d: dark, b: bold, u: underline, i: italic, x: reset }
 
-        format(fmt, colors)
+        fmt.empty? ? input : format(fmt, colors)
       end
     end
 
@@ -304,7 +304,7 @@ module Howzit
       %w[r g b].each do |e|
         t << parts[e].hex
       end
-      color =
+
       "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
     end
 

data/lib/howzit/stringutils.rb

@@ -242,25 +242,25 @@ module Howzit
     ##
     def render_arguments
       str = dup
-      str.gsub!(/\$\{(?<name>[A-Z0-9_]+(?::.*?)?)\}/i) do |mtch|
+      str.render_named_placeholders
+      str.render_numeric_placeholders
+      Howzit.arguments.nil? ? str : str.gsub(/\$[@*]/, Shellwords.join(Howzit.arguments))
+    end
+
+    def render_named_placeholders
+      gsub!(/\$\{(?<name>[A-Z0-9_]+(?::.*?)?)\}/i) do
         m = Regexp.last_match
         arg, default = m['name'].split(/:/).map(&:strip)
         Howzit.named_arguments.key?(arg) && !Howzit.named_arguments[arg].nil? ? Howzit.named_arguments[arg] : default
       end
+    end
 
-      str.gsub!(/\$\{?(\d+)\}?/) do
-        m = Regexp.last_match
-        arg, default = m[1].split(/:/)
+    def render_numeric_placeholders
+      gsub!(/\$\{?(\d+)\}?/) do
+        arg, default = Regexp.last_match(1).split(/:/)
         idx = arg.to_i - 1
-        if Howzit.arguments.length > idx
-          Howzit.arguments[idx]
-        elsif default
-          default
-        else
-          m[0]
-        end
+        Howzit.arguments.length > idx ? Howzit.arguments[idx] : default || Regexp.last_match(0)
       end
-      Howzit.arguments.nil? ? str : str.gsub(/\$[@*]/, Shellwords.join(Howzit.arguments))
     end
 
     ##
@@ -289,7 +289,10 @@ module Howzit
       scan(/(?mi)^(\S[\s\S]+?): ([\s\S]*?)(?=\n\S[\s\S]*?:|\Z)/).each do |m|
         data[m[0].strip.downcase] = m[1]
       end
-      normalize_metadata(data)
+      out = normalize_metadata(data)
+      Howzit.named_arguments ||= {}
+      Howzit.named_arguments = out.merge(Howzit.named_arguments)
+      out
     end
 
     ##

data/lib/howzit/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.1.1'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Brett Terpstra