Merge branch 'dev'

Author: geoffp

lib/engine_handlebars.js

@@ -14,14 +14,26 @@
  * Full. Partial calls and lineage hunting are supported. Handlebars does not
  * support the mustache-specific syntax extensions, style modifiers and pattern
  * parameters, because their use cases are addressed by the core Handlebars
- * feature set.
+ * feature set. It also does not support verbose partial syntax, because it
+ * seems like it can't tolerate slashes in partial names. But honestly, did you
+ * really want to use the verbose syntax anyway? I don't.
  *
  */
 
 "use strict";
 
 var Handlebars = require('handlebars');
 
+// regexes, stored here so they're only compiled once
+const findPartialsRE = /{{#?>\s*([\w-\/.]+)(?:.|\s+)*?}}/g;
+const findListItemsRE = /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g;
+const findAtPartialBlockRE = /{{#?>\s*@partial-block\s*}}/g;
+
+function escapeAtPartialBlock(partialString) {
+  var partial = partialString.replace(findAtPartialBlockRE, '{{> @partial-block }}')
+  return partial;
+}
+
 var engine_handlebars = {
   engine: Handlebars,
   engineName: 'handlebars',
@@ -31,26 +43,27 @@ var engine_handlebars = {
   // style modifiers or pattern parameters (I think)
   expandPartials: false,
 
-  // regexes, stored here so they're only compiled once
-  findPartialsRE: /{{#?>\s*([\w-\/.]+)(?:.|\s+)*?}}/g,
-  findListItemsRE: /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g,
-
   // render it
   renderPattern: function renderPattern(pattern, data, partials) {
     if (partials) {
       Handlebars.registerPartial(partials);
     }
+    pattern.extendedTemplate = escapeAtPartialBlock(pattern.extendedTemplate);
     var compiled = Handlebars.compile(pattern.extendedTemplate);
     return compiled(data);
   },
 
   registerPartial: function (pattern) {
+    // register exact partial name
     Handlebars.registerPartial(pattern.patternPartial, pattern.template);
+
+    // register verbose syntax? No, it seems that Handlebars can't tolerate
+    // slashes in partial names.
   },
 
   // find and return any {{> template-name }} within pattern
   findPartials: function findPartials(pattern) {
-    var matches = pattern.template.match(this.findPartialsRE);
+    var matches = pattern.template.match(findPartialsRE);
     return matches;
   },
   findPartialsWithStyleModifiers: function () {
@@ -67,14 +80,14 @@ var engine_handlebars = {
     return [];
   },
   findListItems: function (pattern) {
-    var matches = pattern.template.match(this.findListItemsRE);
+    var matches = pattern.template.match(findListItemsRE);
     return matches;
   },
 
   // given a pattern, and a partial string, tease out the "pattern key" and
   // return it.
   findPartial: function (partialString) {
-    var partial = partialString.replace(this.findPartialsRE, '$1');
+    var partial = partialString.replace(findPartialsRE, '$1');
     return partial;
   }
 };