Merge remote-tracking branch 'refs/remotes/upstream/dev' into pattern-engines

Conflicts:
	builder/object_factory.js
	builder/pattern_assembler.js
	builder/patternlab.js
	builder/pseudopattern_hunter.js
	test/lineage_hunter_tests.js
	test/list_item_hunter_tests.js
	test/pattern_assembler_tests.js

Author: geoffp

CHANGELOG

@@ -1,5 +1,17 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v1.1.0
+- FIX: Fixed issue where partials containing styleModifiers with integers were not found correctly under all circumstances
+- FIX: Fixed issue where excluded patterns were still rendered on the Pattern Lab site. Now they do not directly get rendered via the menu, view all links, or the styleguide, but are accessible for inclusion as pattern partials, and can be accessed via lineage.
+- THX: Thanks @theorise for reporting these issues.
+- THX: Thanks @dmolsen for input on desired behavior.
+- FIX: Fixed issue where style modifier partials within list item blocks where not uniquely being applied. this seems like a regression. added a unit test with fix
+- ADD: Added fuzzy pattern matching support based on patternType-substring(patternName) to align with PL PHP
+- FIX: Fixed issue with gulpfile not copying style.css and watching the wrong directory
+- THX: Thanks @robinsonaaron for the issue and pull request!
+- FIX: Prefer exact pattern key match over fuzzy matches inside getpatternbykey()
+- THX: Thanks @EvanLovely for the suggestion
+
 PL-node-v1.0.0
 - FIX: Resolve issue with not hiding underscored patterns.
 - THX: Thanks @ivancamilov for reporting this regression.

