re_duxml 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2ccb9fa84a9e969220ff9ab2cbe9a945cb9f07
-  data.tar.gz: 9f9c52ad59e65c6d888e18c35cdbdf900c962aa5
+  metadata.gz: b3d5fa8b77a1b0b291c282574fc9a17cbd1e0de6
+  data.tar.gz: 9e29841defd5a865ce9644da31f58b6dfc1f955a
 SHA512:
-  metadata.gz: 61dfd7e3bc30423fbc216947232d60d7da2247a74d18c26f984450d00c92e627c79fc250fba7e3b70695f70e59545c37521c575e7015e12eef62407f01a342df
-  data.tar.gz: 6e6c50737da85d318f516f2f10d6daa905b0ddae7ddbb60ea1e11d312a9f2b95b49920e3fc80f70cbf760424b6224b8985652994d56e83ad5eed123ca4381711
+  metadata.gz: 55ef6a539b7887e2b23055cb7e1ad8f751fc7661d2f91d92e095238ddb8c834580097311a837e77594d7f4e998033048e1ff91bd212526a00c89b449a06297ee
+  data.tar.gz: 4f89848c40a34c56fd6ee9545ff5bbb2d5bd2c0b6d290f42d94669e5016772cccd94d5136ccec3ab869b07909be4e6d0365a581332a44a159cb0452e751ba010

data/lib/re_duxml.rb

@@ -85,20 +85,27 @@ module ReDuxml
   # @param param_hash [Hash] keys are parameter names, values are parameter values e.g. {var0: 'param', var1: 'eter'}
   # @return [String] content_str with parameter values substituted and algebraically reduced if any unknown parameters remain e.g. 'a parameter string @(var2)'
   def resolve_str(content_str, param_hash)
-    question = find_expr content_str
-    return content_str if question.nil?
-    reply = Macro.new e.evaluate(question, param_hash).to_s
-    replacement_str = reply.parameterized? ? reply.macro_string : reply.demacro
-    macro_string = Macro.new(question).macro_string
-    content_str.gsub(macro_string, replacement_str)
+    output_str = content_str.clone
+    questions = find_exprs content_str
+    return output_str if questions.empty?
+    questions.each do |question|
+      reply = Macro.new e.evaluate(question, param_hash).to_s
+      replacement_str = reply.parameterized? ? reply.macro_string : reply.demacro
+      macro_string = Macro.new(question).macro_string
+      output_str.gsub!(macro_string, replacement_str)
+    end
+    output_str
   end
 
   # @param str [String] string that may contain parameter expression e.g. 'asdf @(param + 2) asdf'
-  # @return [String] macro string e.g. 'asdf @(param + 2) asdf' => 'param + 2'
-  def find_expr(str)
-    expr_start_index = str.index('@(')
-    return nil if expr_start_index.nil?
-    expr_end_index = find_close_parens_index str[expr_start_index+1..-1]
-    str[expr_start_index+2, expr_end_index-1]
+  # @return [Array[String]] array of macro strings e.g. 'asdf @(param + 2) asdf' => 'param + 2'
+  def find_exprs(str)
+    expressions = []
+    str.scan('@(') do |c|
+      expr_start_index = $~.offset(0)[0] # gets index of current match
+      expr_end_index = find_close_parens_index str[expr_start_index+1..-1]
+      expressions << str[expr_start_index+2, expr_end_index-1]
+    end
+    expressions
   end
 end # module Dux

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re_duxml
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Kong