If a field is missing, just skip it.

rip747 · Jul 8, 2010 · 9d69765 · 9d69765
1 parent 87b4748
commit 9d69765
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/mustache/Mustache.cfc b/mustache/Mustache.cfc
@@ -40,13 +40,13 @@
     <cfargument name="inner"/>
     <cfargument name="context"/>
     <cfset var ctx = get(tagName, context) /> 
-    <cfif isStruct(ctx)>
+    <cfif isStruct(ctx)>        
       <cfreturn render(inner, ctx)>
     <cfelseif isQuery(ctx)>
       <cfreturn renderQuerySection(inner, ctx) />
     <cfelseif isArray(ctx)>                                                                                                         
-      <cfreturn renderArraySection(inner, ctx) />
-    <cfelseif isCustomFunction(context[tagName])>
+      <cfreturn renderArraySection(inner, ctx) />   
+    <cfelseif structKeyExists(context, tagName) and isCustomFunction(context[tagName])>
       <cfreturn evaluate("context.#tagName#(inner)") />
     <cfelseif convertToBoolean(ctx) xor type eq "^">
       <cfreturn inner />
@@ -134,11 +134,15 @@
       <cfif isCustomFunction(context[key])> 
         <cfreturn evaluate("context.#key#('')")>
       <cfelse>
-        <cfreturn context[key]/>
+        <cfreturn context[key]/>             
       </cfif>
-    <cfelseif isQuery(context)>
-      <cfreturn context[key][context.currentrow] />
-    <cfelse>
+    <cfelseif isQuery(context)>          
+			<cfif listContainsNoCase(context.columnList, key)>
+      	<cfreturn context[key][context.currentrow] />
+    	<cfelse>   
+				<cfreturn "" />
+	    </cfif>
+		<cfelse>
       <cfreturn "" />
     </cfif>
   </cffunction>

diff --git a/tests/RenderTests.cfc b/tests/RenderTests.cfc
@@ -81,6 +81,12 @@
     <cfset template = "Ready {{##set}}set {{/set}}go!" />
     <cfset expected = "Ready set go!" />
   </cffunction>     
+
+	<cffunction name="skipMissingField">
+		<cfset context =  structNew()  />
+    <cfset template = "There's something {{##foo}}missing{{/foo}}!" />
+    <cfset expected = "There's something !" />
+	</cffunction>
 
   <cffunction name="structAsSection">
     <cfset context = {
@@ -101,6 +107,15 @@
     <cfset context = {contacts = contacts} />
     <cfset template = "{{##contacts}}({{name}}'s number is {{phone}}){{/contacts}}">
     <cfset expected = "(Jenny's number is 867-5309)(Tom's number is 555-1234)" />
+  </cffunction>
+
+  <cffunction name="missingQueryColumnIsSkipped">
+    <cfset contacts = queryNew("name")/>
+    <cfset queryAddRow(contacts)>
+    <cfset querySetCell(contacts, "name", "Jenny") />
+    <cfset context = {contacts = contacts} />
+    <cfset template = "{{##contacts}}({{name}}'s number is {{phone}}){{/contacts}}">
+    <cfset expected = "(Jenny's number is )" />
   </cffunction>  
 
   <cffunction name="arrayAsSection">
@@ -112,6 +127,17 @@
     } />
     <cfset template = "{{##contacts}}({{name}}'s number is {{phone}}){{/contacts}}">
     <cfset expected = "(Jenny's number is 867-5309)(Tom's number is 555-1234)" />
+  </cffunction>       
+
+  <cffunction name="missingStructKeyIsSkipped">
+    <cfset context = {
+      contacts = [ 
+        { name = 'Jenny', phone = '867-5309'}
+        , { name = 'Tom'}
+      ]
+    } />
+    <cfset template = "{{##contacts}}({{name}}'s number is {{^phone}}unlisted{{/phone}}{{phone}}){{/contacts}}">
+    <cfset expected = "(Jenny's number is 867-5309)(Tom's number is unlisted)" />
   </cffunction>
 
   <cffunction name="escape">