factor Mustache-specific findPartialKey out of the lineage hunter and

put it in the Mustach engine, where it replaces one that didn't work as
well; normalize all references to getPartialKey to findPartialKey; fix
the Mustache findPartialsRE to pass the 'pattern_assembler -
processPatternRecursive - correctly replaces multiple stylemodifier
classes on same partial' unit test.

Author: geoffp

builder/lineage_hunter.js

@@ -23,24 +23,13 @@
 			var matches = pattern.findPartials();
 			if(matches !== null){
 				matches.forEach(function(match, index, matches){
-					//strip out the template cruft
-					var foundPatternKey = match.replace("{{> ", "").replace(" }}", "").replace("{{>", "").replace("}}", "");
-
-					// remove any potential pattern parameters. this and the above are rather brutish but I didn't want to do a regex at the time
-					if(foundPatternKey.indexOf('(') > 0){
-						foundPatternKey = foundPatternKey.substring(0, foundPatternKey.indexOf('('));
-					}
-
-					//remove any potential stylemodifiers.
-					foundPatternKey = foundPatternKey.split(':')[0];
-
 					//get the ancestorPattern
-					var ancestorPattern = pattern_assembler.get_pattern_by_key(foundPatternKey, patternlab);
+					var ancestorPattern = pattern_assembler.get_pattern_by_key(pattern.findPartialKey(match), patternlab);
 
 					if (ancestorPattern && pattern.lineageIndex.indexOf(ancestorPattern.key) === -1){
-
 							//add it since it didnt exist
-							pattern.lineageIndex.push(ancestorPattern.key);
+						pattern.lineageIndex.push(ancestorPattern.key);
+
 							//create the more complex patternLineage object too
 							var l = {
 								"lineagePattern": ancestorPattern.key,

builder/object_factory.js

@@ -82,8 +82,8 @@
       return this.engine.findListItems(this);
     },
 
-    getPartialKey: function (partialString) {
-      return this.engine.getPartialKey(this, partialString);
+    findPartialKey: function (partialString) {
+      return this.engine.findPartialKey(partialString);
     }
   };
 

builder/pattern_assembler.js

@@ -156,7 +156,7 @@
 
       //do something with the regular old partials
       for(var i = 0; i < foundPatternPartials.length; i++){
-        var partialKey = currentPattern.getPartialKey(foundPatternPartials[i]);
+        var partialKey = currentPattern.findPartialKey(foundPatternPartials[i]);
         var partialPath;
 
         //identify which pattern this partial corresponds to

builder/pattern_engines/engine_handlebars.js

@@ -64,7 +64,7 @@
     },
     // given a pattern, and a partial string, tease out the "pattern key" and
     // return it.
-    getPartialKey: function(pattern, partialString) {
+    findPartialKey: function(pattern, partialString) {
       var partialKey = partialString.replace(this.findPartialsRE, '$1');
       return partialKey;
     }

builder/pattern_engines/engine_mustache.js

@@ -23,11 +23,11 @@
     expandPartials: true,
 
     // regexes, stored here so they're only compiled once
-    findPartialsRE: /{{>\s*((?:\d+-[\w-]+\/)+(\d+-[\w-]+(\.\w+)?)|[A-Za-z0-9-]+)(\:[\w-]+)?(\(\s*\w+\s*:\s*(?:'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")\))?\s*}}/g,
+    findPartialsRE:  /{{>\s*((?:\d+-[\w-]+\/)+(\d+-[\w-]+(\.\w+)?)|[A-Za-z0-9-]+)(\:[\w-]+(?:\|[\w-]+)*)?(\(\s*\w+\s*:\s*(?:'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")\))?\s*}}/g,
     findPartialsWithStyleModifiersRE: /{{>([ ])?([\w\-\.\/~]+)(?!\()(\:[A-Za-z0-9-_|]+)+(?:(| )\(.*)?([ ])?}}/g,
     findPartialsWithPatternParametersRE: /{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_|]+)?(?:(| )\(.*)+([ ])?}}/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,
-    getPartialKeyRE: /{{>([ ])?([\w\-\.\/~]+)(:[A-z-_|]+)?(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)?([ ])?}}/g,
+    findPartialKeyRE: /{{>([ ])?([\w\-\.\/~]+)(:[A-z-_|]+)?(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)?([ ])?}}/g,
 
     // render it
     renderPattern: function renderPattern(template, data, partials) {
@@ -58,9 +58,26 @@
     },
     // given a pattern, and a partial string, tease out the "pattern key" and
     // return it.
-    getPartialKey: function(pattern, partialString) {
-      var partialKey = partialString.replace(this.getPartialKeyRE, '$2');
+    findPartialKey_new: function(partialString) {
+      var partialKey = partialString.replace(this.findPartialKeyRE, '$2');
       return partialKey;
+    },
+
+    // GTP: the old implementation works better. We might not need
+    // this.findPartialKeyRE anymore if it works in all cases!
+    findPartialKey: function(partialString) {
+      //strip out the template cruft
+      var foundPatternKey = partialString.replace("{{> ", "").replace(" }}", "").replace("{{>", "").replace("}}", "");
+
+		  // remove any potential pattern parameters. this and the above are rather brutish but I didn't want to do a regex at the time
+		  if(foundPatternKey.indexOf('(') > 0){
+			  foundPatternKey = foundPatternKey.substring(0, foundPatternKey.indexOf('('));
+		  }
+
+		  //remove any potential stylemodifiers.
+		  foundPatternKey = foundPatternKey.split(':')[0];
+
+      return foundPatternKey;
     }
   };