Factor getPartialKey out of pattern assembler -- it's Mustache-specific

pattern-lab · Dec 4, 2015 · bdb0b7b · bdb0b7b
1 parent b2e1a38
commit bdb0b7b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/builder/object_factory.js b/builder/object_factory.js
@@ -1,6 +1,6 @@
-/* 
- * patternlab-node - v0.15.1 - 2015 
- * 
+/*
+ * patternlab-node - v0.15.1 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
@@ -77,6 +77,10 @@
 
     findListItems: function () {
       return this.engine.findListItems(this);
+    },
+
+    getPartialKey: function (partialString) {
+      return this.engine.getPartialKey(this, partialString);
     }
   };
 

diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -145,6 +145,8 @@
       addPattern(currentPattern, patternlab);
     }
 
+
+
     function processPatternRecursive(file, patternlab, additionalData){
       var lh = require('./lineage_hunter'),
           ph = require('./parameter_hunter'),
@@ -192,7 +194,7 @@
 
         //do something with the regular old partials
         for(i = 0; i < foundPatternPartials.length; i++){
-          var partialKey = foundPatternPartials[i].replace(/{{>([ ])?([\w\-\.\/~]+)(:[A-z-_|]+)?(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)?([ ])?}}/g, '$2');
+          var partialKey = currentPattern.getPartialKey(foundPatternPartials[i]);
 
           var partialPath;
 

diff --git a/builder/pattern_engines/engine_mustache.js b/builder/pattern_engines/engine_mustache.js
@@ -23,6 +23,7 @@
     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,
 
     // render it
     renderPattern: function renderPattern(template, data, partials) {
@@ -37,18 +38,25 @@
       var matches = pattern.template.match(this.findPartialsRE);
       return matches;
     },
-    findPartialsWithStyleModifiers: function(pattern){
+    findPartialsWithStyleModifiers: function(pattern) {
       var matches = pattern.template.match(this.findPartialsWithStyleModifiersRE);
       return matches;
     },
-    // returns any patterns that match {{> value(foo:"bar") }} or {{> value:mod(foo:"bar") }} within the pattern
-    findPartialsWithPatternParameters: function(pattern){
+    // returns any patterns that match {{> value(foo:"bar") }} or {{>
+    // value:mod(foo:"bar") }} within the pattern
+    findPartialsWithPatternParameters: function(pattern) {
       var matches = pattern.template.match(this.findPartialsWithPatternParametersRE);
       return matches;
     },
-    findListItems: function(pattern){
+    findListItems: function(pattern) {
       var matches = pattern.template.match(this.findListItemsRE);
       return matches;
+    },
+    // 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');
+      return partialKey;
     }
   };