Migrate some things to a nicer object literal syntax; use the oPattern

factory in the pseudopattern hunter; misc. code cleanup; hide some debug
console.logs behind the flag

Author: geoffp

builder/lineage_hunter.js

@@ -17,9 +17,12 @@
 
 			var pa = require('./pattern_assembler');
 			var pattern_assembler = new pa();
+			var config = require('../config.json');
 
 			//find the {{> template-name }} within patterns
-      console.log('===\n', pattern, '\n===');
+			if (config.debug) {
+				console.log('===\n', pattern, '\n===');
+			}
 			var matches = pattern.findPartials();
 			if(matches !== null){
 				matches.forEach(function(match, index, matches){

builder/object_factory.js

@@ -19,7 +19,7 @@
 
   // oPattern properties
 
-  var oPattern = function(abspath, subdir, filename, data){
+  var oPattern = function(abspath, subdir, filename, data) {
     if (config.debug) {
       console.log('=== NEW OPATTERN.', '\nabsPath:', abspath, '\nsubdir:', subdir, '\nfilename:', filename, '\ndata:\n', data);
     }
@@ -50,27 +50,34 @@
 
   // oPattern methods
 
-  // render method on oPatterns; this acts as a proxy for the PatternEngine's
-  // render function
-  oPattern.prototype.render = function (data, partials) {
-    if (config.debug && this.isPseudoPattern) {
-      console.log('===', this.name + ' IS A PSEUDO-PATTERN ===');
+  oPattern.prototype = {
+
+    // render method on oPatterns; this acts as a proxy for the PatternEngine's
+    // render function
+    render: function (data, partials) {
+      if (config.debug && this.isPseudoPattern) {
+        console.log('===', this.name + ' IS A PSEUDO-PATTERN ===');
+      }
+      return this.engine.renderPattern(this.extendedTemplate, data, partials);
+    },
+
+    // the finders all delegate to the PatternEngine, which also encapsulates all
+    // appropriate regexes
+    findPartials: function () {
+      return this.engine.findPartials(this);
+    },
+
+    findPartialsWithStyleModifiers: function () {
+      return this.engine.findPartialsWithStyleModifiers(this);
+    },
+
+    findPartialsWithPatternParameters: function () {
+      return this.engine.findPartialsWithPatternParameters(this);
+    },
+
+    findListItems: function () {
+      return this.engine.findListItems(this);
     }
-    return this.engine.renderPattern(this.extendedTemplate, data, partials);
-  };
-  // the finders all delegate to the PatternEngine, which also encapsulates all
-  // appropriate regexes
-  oPattern.prototype.findPartials = function () {
-    return this.engine.findPartials(this);
-  };
-  oPattern.prototype.findPartialsWithStyleModifiers = function () {
-    return this.engine.findPartialsWithStyleModifiers(this);
-  };
-  oPattern.prototype.findPartialsWithPatternParameters = function () {
-    return this.engine.findPartialsWithPatternParameters(this);
-  };
-  oPattern.prototype.findListItems = function () {
-    return this.engine.findListItems(this);
   };
 
   // oPattern static methods

builder/patternlab.js

@@ -13,9 +13,7 @@ var patternlab_engine = function () {
 
   var path = require('path'),
   fs = require('fs-extra'),
-  extend = require('util')._extend,
   diveSync = require('diveSync'),
-  glob = require('glob'),
   of = require('./object_factory'),
   pa = require('./pattern_assembler'),
   mh = require('./media_hunter'),

builder/pseudopattern_hunter.js

@@ -47,22 +47,22 @@
 					//extend any existing data with variant data
 					variantFileData = pattern_assembler.merge_data(currentPattern.jsonFileData, variantFileData);
 
-					// GTP: mustache-specific stuff here
 					var variantName = pseudoPatterns[i].substring(pseudoPatterns[i].indexOf('~') + 1).split('.')[0];
 					var variantFilePath = 'source/_patterns/' + currentPattern.subdir + '/' + currentPattern.fileName + '~' + variantName + '.json';
 					var variantFileName = currentPattern.fileName + '-' + variantName + '.';
-					var patternVariant = new of.oPattern(variantFilePath, currentPattern.subdir, variantFileName, variantFileData);
+					var patternVariant = of.oPattern.create(variantFilePath, currentPattern.subdir, variantFileName, variantFileData, {
+						//use the same template as the non-variant
+						template: currentPattern.template,
+						extendedTemplate: currentPattern.extendedTemplate,
+						isPseudoPattern: true,
+						basePattern: currentPattern,
+						// use the same template engine as the non-variant
+						engine: currentPattern.engine
+					});
 
 					//see if this file has a state
 					pattern_assembler.setPatternState(patternVariant, patternlab);
 
-					//use the same template as the non-variant
-					patternVariant.template = currentPattern.template;
-					patternVariant.extendedTemplate = currentPattern.extendedTemplate;
-					patternVariant.isPseudoPattern = true;
-					patternVariant.basePattern = currentPattern;
-					patternVariant.engine = patternVariant.basePattern.engine;
-
 					//find pattern lineage
 					lineage_hunter.find_lineage(patternVariant, patternlab);
 

test/pattern_engines_tests.js

@@ -27,7 +27,6 @@
     'getEngineNameForPattern returns "mustache" for an artificial empty template': function (test) {
       test.expect(1);
       var emptyPattern = of.oPattern.createEmpty();
-      console.log(emptyPattern);
       test.equals(patternEngines.getEngineNameForPattern(emptyPattern), 'mustache');
       test.done();
     },