We now pass all tests and build "successfully," but pseudo-patterns

don't render at all, and are missing in the menu. The quest continues...

Author: geoffp

.eslintrc

@@ -41,7 +41,7 @@
     "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-parens": 0,
-    "no-irregular-whitespace": 2,
+    "no-irregular-whitespace": 1,
     "no-iterator": 2,
     "no-loop-func": 2,
     "no-multi-str": 2,

builder/object_factory.js

@@ -1,6 +1,6 @@
-/* 
- * patternlab-node - v0.14.0 - 2015 
- * 
+/*
+ * patternlab-node - v0.14.0 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
@@ -14,7 +14,11 @@
   var patternEngines = require('./pattern_engines/pattern_engines');
   var path = require('path');
 
+  // oPattern properties
+
   var oPattern = function(abspath, subdir, filename, data){
+    console.log('new oPattern');
+    console.log('absPath:', abspath, 'subdir:', subdir, 'filename:', filename, 'data:', data);
     this.fileName = filename.substring(0, filename.indexOf('.'));
     this.fileExtension = path.extname(abspath);
     this.abspath = abspath;
@@ -37,10 +41,22 @@
     this.lineageR = [];
     this.lineageRIndex = [];
     this.engine = patternEngines.getEngineForPattern(this);
+    this.isPseudoPattern = false;
   };
+
+  // oPattern methods
+
   // render method on oPatterns; this acts as a proxy for the PatternEngine's
   // render function
   oPattern.prototype.render = function (data, partials) {
+    if (this.isPseudoPattern) {
+      console.log(this.name + ' is a pseudo-pattern');
+    } else {
+      console.log('this is NOT a pseudo-pattern');
+    }
+    // console.log('this does ' + (this.template ? '' : 'NOT ') + 'have template');
+    // console.log('this does ' + (this.extendedTemplate ? '' : 'NOT ') + 'have extendedTemplate');
+
     return this.engine.renderPattern(this.template, data, partials);
   };
 
@@ -55,6 +71,7 @@
     this.patternItemsIndex = [];
   };
 
+
   var oNavItem = function(name){
     this.sectionNameLC = name;
     this.sectionNameUC = name.split('-').reduce(function(val, working){
@@ -64,6 +81,7 @@
     this.navSubItemsIndex = [];
   };
 
+
   var oNavSubItem = function(name){
     this.patternPath = '';
     this.patternPartial = '';
@@ -72,6 +90,7 @@
     }, '').trim();
   };
 
+
   module.exports = {
     oPattern: oPattern,
     oBucket: oBucket,

builder/pattern_assembler.js

@@ -87,16 +87,20 @@
       } else {
         // otherwise, assume it's a plain mustache template string and act
         // accordingly
-        console.log('rendering plain mustache string');
+        console.log('rendering plain mustache string:', pattern.substring(0, 20) + '...');
         return patternEngines.mustache.renderPattern(pattern, data, partials);
       }
     }
 
-    // ignore _underscored patterns, dotfiles, and anything not recognized by
-    // a loaded pattern engine
+    // ignore _underscored patterns, dotfiles, and anything not recognized by a
+    // loaded pattern engine. Pseudo-pattern .json files ARE considered to be
+    // pattern files!
     function isPatternFile(filename) {
       // skip hidden patterns/files without a second thought
-      if (filename.charAt(0) === '_' || filename.charAt(0) === '.') {
+      var extension = path.extname(filename);
+      if(filename.charAt(0) === '.' ||
+         filename.charAt(0) === '_' ||
+         (extension === '.json' && filename.indexOf('~') === -1)) {
         return false;
       }
 
@@ -105,17 +109,27 @@
       var supportedPatternFileExtensions = engineNames.map(function (engineName) {
         return patternEngines[engineName].fileExtension;
       });
-      var extension = path.extname(filename);
       return (supportedPatternFileExtensions.lastIndexOf(extension) !== -1);
     }
 
     function processPatternIterative(file, patternlab){
+      var fs = require('fs-extra'),
+      of = require('./object_factory'),
+      path = require('path');
+
       //extract some information
       var subdir = path.dirname(path.relative(patternlab.config.patterns.source, file)).replace('\\', '/');
       var filename = path.basename(file);
       var ext = path.extname(filename);
 
+      console.log('processPatternIterative:', 'filename:', filename);
+
       // skip non-pattern files
+      //ignore dotfiles and non-variant .json files
+      if(filename.charAt(0) === '.' || (ext === '.json' && filename.indexOf('~') === -1)){
+        return;
+      }
+
       if (!isPatternFile(filename, patternlab)) { return; }
       console.log('found pattern', file);
 

builder/pattern_engines/pattern_engines.js

@@ -43,8 +43,12 @@
       return 'mustache';
     },
     getEngineForPattern: function (pattern) {
-      var engineName = this.getEngineNameForPattern(pattern);
-      return this[engineName];
+      if (pattern.isPseudoPattern) {
+        return this.getEngineForPattern(pattern.basePattern);
+      } else {
+        var engineName = this.getEngineNameForPattern(pattern);
+        return this[engineName];
+      }
     }
   });
 

builder/patternlab.js

@@ -1,6 +1,6 @@
-/* 
- * patternlab-node - v0.14.0 - 2015 
- * 
+/*
+ * patternlab-node - v0.14.0 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *

builder/pseudopattern_hunter.js

@@ -1,6 +1,6 @@
-/* 
- * patternlab-node - v0.14.0 - 2015 
- * 
+/*
+ * patternlab-node - v0.14.0 - 2015
+ *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
@@ -20,17 +20,19 @@
 			pa = require('./pattern_assembler'),
 			lh = require('./lineage_hunter'),
 			of = require('./object_factory'),
+			patternEngines = require('./pattern_engines/pattern_engines'),
 			mustache = require('mustache');
 
 			var pattern_assembler = new pa();
 			var lineage_hunter = new lh();
 
-			//look for a pseudo pattern by checking if there is a file containing same name, with ~ in it, ending in .json
+			//look for a pseudo pattern by checking if there is a file containing same
+			//name, with ~ in it, ending in .json
 			var needle = currentPattern.subdir + '/' + currentPattern.fileName + '~*.json';
 			var pseudoPatterns = glob.sync(needle, {
 				cwd: 'source/_patterns/', //relative to gruntfile
 				debug: false,
-				nodir: true,
+				nodir: true
 			});
 
 			if(pseudoPatterns.length > 0){
@@ -47,7 +49,7 @@
 					//extend any existing data with variant data
 					variantFileData = pattern_assembler.merge_data(currentPattern.jsonFileData, variantFileData);
 
-                    // GTP: mustache-specific stuff here
+					// 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 + '.';
@@ -59,6 +61,9 @@
 					//use the same template as the non-variant
 					patternVariant.template = currentPattern.template;
 					patternVariant.extendedTemplate = currentPattern.extendedTemplate;
+					patternVariant.isPseudoPattern = true;
+					patternVariant.basePattern = currentPattern;
+					patternVariant.engine = patternEngines.getEngineForPattern(this);
 
 					//find pattern lineage
 					lineage_hunter.find_lineage(patternVariant, patternlab);

builder/util.js

@@ -0,0 +1,22 @@
+/*
+ * patternlab-node - v0.14.0 - 2015
+ *
+ * Brian Muenzenmeyer, Geoffrey Pursell and the web community.
+ * Licensed under the MIT license.
+ *
+ * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
+ *
+ */
+
+(function () {
+  var path = require('path');
+
+  var util = {
+    // takes a string of the filename or path, and will tell you if it refers to
+    isPseudoPattern: function () {
+
+    }
+  };
+
+  module.exports = util;
+}());

