Mustache specs - lambda compliance

mustache.js

@@ -258,9 +258,9 @@
         } else if (typeof value === 'function') {
           var text = template == null ? null : template.slice(token[3], token[5]);
           value = value.call(context.view, text, function (template) {
-            return writer.render(template, context);
+            return writer.render('' + template, context);
           });
-          if (value != null) buffer += value;
+          if (value != null) buffer += writer.render('' + value, context);
         } else if (value) {
           buffer += renderTokens(token[4], writer, context, template);
         }
@@ -282,10 +282,14 @@
         break;
       case '&':
         value = context.lookup(tokenValue);
+        if (typeof value === 'function')
+          value = writer.render('' + value.call(context.view), context);
         if (value != null) buffer += value;
         break;
       case 'name':
         value = context.lookup(tokenValue);
+        if (typeof value === 'function')
+          value = writer.render('' + value.call(context.view), context);
         if (value != null) buffer += exports.escape(value);
         break;
       case 'text':

test/_files/higher_order_sections.js

@@ -3,7 +3,7 @@
   helper: "To tinker?",
   bolder: function () {
     return function (text, render) {
-      return text + ' => <b>' + render(text) + '</b> ' + this.helper;
+      return '<b>' + render(text) + '</b> ' + this.helper;
     }
   }
 })

test/_files/higher_order_sections.txt

@@ -1 +1 @@
-Hi {{name}}. => <b>Hi Tater.</b> To tinker?
+<b>Hi Tater.</b> To tinker?

test/mustache-spec-test.js

@@ -4,6 +4,10 @@ var fs = require('fs');
 var path = require('path');
 var specsDir = path.join(__dirname, 'spec/specs');
 
+// need to define globals used in ~lambdas - Interpolation - Multiple Calls
+// otherwise mocha complains
+g=null, calls=null;
+
 var skipTests = {
   comments: [
     'Standalone Without Newline'
@@ -23,12 +27,6 @@ var skipTests = {
     'Standalone Without Newline'
   ],
   '~lambdas': [
-    'Interpolation',
-    'Interpolation - Expansion',
-    'Interpolation - Alternate Delimiters',
-    'Interpolation - Multiple Calls',
-    'Escaping',
-    'Section - Expansion',
     'Section - Alternate Delimiters'
   ]
 };