drudje 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d18f1710e19364a61e8fbf2d1b5a63bf7b85617
-  data.tar.gz: e6ed2dcb60ee5894f00fe3af0c479ea30c07b652
+  metadata.gz: 09a241d58388c291a9137422a90a555bfb43556f
+  data.tar.gz: e21845df3a912f89dfdf3a57b0b9277ec618f9c7
 SHA512:
-  metadata.gz: cfb544a364727d2fed4c1b62b573c83aad27f24c58ea5e10c0b680bff80d47454014f734e3f65d18a9e878e44443ab4798671bd8330634e819812e9eef7ff50f
-  data.tar.gz: c918cd58c6c3613041c9be1fb06dc2365d73ffc6520967dc9ecf86786cb089c5c31493012c8a04f36a85e93ab3af5f1bbc8e538bcaf8cebabdba1c9740fc121f
+  metadata.gz: 7cfec2ac4b4a73f75dd5f41a90c9d65391c07adb1f769719f63c3774c270e787786fc5d6bd583f5e83d463da5741dde83265103b74aa6f523add5b1b9cd7e4ac
+  data.tar.gz: 3426059e0b3011ecb2e28fd1dd3ec744bb3361cc115b15f933212615e45c779c8dee359a1a4b8ab14a7e82948684b9a16d2b5eeff786813f698023fe91be0561

data/lib/drudje.rb

@@ -87,8 +87,35 @@ class Drudje
 		render template, args
 	end
 
+  def find_call_loc(str, cstart = 0, cend = str.length)
+    group_start = str.index('[[', cstart)
+    group_end = str.rindex(']]', cend)
+    return nil if !group_start || !group_end
+
+    # We want group_end to point to the last ], not the first
+    group_end = group_end + 1
+
+    call_start = group_start + 2
+    call_end = group_end - 2
+    length = call_end - call_start + 1
+    substr = str[call_start, length]
+    # Make sure the substring doesn't have more calls nested
+    if substr =~ /\[\[/
+      find_call_loc(str, call_start, group_end)
+    elsif substr =~ /\]\]/
+      find_call_loc(str, group_start, call_end)
+    else
+      [group_start, group_end]
+    end
+  end
+
 	def process_pass(str)
-		str.gsub(/\[\[([^\[\]]+)\]\]/){ expand($1) }
+    call_loc = find_call_loc(str)
+    return str if !call_loc
+    before = str[0, call_loc[0]]
+    during = str[call_loc[0]+2..call_loc[1]-2]
+    after = str[call_loc[1]+1,str.length]
+    before + expand(during) + after
 	end
 
 	def process(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drudje
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian DeJong