test/pattern_engines_tests.js

@@ -6,6 +6,10 @@
 
   // the mustache test pattern, stolen from object_factory unit tests
   var mustacheTestPattern = new of.oPattern('source/_patterns/00-atoms/00-global/00-colors-alt.mustache', '00-atoms/00-global', '00-colors-alt.mustache', {d: 123});
+  var mustacheTestPseudoPatternBasePattern = new of.oPattern('source/_patterns/04-pages/00-homepage.mustache', '04-pages', '00-homepage.mustache', {d: 123});
+  var mustacheTestPseudoPattern = new of.oPattern('source/_patterns/04-pages/00-homepage~emergency.json', '04-pages', '00-homepage-emergency.', {d: 123});
+  mustacheTestPseudoPattern.isPseudoPattern = true;
+  mustacheTestPseudoPattern.basePattern = mustacheTestPseudoPatternBasePattern;
   var engineNames = Object.keys(patternEngines);
 
 
@@ -19,6 +23,11 @@
       var engine = patternEngines.getEngineForPattern(mustacheTestPattern);
       test.equals(engine, patternEngines.mustache);
       test.done();
+    },
+    'getEngineForPattern returns a reference to the mustache engine from test pseudo-pattern': function (test) {
+      var engine = patternEngines.getEngineForPattern(mustacheTestPseudoPattern);
+      test.equals(engine, patternEngines.mustache);
+      test.done();
     }
   };