Merge branch 'dev' into feature/enable-as-dependency

Author: EvanLovely

CHANGELOG

@@ -7,6 +7,10 @@ PL-node-v1.1.0
 - 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.

README.md

@@ -44,7 +44,7 @@ To run patternlab-node using gulp, you need to swap out the default grunt config
 3. Run `npm install` from the command line
 4. Run `gulp` or `gulp serve` from the command line
 
-This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `grunt serve` to see have BrowserSync spin up and serve the files to you.
+This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `gulp serve` to have BrowserSync spin up and serve the files to you.
 
 ### There and Back Again, or Switching Between Grunt and Gulp
 

builder/pattern_assembler.js

@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v1.0.1 - 2015 
- * 
+/*
+ * patternlab-node - v1.0.1 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
- * Licensed under the MIT license. 
- * 
- * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. 
+ * Licensed under the MIT license.
+ *
+ * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
  *
  */
 
@@ -248,18 +248,25 @@
     }
 
     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];
         }
-        //look for exact key matches
-        if(key === patternlab.patterns[i].key){
-          return patternlab.patterns[i];
-        }
-        //return the fuzzy match within the type if it exists
+      }
+
+      //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('-');
@@ -270,7 +277,6 @@
       throw 'Could not find pattern with key ' + key;
     }
 
-
     function mergeData(obj1, obj2){
       if(typeof obj2 === 'undefined'){
         obj2 = {};

builder/patternlab.js

@@ -90,7 +90,7 @@ var patternlab_engine = function (config) {
           console.log(err);
           return;
         }
-        pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+        pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
     });
 
     //now that all the main patterns are known, look for any links that might be within data and expand them
@@ -115,8 +115,9 @@ var patternlab_engine = function (config) {
           console.log(err);
           return;
         }
-        pattern_assembler.process_pattern_recursive(file.substring(2), patternlab);
-    });
+        pattern_assembler.process_pattern_recursive(path.resolve(file), patternlab);
+      });
+
 
     //delete the contents of config.patterns.public before writing
     if(deletePatternDir){

gulpfile.js

@@ -101,7 +101,7 @@ gulp.task('connect', ['lab'], function(){
       baseDir: paths().public.root
     }
   });
-  gulp.watch(path.resolve(paths().public.css, 'style.css'), ['cp:css']);
+  gulp.watch(path.resolve(paths().source.css, '**/*.css'), ['cp:css']);
 
   //suggested watches if you use scss
   // gulp.watch('./source/css/**/*.scss', ['sass:style']);
@@ -152,7 +152,7 @@ gulp.task('lab-pipe', ['lab'], function(cb){
 
 gulp.task('default', ['lab']);
 
-gulp.task('assets', ['cp:js', 'cp:img', 'cp:font', 'cp:data', /*'sass:style', 'sass:styleguide'*/]);
+gulp.task('assets', ['cp:js', 'cp:img', 'cp:font', 'cp:data', 'cp:css' /*'sass:style', 'sass:styleguide'*/]);
 gulp.task('prelab', ['clean', 'assets']);
 gulp.task('lab', ['prelab', 'patternlab'], function(cb){cb();});
 gulp.task('patterns', ['patternlab:only_patterns']);

test/pattern_assembler_tests.js

@@ -239,7 +239,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
 				}
 			);
 
@@ -263,7 +263,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_recursive(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_recursive(path.resolve(file), patternlab);
 				}
 			);
 
@@ -532,11 +532,12 @@
 			var patternlab = {};
 			//THIS IS BAD.
 			patternlab.config = fs.readJSONSync('./config.json');
-			patternlab.config.patterns = {source: patterns_dir};
-			patternlab.data = fs.readJSONSync('./source/_data/data.json');
-			patternlab.listitems = fs.readJSONSync('./source/_data/listitems.json');
-			patternlab.header = fs.readFileSync('./source/_patternlab-files/pattern-header-footer/header.html', 'utf8');
-			patternlab.footer = fs.readFileSync('./source/_patternlab-files/pattern-header-footer/footer.html', 'utf8');
+			patternlab.config.paths.source.patterns = patterns_dir;
+
+			patternlab.data = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'data.json'));
+			patternlab.listitems = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'listitems.json'));
+			patternlab.header = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'pattern-header-footer/header.html'), 'utf8');
+			patternlab.footer = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'pattern-header-footer/footer.html'), 'utf8');
 			patternlab.patterns = [];
 			patternlab.data.link = {};
 			patternlab.partials = {};
@@ -560,7 +561,7 @@
 						return;
 					}
 
-					pattern_assembler.process_pattern_iterative(file.substring(2), patternlab);
+					pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
 				}
 			);
 
@@ -697,6 +698,28 @@
 			//assert
 			test.equals(result, patternlab.patterns[0]);
 			test.done();
+		},
+		'get_pattern_by_key - returns the exact key if found' : function(test){
+			//arrange
+			var pattern_assembler = new pa();
+			var patternlab = {};
+			patternlab.patterns = [];
+
+			patternlab.patterns.push({
+				key: 'molecules-primary-nav-jagged',
+				subdir: 'molecules',
+				fileName: 'primary-nav-jagged'
+			}, {
+				key: 'molecules-primary-nav',
+				subdir: 'molecules',
+				fileName: 'molecules-primary-nav'
+			});
+
+			//act
+			var result = pattern_assembler.get_pattern_by_key('molecules-primary-nav', patternlab);
+			//assert
+			test.equals(result, patternlab.patterns[1]);
+			test.done();
 		}
 	};
 }());