v0.10 stable again

Author: bmuenzenmeyer

builder/lineage_hunter.js

@@ -13,11 +13,11 @@
 
 	var lineage_hunter = function(){
 
-		var pa = require('./pattern_assembler');
-		var pattern_assembler = new pa();
-
 		function findlineage(pattern, patternlab){
 
+			var pa = require('./pattern_assembler');
+			var pattern_assembler = new pa();
+
 			//find the {{> template-name }} within patterns
 			var matches = pattern_assembler.find_pattern_partials(pattern);
 			if(matches !== null){

builder/parameter_hunter.js

@@ -59,7 +59,7 @@
 
 				});
 			}
-			return matches.length;
+			return matches !== null ? matches.length : 0;
 		}
 
 		return {

builder/pattern_assembler.js

@@ -11,13 +11,6 @@
 (function () {
   "use strict";
 
-  var fs = require('fs-extra'),
-      mustache = require('mustache'),
-      ph = require('./parameter_hunter'),
-      path = require('path');
-
-  var parameter_hunter = new ph();
-
   var pattern_assembler = function(){
 
     //find and return any {{> template-name }} within pattern
@@ -40,6 +33,9 @@
     }
 
     function renderPattern(template, data, partials) {
+
+      var mustache = require('mustache');
+
       if(partials) {
         return mustache.render(template, data, partials);
       }else{
@@ -48,6 +44,10 @@
     }
 
     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('\\', '/');
@@ -59,10 +59,10 @@
       }
 
       //make a new Pattern Object
-      currentPattern = new of.oPattern(subdir, filename);
+      var currentPattern = new of.oPattern(subdir, filename);
 
       //see if this file has a state
-      pattern_assembler.setPatternState(currentPattern, patternlab);
+      setState(currentPattern, patternlab);
 
       //look for a json file for this template
       try {
@@ -79,18 +79,30 @@
       processPattern(currentPattern, patternlab);
     }
 
-    function processPattern(pattern, patternlab, additionalData){
+    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 parameter_hunter = new ph(),
+          lineage_hunter = new lh(),
+          pseudopattern_hunter = new pph();
+
       //find how many partials there may be for the given pattern
       var foundPatternPartials = findPartials(currentPattern);
 
-      if(foundPatternPartials != null && foundPatternPartials.length > 0){
+      if(foundPatternPartials !== null && foundPatternPartials.length > 0){
 
         console.log(foundPatternPartials);
 
         //determine if the template contains any pattern parameters. if so they must be immediately consumed
-        var patternsConsumedWithParamaters = parameter_hunter.find_parameters(pattern, patternlab);
+        var patternsConsumedWithParameters = parameter_hunter.find_parameters(currentPattern, patternlab);
 
-        if(patternsConsumedWithParamaters === 0){
+        if(patternsConsumedWithParameters === 0){
           //do something with the regular old partials
         }
 
@@ -103,7 +115,7 @@
       lineage_hunter.find_lineage(currentPattern, patternlab);
 
       //add as a partial in case this is referenced later.  convert to syntax needed by existing patterns
-      var sub = subdir.substring(subdir.indexOf('-') + 1);
+      var sub = currentPattern.subdir.substring(currentPattern.subdir.indexOf('-') + 1);
       var folderIndex = sub.indexOf(path.sep);
       var cleanSub = sub.substring(0, folderIndex);
 
@@ -118,10 +130,10 @@
       patternlab.partials[partialname] = currentPattern.template;
 
       //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, subdir, patternlab);
+      pseudopattern_hunter.find_pseudopatterns(currentPattern, patternlab);
 
       //add to patternlab object so we can look these up later.
-      pattern_assembler.addPattern(currentPattern, patternlab);
+      addPattern(currentPattern, patternlab);
     }
 
     return {

builder/patternlab.js

@@ -10,6 +10,7 @@
 
 var patternlab_engine = function () {
   'use strict';
+
   var path = require('path'),
   fs = require('fs-extra'),
   extend = require('util')._extend,
@@ -54,8 +55,6 @@ var patternlab_engine = function () {
   }
 
   function buildPatterns(callback){
-    console.log('0');
-
     patternlab.data = fs.readJSONSync('./source/_data/data.json');
     patternlab.listitems = fs.readJSONSync('./source/_data/listitems.json');
     patternlab.header = fs.readFileSync('./source/_patternlab-files/pattern-header-footer/header.html', 'utf8');
@@ -69,7 +68,6 @@ var patternlab_engine = function () {
         pattern_exporter = new pe();
 
     diveSync('./source/_patterns', function(err, file){
-      console.log('1');
       //log any errors
       if(err){
         console.log(err);

builder/pseudopattern_hunter.js

@@ -13,18 +13,18 @@
 
 	var pseudopattern_hunter = function(){
 
-    var extend = require('util')._extend,
-        glob = require('glob'),
-        fs = require('fs-extra'),
-				pa = require('./pattern_assembler'),
-        lh = require('./lineage_hunter'),
-        of = require('./object_factory'),
-				mustache = require('mustache');
+    function findpseudopatterns(currentPattern, patternlab){
 
-		var pattern_assembler = new pa();
-    var lineage_hunter = new lh();
+			var extend = require('util')._extend,
+					glob = require('glob'),
+					fs = require('fs-extra'),
+					pa = require('./pattern_assembler'),
+					lh = require('./lineage_hunter'),
+					of = require('./object_factory'),
+					mustache = require('mustache');
 
-    function findpseudopatterns(currentPattern, subdir, patternlab){
+			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
       var needle = currentPattern.subdir + '/' + currentPattern.fileName+ '~*.json';
@@ -43,7 +43,7 @@
           variantFileData = extend(variantFileData, currentPattern.data);
 
           var variantName = pseudoPatterns[i].substring(pseudoPatterns[i].indexOf('~') + 1).split('.')[0];
-          var patternVariant = new of.oPattern(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);
@@ -62,8 +62,8 @@
     }
 
     return {
-      find_pseudopatterns: function(pattern, subdir, patternlab){
-        findpseudopatterns(pattern, subdir, patternlab);
+      find_pseudopatterns: function(pattern, patternlab){
+        findpseudopatterns(pattern, patternlab);
       }
     };