committing bare minimum functionality

Author: bmuenzenmeyer

core/lib/object_factory.js

@@ -46,6 +46,7 @@ var Pattern = function (relPath, data) {
   // name of the pattern. UPDATE: this.key is now known as this.patternPartial
   this.patternPartial = this.patternGroup + '-' + this.patternBaseName;
 
+  this.isPattern = true;
   this.patternState = '';
   this.template = '';
   this.patternPartialCode = '';
@@ -64,11 +65,13 @@ Pattern.prototype = {
   // render method on oPatterns; this acts as a proxy for the PatternEngine's
   // render function
   render: function (data, partials) {
-    return this.engine.renderPattern(this, data || this.jsonFileData, partials);
+    if (this.engine){
+      return this.engine.renderPattern(this, data || this.jsonFileData, partials);
+    }
   },
 
   registerPartial: function () {
-    if (typeof this.engine.registerPartial === 'function') {
+    if (this.engine && typeof this.engine.registerPartial === 'function') {
       this.engine.registerPartial(this);
     }
   },

core/lib/pattern_assembler.js

@@ -1,15 +1,21 @@
 "use strict";
 
-var pattern_assembler = function () {
-  var path = require('path'),
-    fs = require('fs-extra'),
-    Pattern = require('./object_factory').Pattern,
-    pph = require('./pseudopattern_hunter'),
-    mp = require('./markdown_parser'),
-    plutils = require('./utilities'),
-    patternEngines = require('./pattern_engines');
-
+var path = require('path'),
+  fs = require('fs-extra'),
+  Pattern = require('./object_factory').Pattern,
+  pph = require('./pseudopattern_hunter'),
+  mp = require('./markdown_parser'),
+  plutils = require('./utilities'),
+  patternEngines = require('./pattern_engines'),
+  lh = require('./lineage_hunter'),
+  lih = require('./list_item_hunter'),
+  smh = require('./style_modifier_hunter'),
+  ph = require('./parameter_hunter'),
+  JSON5 = require('json5');
+
+var markdown_parser = new mp();
 
+var pattern_assembler = function () {
   // HELPER FUNCTIONS
 
   function getPartial(partialName, patternlab) {
@@ -108,11 +114,18 @@ var pattern_assembler = function () {
       }
 
       // do global registration
+
+
+      if(pattern.isPattern){
+        patternlab.partials[pattern.patternPartial] = pattern.extendedTemplate || pattern.template;
+        // do plugin-specific registration
+        pattern.registerPartial();
+      } else{
+        patternlab.partials['viewall-' + pattern.patternPartial] = pattern.patternDesc;
+      }
+
       patternlab.patterns.push(pattern);
-      patternlab.partials[pattern.patternPartial] = pattern.extendedTemplate || pattern.template;
 
-      // do plugin-specific registration
-      pattern.registerPartial();
     }
   }
 
@@ -127,14 +140,13 @@ var pattern_assembler = function () {
       // therefore just need to create a dummpy pattern to be able to render
       // it
       var dummyPattern = Pattern.createEmpty({extendedTemplate: pattern});
+      plutils.logGreen(data);
       return patternEngines.mustache.renderPattern(dummyPattern, data, partials);
     }
   }
 
   function parsePatternMarkdown(currentPattern, patternlab) {
 
-    var markdown_parser = new mp();
-
     try {
       var markdownFileName = path.resolve(patternlab.config.paths.source.patterns, currentPattern.subdir, currentPattern.fileName + ".md");
       var markdownFileContents = fs.readFileSync(markdownFileName, 'utf8');
@@ -185,11 +197,40 @@ var pattern_assembler = function () {
 
   function processPatternIterative(relPath, patternlab) {
 
+    //check if the found file is a top-level markdown file
+    var fileObject = path.parse(relPath);
+    if(fileObject.ext === '.md'){
+      try{
+        var proposedDirectory = path.resolve(patternlab.config.paths.source.patterns, fileObject.dir, fileObject.name);
+        var proposedDirectoryStats = fs.statSync(proposedDirectory);
+        if (proposedDirectoryStats.isDirectory()) {
+          var subTypeMarkdownFileContents = fs.readFileSync(proposedDirectory + '.md', 'utf8');
+          var subTypeMarkdown = markdown_parser.parse(subTypeMarkdownFileContents);
+          var subTypePattern = new Pattern(relPath);
+          subTypePattern.patternSectionSubtype = true;
+          subTypePattern.patternLink = subTypePattern.name + '/index.html';
+          subTypePattern.patternPartial = 'viewall-' + subTypePattern.patternPartial;
+          subTypePattern.patternDesc = subTypeMarkdown.markdown;
+          subTypePattern.isPattern = false;
+          subTypePattern.engine = null;
+
+          addPattern(subTypePattern, patternlab);
+          return subTypePattern;
+        }
+      } catch (err) {
+        // no file exists, meaning it's a pattern markdown file
+        if (err.code !== 'ENOENT') {
+          console.log(err);
+        }
+      }
+
+    }
+
     var pseudopattern_hunter = new pph();
 
     //extract some information
-    var filename = path.basename(relPath);
-    var ext = path.extname(filename);
+    var filename = fileObject.base;
+    var ext = fileObject.ext;
     var patternsPath = patternlab.config.paths.source.patterns;
 
     // skip non-pattern files
@@ -274,8 +315,6 @@ var pattern_assembler = function () {
   }
 
   function processPatternRecursive(file, patternlab) {
-    var lh = require('./lineage_hunter'),
-      lih = require('./list_item_hunter');
 
     var lineage_hunter = new lh(),
       list_item_hunter = new lih();
@@ -292,6 +331,9 @@ var pattern_assembler = function () {
     //return if processing an ignored file
     if (typeof currentPattern === 'undefined') { return; }
 
+    //we are processing a markdown only pattern
+    if (currentPattern.engine === null) { return; }
+
     currentPattern.extendedTemplate = currentPattern.template;
 
     //find how many partials there may be for the given pattern
@@ -321,8 +363,6 @@ var pattern_assembler = function () {
   }
 
   function expandPartials(foundPatternPartials, list_item_hunter, patternlab, currentPattern) {
-    var smh = require('./style_modifier_hunter'),
-      ph = require('./parameter_hunter');
 
     var style_modifier_hunter = new smh(),
       parameter_hunter = new ph();
@@ -365,7 +405,6 @@ var pattern_assembler = function () {
   }
 
   function parseDataLinksHelper(patternlab, obj, key) {
-    var JSON5 = require('json5');
     var linkRE, dataObjAsString, linkMatches, expandedLink;
 
     linkRE = /link\.[A-z0-9-_]+/g;

core/lib/patternlab.js

@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v2.1.1 - 2016 
- * 
+/*
+ * patternlab-node - v2.1.1 - 2016
+ *
  * Brian Muenzenmeyer, Geoff Pursell, 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.
  *
  */
 
@@ -148,7 +148,7 @@ var patternlab_engine = function (config) {
     // references. This happens specifically with the Handlebars engine. Remove
     // if you like 180MB log files.
     function propertyStringReplacer(key, value) {
-      if (key === 'engine' && value.engineName) {
+      if (key === 'engine' && value && value.engineName) {
         return '{' + value.engineName + ' engine object}';
       }
       return value;
@@ -276,6 +276,10 @@ var patternlab_engine = function (config) {
     //render all patterns last, so lineageR works
     patternlab.patterns.forEach(function (pattern) {
 
+      if(!pattern.isPattern) {
+        return false;
+      }
+
       pattern.header = head;
 
       //todo move this into lineage_hunter
@@ -294,15 +298,15 @@ var patternlab_engine = function (config) {
         console.log(err);
       }
       allData = plutils.mergeData(allData, pattern.jsonFileData);
+      allData.cacheBuster = patternlab.cacheBuster;
 
-      //var headHTML = pattern_assembler.renderPattern(patternlab.userHead, allData);
       var headHTML = pattern_assembler.renderPattern(pattern.header, allData);
 
       //render the extendedTemplate with all data
       pattern.patternPartialCode = pattern_assembler.renderPattern(pattern, allData);
 
       //todo see if this is still needed
-      pattern.patternPartialCodeE = entity_encoder.encode(pattern.patternPartialCode);
+      //pattern.patternPartialCodeE = entity_encoder.encode(pattern.patternPartialCode);
 
       // stringify this data for individual pattern rendering and use on the styleguide
       // see if patternData really needs these other duped values
@@ -333,7 +337,7 @@ var patternlab_engine = function (config) {
 
       //set the pattern-specific footer by compiling the general-footer with data, and then adding it to the meta footer
       var footerPartial = pattern_assembler.renderPattern(patternlab.footer, {
-        isPattern: true,
+        isPattern: pattern.isPattern,
         patternData: pattern.patternData,
         cacheBuster: patternlab.cacheBuster
       });

core/lib/ui_builder.js

@@ -2,6 +2,7 @@
 
 var path = require('path');
 var fs = require('fs-extra');
+var ae = require('./annotation_exporter');
 var of = require('./object_factory');
 var pa = require('./pattern_assembler');
 var pattern_assembler = new pa();
@@ -264,14 +265,23 @@ function buildFooterHTML(patternlab, patternPartial) {
 }
 
 function buildViewAllHTML(patternlab, patterns, patternPartial) {
+
+  patterns.push({
+    "patternName": "awesome",
+    "patternLink": "00-atoms-01-global/index.html",
+    "patternPartial": "viewall-atoms-global",
+    "patternDesc": "<p>This is the description of the category.</p>\n",
+    "patternSectionSubtype": true
+  })
+
   var viewAllHTML = pattern_assembler.renderPattern(patternlab.viewAll,
     {
       partials: patterns,
       patternPartial: patternPartial,
       cacheBuster: patternlab.cacheBuster
     }, {
       patternSection: patternlab.patternSection,
-      patternSectionSubType: patternlab.patternSectionSubType
+      patternSectionSubtype: patternlab.patternSectionSubType
     });
   return viewAllHTML;
 }
@@ -401,7 +411,6 @@ function sortPatterns(patternsArray) {
 // MAIN BUILDER FUNCTION
 
 function buildFrontEnd(patternlab) {
-  var ae = require('./annotation_exporter');
   var annotation_exporter = new ae(patternlab);
   var styleguidePatterns = [];
   var paths = patternlab.config.paths;
@@ -434,9 +443,10 @@ function buildFrontEnd(patternlab) {
     patternLabFoot : footerPartial
   });
 
+  console.log(styleguidePatterns);
+
   //build the styleguide
-  var styleguideTemplate = fs.readFileSync(path.resolve(paths.source.patternlabFiles, 'viewall.mustache'), 'utf8');
-  var styleguideHtml = pattern_assembler.renderPattern(styleguideTemplate,
+  var styleguideHtml = pattern_assembler.renderPattern(patternlab.viewAll,
     {
       partials: styleguidePatterns,
       cacheBuster: patternlab.cacheBuster