Merge pull request #1 from pattern-lab/dev

alter findPartials regex to a modified version of the old format

Author: Brian Muenzenmeyer

README.md

@@ -1,5 +1,5 @@
 ## The Mustache engine for Pattern Lab / Node
 
-This one should be included by default with Mustache editions. If it's missing from your project for any reason, `npm install patternengine-node-mustache` should do the trick.
+This one should be included by default with [Pattern Lab Node Core](https://github.com/pattern-lab/patternlab-node) and consumed by [Node Editions](https://github.com/pattern-lab?utf8=%E2%9C%93&query=edition-node).
 
-On dev right now the command is `npm install pattern-lab/patternengine-node-mustache#dev`
+If it's missing from your project for any reason, `npm install patternengine-node-mustache` should do the trick.

lib/engine_mustache.js

@@ -1,5 +1,5 @@
 /*
- * mustache pattern engine for patternlab-node - v0.10.1 - 2015
+ * mustache pattern engine for patternlab-node - v2.X.X - 2016
  *
  * Geoffrey Pursell, Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -60,13 +60,11 @@ var engine_mustache = {
    */
   patternMatcher: function patternMatcher(pattern, regex) {
     var matches;
-
     if (typeof pattern === 'string') {
       matches = pattern.match(regex);
     } else if (typeof pattern === 'object' && typeof pattern.template === 'string') {
       matches = pattern.template.match(regex);
     }
-
     return matches;
   },
 

lib/util_mustache.js

@@ -1,5 +1,5 @@
 /*
- * mustache utilities for patternlab-node - v0.10.1 - 2015
+ * mustache utilities for patternlab-node - v2.X.X - 2016
  *
  * Geoffrey Pursell, Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -12,59 +12,8 @@
 
 // the term "alphanumeric" includes underscores.
 
-// look for an opening mustache include tag, followed by >=0 whitespaces
-var partialsStr = '{{>\\s*';
-
-// begin 1st exterior group, a mandatory group
-// look for >0 of an interior group comprising
-// >0 digits, followed by a hyphen, followed by >0 alphanumerics
-partialsStr += '((\\d+-[\\w-]+\\/)+';
-
-// then an interior group comprising
-// >0 digits, followed by a hyphen, followed by >0 alphanumerics,
-// followed by an optional group of a period followed by >0 alphanumerics
-partialsStr += '(\\d+-[\\w-]+(\\.\\w+)?)';
-
-// if the previous two interior groups are not found, look for any number of
-// alphanumerics or hyphens
-partialsStr += '|[\\w\\-]+)';
-
-// end 1st exterior group
-// begin 2nd exterior group, an optional group
-// look for a colon, followed by >0 alphanumerics or hyphens,
-// followed by >=0 interior groups
-// comprising a pipe, followed by >0 alphanumerics or hyphens
-partialsStr += '(\\:[\\w\\-]+(\\|[\\w\\-]+)*)?';
-
-// end 2nd exterior group
-// begin 3rd exterior group, an optional group
-// look for an opening parenthesis, followed by >=0 whitespaces, followed by
-// >0 alphanumerics, followed by >=0 whitespaces, followed by a colon,
-// followed by >=0 whitespaces
-partialsStr += '(\\(\\s*\\w+\\s*\\:\\s*';
-
-// followed by an interior group
-// comprising a single quote, followed by an interior group comprising
-// >=0 characters that are not single quotes or backslashes
-// or >=0 character pairs comprising a backlash, followed by any character.
-// look for a single quote to terminate this pattern
-partialsStr += '(\'([^\'\\\\]|\\\\.)*\'';
-
-// if the pattern wrapped in single quotes is not found, look for one wrapped
-// in double quotes
-// look for a double quote, followed by an interior group comprising
-// >=0 characters that are not double quotes or backslashes
-// or >=0 character pairs comprising a backlash, followed by any character.
-// look for a double quote to terminate this pattern
-partialsStr += '|"([^"\\\\]|\\\\.)*")';
-
-// look for a closing parenthesis
-partialsStr += '\\))?';
-
-// end 3rd exterior group
-// look for >=0 whitespaces, followed by closing mustache tag
-partialsStr += '\\s*}}';
-var partialsRE = new RegExp(partialsStr, 'g');
+// todo: document this exact regex long form.
+var partialsRE = new RegExp(/{{>\s*?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_|]+)?(?:(?:| )\(.*)?(?:\s*)?}}/, 'g');
 
 // look for an opening mustache include tag, followed by >=0 whitespaces
 var partialsWithStyleModifiersStr = '{{>\\s*';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "patternengine-node-mustache",
   "description": "The Mustache engine for Pattern Lab / Node",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "lib/engine_mustache.js",
   "dependencies": {
     "mustache": "^2.2.0"