howzit 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61fbc8c08077a6d9e5496fb94c91b051ef02fb258ad162ad6588a73a4ae2e30
-  data.tar.gz: a6512e0efcd43bc57236d7bcbaa7c99baf9825630638b45cb936132fed932b03
+  metadata.gz: 23a304a27d457b410c8764ed0b83f0a00e2e6e9108ba3fd4a7bef722695d8607
+  data.tar.gz: 2041090127040e2315691750de2ee9ccaf3d770a7b8561d328f573e78e633a50
 SHA512:
-  metadata.gz: 40aa758d7549cb6a2d6b8e6a3c6f9e38aafe377db0c3e2923948dc4981e0b601553c79e73a1e46e097c98f250792bc28b07693a5d3c99b60280cea207322956e
-  data.tar.gz: 07d0d4dbae06e9c9019d7ee74dab8b8b0ffa99d328f416a31566dcdc2741f411507f1be42ba5906a40231c31158eb7de3cc8d156a3e9b5e7e2941a54603a8812
+  metadata.gz: 8dda575709255dec600f6ba6f259c856b67ab91d9418fbcbc374f85a8eaa6a2842ac8a0b9bdd22a5eec9621e17353b6f2dfa7bc7b6f9b7de9d0c64006d5a27b1
+  data.tar.gz: 236c40bbd997c4bd956aa9796999771b965907add10b208929ba45a09c04679126177232dce1a5d29d15cec4ebfd09315b8bc274e588b0fccc02a938395731ef

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 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
+
+#### FIXED
+
+- Allow variables names to contain numbers and underscores
+
 ### 2.1.0
 
 2023-03-07 09:24

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
 

data/lib/howzit/stringutils.rb

@@ -242,25 +242,25 @@ module Howzit
     ##
     def render_arguments
       str = dup
-      str.gsub!(/\$\{(?<name>[A-Z]+(?::.*?)?)\}/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.0'
+  VERSION = '2.1.2'
 end

metadata

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