Merge pull request #230 from geoffp/configurable-paths-galore

Root out a few more hard-coded paths
pattern-lab · Jan 14, 2016 · 14797d9 · 14797d9
2 parents e15062b + 31d5ff6
commit 14797d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -90,7 +90,7 @@ var patternlab_engine = function () {
           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 () {
           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){

diff --git a/test/pattern_assembler_tests.js b/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);
 				}
 			);