working link parsing within list items and improvements to pseudopattern processing. still needs some refactoring and unit test coverage

Author: bmuenzenmeyer

core/lib/list_item_hunter.js

@@ -47,7 +47,9 @@ var list_item_hunter = function () {
           console.log('There was an error parsing JSON for ' + pattern.relPath);
           console.log(err);
         }
+
         listData = plutils.mergeData(listData, pattern.listitems);
+        listData = pattern_assembler.parse_data_links_specific(patternlab, listData, 'listitems.json + any pattern listitems.json');
 
         //iterate over each copied block, rendering its contents along with pattenlab.listitems[i]
         for (var i = 0; i < repeatedBlockTemplate.length; i++) {

core/lib/object_factory.js

@@ -16,7 +16,7 @@ var Pattern = function (relPath, data) {
   this.fileExtension = pathObj.ext; // '.mustache'
 
   // this is the unique name, subDir + fileName (sans extension)
-  this.name = this.subdir.replace(/[\/\\]/g, '-') + '-' + this.fileName; // '00-atoms-00-global-00-colors'
+  this.name = this.subdir.replace(/[\/\\]/g, '-') + '-' + this.fileName.replace('~', '-'); // '00-atoms-00-global-00-colors'
 
   // the JSON used to render values in the pattern
   this.jsonFileData = data || {};

core/lib/pattern_assembler.js

@@ -4,6 +4,7 @@ var pattern_assembler = function () {
   var path = require('path'),
     fs = require('fs-extra'),
     Pattern = require('./object_factory').Pattern,
+    pph = require('./pseudopattern_hunter'),
     md = require('markdown-it')(),
     plutils = require('./utilities'),
     patternEngines = require('./pattern_engines');
@@ -123,6 +124,9 @@ var pattern_assembler = function () {
   }
 
   function processPatternIterative(relPath, patternlab) {
+
+    var pseudopattern_hunter = new pph();
+
     //extract some information
     var filename = path.basename(relPath);
     var ext = path.extname(filename);
@@ -198,17 +202,18 @@ var pattern_assembler = function () {
     //add currentPattern to patternlab.patterns array
     addPattern(currentPattern, patternlab);
 
+    //look for a pseudo pattern by checking if there is a file containing same name, with ~ in it, ending in .json
+    pseudopattern_hunter.find_pseudopatterns(currentPattern, patternlab);
+
     return currentPattern;
   }
 
   function processPatternRecursive(file, patternlab) {
     var lh = require('./lineage_hunter'),
-      pph = require('./pseudopattern_hunter'),
       lih = require('./list_item_hunter');
 
     var lineage_hunter = new lh(),
-      list_item_hunter = new lih(),
-      pseudopattern_hunter = new pph();
+      list_item_hunter = new lih();
 
     //find current pattern in patternlab object using var file as a partial
     var currentPattern, i;
@@ -247,9 +252,6 @@ var pattern_assembler = function () {
 
     //add to patternlab object so we can look these up later.
     addPattern(currentPattern, patternlab);
-
-    //look for a pseudo pattern by checking if there is a file containing same name, with ~ in it, ending in .json
-    pseudopattern_hunter.find_pseudopatterns(currentPattern, patternlab);
   }
 
   function expandPartials(foundPatternPartials, list_item_hunter, patternlab, currentPattern) {
@@ -376,6 +378,9 @@ var pattern_assembler = function () {
     },
     parse_data_links: function (patternlab) {
       parseDataLinks(patternlab);
+    },
+    parse_data_links_specific: function (patternlab, data, label){
+      return parseDataLinksHelper(patternlab, data, label)
     }
   };
 

core/lib/pseudopattern_hunter.js

@@ -42,6 +42,7 @@ var pseudopattern_hunter = function () {
         var patternVariant = Pattern.create(variantFilePath, variantFileData, {
           //use the same template as the non-variant
           template: currentPattern.template,
+          fileExtension: currentPattern.fileExtension,
           extendedTemplate: currentPattern.extendedTemplate,
           isPseudoPattern: true,
           basePattern: currentPattern,

core/lib/ui_builder.js

@@ -11,7 +11,7 @@ var eol = require('os').EOL;
 
 function addToPatternPaths(patternlab, patternTypeName, pattern) {
   //this is messy, could use a refactor.
-  patternlab.patternPaths[patternTypeName][pattern.patternBaseName] = pattern.subdir.replace(/\\/g, '/') + "/" + pattern.fileName;
+  patternlab.patternPaths[patternTypeName][pattern.patternBaseName] = pattern.subdir.replace(/\\/g, '/') + "/" + pattern.fileName.replace('~', '-');
 }
 
 //todo: refactor this as a method on the pattern object itself once we merge dev with pattern-engines branch