Merge pull request #62 from pattern-lab/plnode1-4

Patternlab Node 1.4

CHANGELOG

@@ -1,5 +1,10 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v0.1.4
+ - FIX: Resolved issue with nested pattern rendering
+ - FIX: Supporting flat pattern name regex's in unix-systems
+ - THX: thanks @torbs for the issue and pull request
+
 PL-node-v0.1.3
  - ADD: Pattern states
  - ADD: Ships with grunt connect if you are into that kinda thing

builder/media_hunter.js

@@ -0,0 +1,24 @@
+(function () {
+	"use strict";
+
+	var media_hunter = function(){
+
+		function findMediaQueries(patternlab){
+			patternlab.mediaQueries = [];
+
+
+
+
+		}
+
+		return {
+			find_media_queries: function(patternlab){
+				findMediaQueries(patternlab);
+			}
+		};
+
+	};
+
+	module.exports = media_hunter;
+
+}());

builder/object_factory.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.1.3 - 2014 
+ * patternlab-node - v0.1.4 - 2014 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 

builder/patternlab.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.1.3 - 2014 
+ * patternlab-node - v0.1.4 - 2014 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
@@ -15,6 +15,7 @@ var patternlab_engine = function(){
 		mustache = require('mustache'),
 		of = require('./object_factory'),
 		pa = require('./pattern_assembler'),
+		mh = require('./media_hunter'),
 		patternlab = {};
 
 	patternlab.package =fs.readJSONSync('./package.json');
@@ -81,7 +82,7 @@ var patternlab_engine = function(){
 			}
 
 			//make a new Pattern Object
-			var flatPatternName = subdir.replace(/\\/g, '-') + '-' + patternName;
+			var flatPatternName = subdir.replace(/[\/\\]/g, '-') + '-' + patternName;
 
 			flatPatternName = flatPatternName.replace(/\\/g, '-');
 			currentPattern = new of.oPattern(flatPatternName, subdir, filename, {});
@@ -122,7 +123,7 @@ var patternlab_engine = function(){
 
 			//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 folderIndex = sub.indexOf('/'); //THIS IS MOST LIKELY WINDOWS ONLY.  path.sep not working yet
+			var folderIndex = sub.indexOf(path.sep);
 			var cleanSub = sub.substring(0, folderIndex);
 
 			//add any templates found to an object of partials, so downstream templates may use them too
@@ -148,6 +149,11 @@ var patternlab_engine = function(){
 		patternlab.patternPaths = {};
 		patternlab.viewAllPaths = {};
 
+		//find mediaQueries
+		// var media_hunter = new mh();
+		// media_hunter.find_media_queries(patternlab);
+		// console.log(patternlab.mediaQueries);
+
 		//build the styleguide
 		var styleguideTemplate = fs.readFileSync('./source/_patternlab-files/styleguide.mustache', 'utf8');
 		var styleguideHtml = renderPattern(styleguideTemplate, {partials: patternlab.patterns});

package.json

@@ -1,7 +1,7 @@
 {
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "devDependencies": {
     "grunt": "~0.4.0",
     "grunt-contrib-watch": "~0.2.0",