From 528e5ac7d6302734c0553a597e02f2fdf7d44fb8 Mon Sep 17 00:00:00 2001
From: janders4 <janders4@gmail.com>
Date: Tue, 24 Apr 2012 11:43:26 -0500
Subject: [PATCH 1/2] added support for Mustache's implicit iterator {{.}}

---
 mustache/Mustache.cfc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/mustache/Mustache.cfc b/mustache/Mustache.cfc
index a7006b6..2a4109f 100644
--- a/mustache/Mustache.cfc
+++ b/mustache/Mustache.cfc
@@ -35,7 +35,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	 --->
 
 	<cfset variables.SectionRegEx = CreateObject("java","java.util.regex.Pattern").compile("\{\{(##|\^)\s*(\w+)\s*}}(.*?)\{\{/\s*\2\s*\}\}", 32)>
-	<cfset variables.TagRegEx = CreateObject("java","java.util.regex.Pattern").compile("\{\{(!|\{|&|\>)?\s*(\w+).*?\}?\}\}", 32) />
+    <cfset variables.TagRegEx = CreateObject("java","java.util.regex.Pattern").compile("\{\{(!|\{|&|\>)?\s*([\w\.]+).*?\}?\}\}", 32) />
+
 
   <cffunction name="init" output="false">
     <cfreturn this />
@@ -65,7 +66,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <cfset type = matches[2] />
       <cfset tagName = matches[3] />
       <cfset inner = matches[4] />
+   
       <cfset template = replace(template, tag, renderSection(tagName, type, inner, context))/>
+          
     </cfloop>
     <cfreturn template/>
   </cffunction>
@@ -76,6 +79,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		<cfargument name="inner"/>
 		<cfargument name="context"/>
 		<cfset var ctx = get(arguments.tagName, context) />
+    
 		<cfif isStruct(ctx) and !StructIsEmpty(ctx)>
 			<cfreturn render(arguments.inner, ctx) />
 		<cfelseif isQuery(ctx) AND ctx.recordCount>
@@ -114,9 +118,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   <cffunction name="renderArraySection" access="private" output="false">
     <cfargument name="template"/>
-    <cfargument name="context"/>
+    <cfargument name="context"/> 
     <cfset var result = [] />
     <cfset var item = "" />
+    
     <cfloop array="#context#" index="item">
       <cfset ArrayAppend(result, render(template, item)) />
     </cfloop>
@@ -147,6 +152,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     <cfargument name="type" />
     <cfargument name="tagName" />
     <cfargument name="context" />
+                 
     <cfif type eq "!">
       <cfreturn "" />
     <cfelseif type eq "{" or type eq "&">
@@ -168,7 +174,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   <cffunction name="get" access="private" output="false">
     <cfargument name="key" />
     <cfargument name="context"/>
-    <cfif isStruct(context) && structKeyExists(context, key) >
+    
+    <cfif key EQ ".">
+        <cfreturn ToString(context)>
+    <cfelseif isStruct(context) && structKeyExists(context, key) >
       <cfif isCustomFunction(context[key])>
         <cfreturn evaluate("context.#key#('')")>
       <cfelse>
@@ -181,7 +190,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 				<cfreturn "" />
 	    </cfif>
 		<cfelse>
-      <cfreturn "" />
+      <cfreturn "" />     
     </cfif>
   </cffunction>
 

From b42eb15a7603460b3fb0134830791741f4901401 Mon Sep 17 00:00:00 2001
From: janders4 <janders4@gmail.com>
Date: Tue, 24 Apr 2012 16:53:02 -0500
Subject: [PATCH 2/2] Update mustache/Mustache.cfc

---
 mustache/Mustache.cfc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mustache/Mustache.cfc b/mustache/Mustache.cfc
index 2a4109f..2ae177b 100644
--- a/mustache/Mustache.cfc
+++ b/mustache/Mustache.cfc
@@ -95,7 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		<cfreturn "" />
 	</cffunction>
 
-	<cffunction name="convertToBoolean">
+	<cffunction name="convertToBoolean" output="false">
 		<cfargument name="value"/>
 		<cfif isBoolean(value)>
 			<cfreturn value />
@@ -174,23 +174,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   <cffunction name="get" access="private" output="false">
     <cfargument name="key" />
     <cfargument name="context"/>
-    
-    <cfif key EQ ".">
-        <cfreturn ToString(context)>
-    <cfelseif isStruct(context) && structKeyExists(context, key) >
+      
+    <cfif isStruct(context) && structKeyExists(context, key) >
       <cfif isCustomFunction(context[key])>
         <cfreturn evaluate("context.#key#('')")>
       <cfelse>
         <cfreturn context[key]/>
       </cfif>
     <cfelseif isQuery(context)>
-			<cfif listContainsNoCase(context.columnList, key)>
-      	<cfreturn context[key][context.currentrow] />
+		<cfif listContainsNoCase(context.columnList, key)>
+      		<cfreturn context[key][context.currentrow] />
     	<cfelse>
-				<cfreturn "" />
+			<cfreturn "" />
 	    </cfif>
-		<cfelse>
-      <cfreturn "" />     
+    <cfelseif (NOT isArray(context)) AND key EQ ".">
+    	<cfreturn ToString(context)>
+	<cfelse>
+      <cfreturn "" />         
     </cfif>
   </cffunction>