Prefer exact key match over verbose and partial matching

Closes #226

Author: bmuenzenmeyer

CHANGELOG

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

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 = {};

test/pattern_assembler_tests.js

@@ -697,6 +697,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();
 		}
 	};
 }());