pseudo pattern support added to changelog. a little more dry

closes #33
pattern-lab · Feb 11, 2015 · bbeb32c · bbeb32c
1 parent dc03af5
commit bbeb32c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,8 @@ PL-node-v0.8.0
  - ADD: pattern link support
  - CHG: updated included mustache templates to reflect pattern links in navigation and compiling pages direct from templates
  - THX: @getsetbro for finding and fixing a typo
+ - FIX: fixed a bug preventing pattern states from displaying on the flat template/pages
+ - ADD: support for basic pseudo-patterns
 
 PL-node-v0.1.7
  - ADD: pattern export

diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -6,13 +6,25 @@
 
   var pattern_assembler = function(){
 
-    function exportPatterns(patternlab){
+    function setState(pattern, patternlab){
+      if(patternlab.config.patternStates[pattern.patternName]){
+        pattern.patternState = patternlab.config.patternStates[pattern.patternName];
+      } else{
+        pattern.patternState = "";
+      }
+    }
 
+    function addPattern(pattern, patternLab){
+      patternLab.data.link[pattern.patternGroup + '-' + pattern.patternName] = '/patterns/' + pattern.patternLink;
+      patternLab.patterns.push(pattern);
     }
 
     return {
-      export_patterns: function(patternlab){
-        exportPatterns(patternlab);
+      setPatternState: function(pattern, patternlab){
+        setState(pattern, patternlab);
+      },
+      addPattern: function(pattern, patternLab){
+        addPattern(pattern, patternLab);
       }
     };
 

diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -83,17 +83,14 @@ var patternlab_engine = function(){
 				return;
 			}
 
-			//check for pattern parameters before we do much else. need to remove them into a data object so the rest of the filename parsing works
+			//TODO: https://github.com/pattern-lab/patternlab-node/issues/88 check for pattern parameters before we do much else. need to remove them into a data object so the rest of the filename parsing works
+			//TODO: https://github.com/pattern-lab/patternlab-node/issues/95 check for patternstylemodifiers before we do much else. need to remove these from the template for proper rendering
 
 			//make a new Pattern Object
 			currentPattern = new of.oPattern(subdir, filename, {});
 
 			//see if this file has a state
-			if(patternlab.config.patternStates[currentPattern.patternName]){
-				currentPattern.patternState = patternlab.config.patternStates[currentPattern.patternName];
-			} else{
-				currentPattern.patternState = "";
-			}
+			assembler.setPatternState(currentPattern, patternlab);
 
 			//look for a json file for this template
 			try {
@@ -144,11 +141,7 @@ var patternlab_engine = function(){
 					var patternVariant = new of.oPattern(subdir, currentPattern.fileName + '-' + variantName + '.mustache', variantFileData);
 
 					//see if this file has a state
-					if(patternlab.config.patternStates[patternVariant.patternName]){
-						patternVariant.patternState = patternlab.config.patternStates[patternVariant.patternName];
-					} else{
-						patternVariant.patternState = "";
-					}
+					assembler.setPatternState(patternVariant, patternlab);
 
 					//use the same template as the non-variant
 					patternVariant.template = currentPattern.template;
@@ -157,14 +150,12 @@ var patternlab_engine = function(){
 					lineage_hunter.find_lineage(patternVariant, patternlab);
 
 					//add to patternlab object so we can look these up later.
-					patternlab.data.link[patternVariant.patternGroup + '-' + patternVariant.patternName] = '/patterns/' + patternVariant.patternLink;
-					patternlab.patterns.push(patternVariant);
+					assembler.addPattern(patternVariant, patternlab);
 				}
 			}
 
 			//add to patternlab object so we can look these up later.
-			patternlab.data.link[currentPattern.patternGroup + '-' + currentPattern.patternName] = '/patterns/' + currentPattern.patternLink;
-			patternlab.patterns.push(currentPattern);
+			assembler.addPattern(currentPattern, patternlab);
 		});
 
 		var entity_encoder = new he();