first batch of changes to migrate from direct dependence on mustache to

dependence on pattern engines

Author: geoffp

builder/pattern_assembler.js

@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v0.10.1 - 2015 
- * 
+/*
+ * patternlab-node - v0.10.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.
  *
  */
 
@@ -13,7 +13,13 @@
 
   var pattern_assembler = function(){
 
-    //find and return any {{> template-name }} within pattern
+    var fs = require('fs-extra'),
+        of = require('./object_factory'),
+        path = require('path'),
+        patternEngines = require('./pattern_engines/pattern_engines');
+
+    // find and return any {{> template-name }} within pattern
+    // TODO: delete, factored out
     function findPartials(pattern){
       var matches = pattern.template.match(/{{>([ ])?([A-Za-z0-9-]+)(?:\:[A-Za-z0-9-]+)?(?:(| )\(.*)?([ ])?}}/g);
       return matches;
@@ -33,30 +39,37 @@
     }
 
     function renderPattern(template, data, partials) {
+      debugger;
+      // TODO:
+      // choose an appropriate pattern engine
+      // call and return result of its renderPattern method
+      // OR MAYBE: this should just be a method of oPattern
+    }
 
-      var mustache = require('mustache');
-
-      if(partials) {
-        return mustache.render(template, data, partials);
-      } else{
-        return mustache.render(template, data);
-      }
+    function isPatternFile(filename, patternlab) {
+      var engineNames = Object.keys(patternEngines);
+      var supportedPatternFileExtensions = engineNames.map(function (engineName) {
+        return patternEngines[engineName].fileExtension;
+      });
+      var extension = path.extname(filename);
+      return (supportedPatternFileExtensions.lastIndexOf(extension) != -1);
     }
 
+    // given a pattern file, figure out what to do with it
     function processPatternFile(file, patternlab){
-      var fs = require('fs-extra'),
-      of = require('./object_factory'),
-      path = require('path');
-
       //extract some information
       var abspath = file.substring(2);
       var subdir = path.dirname(path.relative('./source/_patterns', file)).replace('\\', '/');
       var filename = path.basename(file);
 
-      //ignore _underscored patterns, json (for now), and dotfiles
-      if(filename.charAt(0) === '_' || path.extname(filename) === '.json' || filename.charAt(0) === '.'){
+      // ignore _underscored patterns, dotfiles, and anything not recognized by
+      // a loaded pattern engine
+      if (filename.charAt(0) === '_' ||
+          filename.charAt(0) === '.' ||
+          !isPatternFile(filename, patternlab)) {
         return;
       }
+      console.log('found pattern', file);
 
       //make a new Pattern Object
       var currentPattern = new of.oPattern(subdir, filename);
@@ -80,17 +93,13 @@
     }
 
     function processPattern(currentPattern, patternlab, additionalData){
-
-      var fs = require('fs-extra'),
-      mustache = require('mustache'),
-      lh = require('./lineage_hunter'),
-      ph = require('./parameter_hunter'),
-      pph = require('./pseudopattern_hunter'),
-      path = require('path');
+      var lh = require('./lineage_hunter'),
+          ph = require('./parameter_hunter'),
+          pph = require('./pseudopattern_hunter');
 
       var parameter_hunter = new ph(),
-      lineage_hunter = new lh(),
-      pseudopattern_hunter = new pph();
+          lineage_hunter = new lh(),
+          pseudopattern_hunter = new pph();
 
       currentPattern.extendedTemplate = currentPattern.template;
 

builder/patternlab.js

@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v0.10.1 - 2015 
- * 
+/*
+ * patternlab-node - v0.10.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.
  *
  */
 
@@ -15,7 +15,6 @@ var patternlab_engine = function () {
   fs = require('fs-extra'),
   extend = require('util')._extend,
   diveSync = require('diveSync'),
-  mustache = require('mustache'),
   glob = require('glob'),
   of = require('./object_factory'),
   pa = require('./pattern_assembler'),
@@ -27,6 +26,7 @@ var patternlab_engine = function () {
   patternlab.package = fs.readJSONSync('./package.json');
   patternlab.config = fs.readJSONSync('./config.json');
 
+
   function getVersion() {
     console.log(patternlab.package.version);
   }
@@ -67,17 +67,16 @@ var patternlab_engine = function () {
     entity_encoder = new he(),
     pattern_exporter = new pe();
 
-    diveSync('./source/_patterns', function(err, file){
+    diveSync('./source/_patterns', function(err, filePath){
       //log any errors
       if(err){
         console.log(err);
         return;
       }
-
-      pattern_assembler.process_pattern_file(file, patternlab);
-
+      pattern_assembler.process_pattern_file(filePath, patternlab);
     });
-    //render all patterns last, so lineageR works
+
+    //render all patterns last, so lineage works
     patternlab.patterns.forEach(function(pattern, index, patterns){
       //render the pattern, but first consolidate any data we may have
       var allData =  JSON.parse(JSON.stringify(patternlab.data));

builder/pseudopattern_hunter.js

@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v0.10.1 - 2015 
- * 
+/*
+ * patternlab-node - v0.10.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.
  *
  */
 
@@ -48,7 +48,7 @@
 					variantFileData = pattern_assembler.merge_data(variantFileData, currentPattern.jsonFileData);
 
 					var variantName = pseudoPatterns[i].substring(pseudoPatterns[i].indexOf('~') + 1).split('.')[0];
-					var patternVariant = new of.oPattern(currentPattern.subdir, currentPattern.fileName + '-' + variantName + '.mustache', variantFileData);
+				  var patternVariant = new of.oPattern(currentPattern.subdir, currentPattern.fileName + '-' + variantName + '.mustache', variantFileData);
 
 					//see if this file has a state
 					pattern_assembler.setPatternState(patternVariant, patternlab);