builder/lineage_hunter.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.0.0 - 2015 
+ * patternlab-node - v1.0.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -24,47 +24,41 @@
 			if(matches !== null){
 				matches.forEach(function(match, index, matches){
 					//strip out the template cruft
-					var foundPattern = match.replace("{{> ", "").replace(" }}", "").replace("{{>", "").replace("}}", "");
+					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(foundPattern.indexOf('(') > 0){
-						foundPattern = foundPattern.substring(0, foundPattern.indexOf('('));
+					if(foundPatternKey.indexOf('(') > 0){
+						foundPatternKey = foundPatternKey.substring(0, foundPatternKey.indexOf('('));
 					}
 
-					//add if it doesnt exist
-					if (pattern.lineageIndex.indexOf(foundPattern) === -1){
+					//remove any potential stylemodifiers.
+					foundPatternKey = foundPatternKey.split(':')[0];
 
-						pattern.lineageIndex.push(foundPattern);
+					//get the ancestorPattern
+					var ancestorPattern = pattern_assembler.get_pattern_by_key(foundPatternKey, patternlab);
 
-						patternlab.patterns.forEach(function(ancestorPattern, index, patterns){
+					if (ancestorPattern && pattern.lineageIndex.indexOf(ancestorPattern.key) === -1){
 
-							//find the pattern in question
-							var searchPattern = ancestorPattern.patternGroup + "-" + ancestorPattern.patternName;
+							//add it since it didnt exist
+							pattern.lineageIndex.push(ancestorPattern.key);
+							//create the more complex patternLineage object too
+							var l = {
+								"lineagePattern": ancestorPattern.key,
+								"lineagePath": "../../patterns/" + ancestorPattern.patternLink
+							};
+							pattern.lineage.push(JSON.stringify(l));
 
-							if(searchPattern === foundPattern){
-								//create the more complex patternLineage object too
-								var l = {
-									"lineagePattern": foundPattern,
-									"lineagePath": "../../patterns/" + ancestorPattern.patternLink
+							//also, add the lineageR entry if it doesn't exist
+							if (ancestorPattern.lineageRIndex.indexOf(pattern.key) === -1){
+								ancestorPattern.lineageRIndex.push(pattern.key);
+
+								//create the more complex patternLineage object in reverse
+								var lr = {
+									"lineagePattern": pattern.key,
+									"lineagePath": "../../patterns/" + pattern.patternLink
 								};
-								pattern.lineage.push(JSON.stringify(l));
-
-								//also, add the lineageR entry if it doesn't exist
-								var patternLabel = pattern.patternGroup + "-" + pattern.patternName;
-								if (ancestorPattern.lineageRIndex.indexOf(patternLabel) === -1){
-									ancestorPattern.lineageRIndex.push(patternLabel);
-
-									//create the more complex patternLineage object in reverse
-									var lr = {
-										"lineagePattern": patternLabel,
-										"lineagePath": "../../patterns/" + pattern.patternLink
-									};
-									ancestorPattern.lineageR.push(JSON.stringify(lr));
-								}
+								ancestorPattern.lineageR.push(JSON.stringify(lr));
 							}
-
-						});
-
 					}
 				});
 			}

builder/list_item_hunter.js

@@ -1,6 +1,6 @@
-/* 
- * patternlab-node - v1.0.0 - 2015 
- * 
+/*
+ * patternlab-node - v1.0.1 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
@@ -79,13 +79,16 @@
 								var partialName = foundPartials[j].match(/([\w\-\.\/~]+)/g)[0];
 								var partialPattern = pattern_assembler.get_pattern_by_key(partialName, patternlab);
 
+								//create a copy of the partial so as to not pollute it after the get_pattern_by_key call.
+								var cleanPartialPattern = JSON.parse(JSON.stringify(partialPattern));
+
 								//if partial has style modifier data, replace the styleModifier value
-								if(pattern.stylePartials && pattern.stylePartials.length > 0){
-									style_modifier_hunter.consume_style_modifier(partialPattern, foundPartials[j], patternlab);
+								if(foundPartials[j].indexOf(':') > -1){
+									style_modifier_hunter.consume_style_modifier(cleanPartialPattern, foundPartials[j], patternlab);
 								}
 
 								//replace its reference within the block with the extended template
-								thisBlockTemplate = thisBlockTemplate.replace(foundPartials[j], partialPattern.extendedTemplate);
+								thisBlockTemplate = thisBlockTemplate.replace(foundPartials[j], cleanPartialPattern.extendedTemplate);
 							}
 
 							//render with data

builder/media_hunter.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.0.0 - 2015 
+ * patternlab-node - v1.0.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 

builder/object_factory.js

@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v1.0.0 - 2015
- *
+/* 
+ * patternlab-node - v1.0.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *

builder/parameter_hunter.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.0.0 - 2015 
+ * patternlab-node - v1.0.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 

builder/pattern_assembler.js

@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v1.0.0 - 2015
+ * patternlab-node - v1.0.1 - 2015
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -72,7 +72,7 @@
 
     function processPatternIterative(file, patternlab){
       //extract some information
-      var subdir = path.dirname(path.relative(patternlab.config.patterns.source, file)).replace('\\', '/');
+      var subdir = path.dirname(path.relative(patternlab.config.paths.source.patterns, file)).replace('\\', '/');
       var filename = path.basename(file);
       var ext = path.extname(filename);
 
@@ -101,7 +101,7 @@
 
       //look for a json file for this template
       try {
-        var jsonFilename = path.resolve(patternlab.config.patterns.source, currentPattern.subdir, currentPattern.fileName  + ".json");
+        var jsonFilename = path.resolve(patternlab.config.paths.source.patterns, currentPattern.subdir, currentPattern.fileName + ".json");
         currentPattern.jsonFileData = fs.readJSONSync(jsonFilename);
         if(patternlab.config.debug){
           console.log('processPatternIterative: found pattern-specific data.json for ' + currentPattern.key);
@@ -112,8 +112,8 @@
 
       //look for a listitems.json file for this template
       try {
-        var listJsonFileName = patternlab.config.patterns.source + currentPattern.subdir + '/' + currentPattern.fileName  + ".listitems.json";
-        currentPattern.listitems = fs.readJSONSync(listJsonFileName.substring(2));
+        var listJsonFileName = path.resolve(patternlab.config.paths.source.patterns, currentPattern.subdir,currentPattern.fileName + ".listitems.json");
+        currentPattern.listitems = fs.readJSONSync(listJsonFileName);
         buildListItems(currentPattern);
         if(patternlab.config.debug){
           console.log('found pattern-specific listitems.json for ' + currentPattern.key);
@@ -228,14 +228,32 @@
     }
 
     function getpatternbykey(key, patternlab){
+
+      //look for exact key matches
+      for(var i = 0; i < patternlab.patterns.length; i++){
+        if(patternlab.patterns[i].key === key){
+          return patternlab.patterns[i];
+        }
+      }
+
+      //else look by verbose syntax
       for(var i = 0; i < patternlab.patterns.length; i++){
         switch(key){
-          case patternlab.patterns[i].key:
           case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName:
           case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName + '.mustache':
             return patternlab.patterns[i];
         }
       }
+
+      //return the fuzzy match if all else fails
+      for(var i = 0; i < patternlab.patterns.length; i++){
+        var keyParts = key.split('-'),
+            keyType = keyParts[0],
+            keyName = keyParts.slice(1).join('-');
+        if(patternlab.patterns[i].key.split('-')[0] === keyType && patternlab.patterns[i].key.indexOf(keyName) > -1){
+          return patternlab.patterns[i];
+        }
+      }
       throw 'Could not find pattern with key ' + key;
     }
 

builder/pattern_exporter.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.0.0 - 2015 
+ * patternlab-node - v1.0.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.