parsing with outputfileSuffix accounted for

fixed all unit tests fix pattern-lab#428
wysiwyg-software-design · Aug 16, 2016 · 6c0e72f · 6c0e72f
1 parent cfee9ff
commit 6c0e72f
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 6 deletions.
diff --git a/core/lib/pattern_assembler.js b/core/lib/pattern_assembler.js
@@ -45,7 +45,9 @@ var pattern_assembler = function () {
         return patternlab.patterns[i];
       }
     }
-    console.error('Could not find pattern with partial ' + partialName);
+    if (patternlab.config.debug) {
+      console.error('Could not find pattern with partial ' + partialName);
+    }
     return undefined;
   }
 
@@ -92,7 +94,7 @@ var pattern_assembler = function () {
   function addPattern(pattern, patternlab) {
 
     //add the link to the global object
-    patternlab.data.link[pattern.patternPartial] = '/patterns/' + pattern.patternLink;
+    patternlab.data.link[pattern.patternPartial] = '/patterns/' + pattern.patternLink.replace('.html', patternlab.config.outputFileSuffixes.rendered + '.html');
 
     //only push to array if the array doesn't contain this pattern
     var isNew = true;
@@ -412,27 +414,42 @@ var pattern_assembler = function () {
   function parseDataLinksHelper(patternlab, obj, key) {
     var linkRE, dataObjAsString, linkMatches;
 
+    //check for link.patternPartial
     linkRE = /link\.[A-z0-9-_]+/g;
+
+    //stringify the passed in object
     dataObjAsString = JSON5.stringify(obj);
+    if (!dataObjAsString) { return obj; }
+
+    //find matches
     linkMatches = dataObjAsString.match(linkRE);
 
     if (linkMatches) {
       for (var i = 0; i < linkMatches.length; i++) {
         var dataLink = linkMatches[i];
         if (dataLink && dataLink.split('.').length >= 2) {
+
+          //get the partial the link refers to
           var linkPatternPartial = dataLink.split('.')[1];
           var pattern = getPartial(linkPatternPartial, patternlab);
           if (pattern !== undefined) {
+
+            //get the full built link and replace it
             var fullLink = patternlab.data.link[linkPatternPartial];
             if (fullLink) {
               fullLink = path.normalize(fullLink).replace(/\\/g, '/');
               if (patternlab.config.debug) {
                 console.log('expanded data link from ' + dataLink + ' to ' + fullLink + ' inside ' + key);
               }
+
+              //also make sure our global replace didn't mess up a protocol
+              fullLink = fullLink.replace(/:\//g, '://');
               dataObjAsString = dataObjAsString.replace(dataLink, fullLink);
             }
           } else {
-            console.log('pattern not found for', dataLink, 'inside', key);
+            if (patternlab.config.debug) {
+              console.log('pattern not found for', dataLink, 'inside', key);
+            }
           }
         }
       }

diff --git a/test/lineage_hunter_tests.js b/test/lineage_hunter_tests.js
@@ -28,6 +28,9 @@ function createBasePatternLabObject() {
       source: {
         patterns: patterns_dir
       }
+    },
+    outputFileSuffixes: {
+      rendered: ''
     }
   };
   pl.data = {};
@@ -111,7 +114,12 @@ exports['lineage hunter '] = {
           "lineageR": [],
           "lineageRIndex": []
         }
-      ]
+      ],
+      config: {
+        outputFileSuffixes: {
+          rendered: ''
+        }
+      }
     };
 
     var lineage_hunter = new lh();

diff --git a/test/list_item_hunter_tests.js b/test/list_item_hunter_tests.js
@@ -65,7 +65,10 @@
           "source": {
             "patterns": "./test/files/_patterns"
           }
-        }
+        },
+        "outputFileSuffixes": {
+          "rendered": ''
+        }        
       },
       "partials" : {},
       "patterns" : []

diff --git a/test/pattern_assembler_tests.js b/test/pattern_assembler_tests.js
@@ -20,6 +20,7 @@
 			var patternlab = {};
 			patternlab.config = fs.readJSONSync('./patternlab-config.json');
 			patternlab.config.paths.source.patterns = patterns_dir;
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			//patternlab.data = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'data.json'));
       patternlab.data = {};
@@ -73,6 +74,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -113,6 +117,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -154,6 +161,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -193,6 +203,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -233,6 +246,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -274,6 +290,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -356,6 +375,7 @@
 			//THIS IS BAD
 			patternlab.config = fs.readJSONSync('./patternlab-config.json');
 			patternlab.config.paths.source.patterns = patterns_dir;
+			patternlab.config.outputFileSuffixes = { rendered : '' };
       patternlab.data = {};
       patternlab.listitems = {};
       patternlab.header = {};
@@ -364,7 +384,17 @@
       //patternlab.listitems = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'listitems.json'));
 		  //patternlab.header = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'templates/pattern-header-footer/header.html'), 'utf8');
 		  //patternlab.footer = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'templates/pattern-header-footer/footer.html'), 'utf8');
-			patternlab.patterns = [];
+			patternlab.patterns = [
+				{
+					patternPartial: 'twitter-brad'
+				},
+				{
+					patternPartial: 'twitter-dave'
+				},
+				{
+					patternPartial: 'twitter-brian'
+				}
+			];
 			patternlab.data.link = {};
 			patternlab.partials = {};
 
@@ -454,6 +484,7 @@
 			patternlab.partials = {};
 			patternlab.data = {link: {}};
       patternlab.config = { debug: false };
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			var pattern = new Pattern('00-test/01-bar.mustache');
 			pattern.extendedTemplate = 'barExtended';
@@ -476,6 +507,7 @@
 			patternlab.partials = {};
 			patternlab.data = {link: {}};
       patternlab.config = { debug: false };
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			var pattern = new Pattern('00-test/01-bar.mustache');
 			pattern.extendedTemplate = undefined;

diff --git a/test/pseudopattern_hunter_tests.js b/test/pseudopattern_hunter_tests.js
@@ -26,6 +26,7 @@ exports['pseudopattern_hunter'] = {
     pl.patterns = [];
     pl.partials = {};
     pl.config.patternStates = {};
+    pl.config.outputFileSuffixes = { rendered: ''}
 
     var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
     atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');