Process templates like "{{#contact}}({{name}}'s number is {{phone}}){…

…{/contact}}," where contact is a struct.
pmcelhaney · May 28, 2010 · 77ddcc6 · 77ddcc6
1 parent 06028c4
commit 77ddcc6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/CFStache.cfc b/CFStache.cfc
@@ -31,15 +31,18 @@
       <cfset type = matches[2] />
       <cfset tagName = matches[3] />   
       <cfset inner = matches[4] />
-      <cfset template = replace(template, tag, renderTemplate(tagName, inner))/>
+      <cfset template = replace(template, tag, renderSection(tagName, inner))/>
     </cfloop>
     <cfreturn template/>   
   </cffunction>                                                             
 
-  <cffunction name="renderTemplate">      
+  <cffunction name="renderSection">      
     <cfargument name="tagName"/>
     <cfargument name="inner"/>
-    <cfif get(tagName)>
+    <cfset var ctx = get(tagName) />
+    <cfif isStruct(ctx)>
+      <cfreturn render(inner, ctx)>
+    <cfelseif ctx>
       <cfreturn inner />
     <cfelse>
       <cfreturn "" />

diff --git a/Tests.cfc b/Tests.cfc
@@ -60,8 +60,17 @@
     <cfset template = "Ready {{##set}}set {{/set}}go!" />
     <cfset context =  { set = true }  />     
     <cfset expected = "Ready set go!" />
-  </cffunction>
-
+  </cffunction>    
+
+  <cffunction name="structAsSection">
+    <cfset context = {
+      contact = { name = 'Jenny', phone = '867-5309'}
+    } />
+    <cfset template = "{{##contact}}({{name}}'s number is {{phone}}){{/contact}}">
+    <cfset expected = "(Jenny's number is 867-5309)" />
+
+
+  </cffunction>