Merge remote-tracking branch 'refs/remotes/upstream/master' into pattern-engines

geoffp · geoffp · commit 0681781003e9 · 2015-12-04T11:22:37.000-06:00
Conflicts:
	builder/lineage_hunter.js
	builder/list_item_hunter.js
	builder/object_factory.js
	builder/parameter_hunter.js
	builder/pattern_assembler.js
	builder/patternlab.js
	builder/pseudopattern_hunter.js
	test/pattern_assembler_tests.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 
 node_js:
+  - stable
+  - 4.0
   - 0.12
   - 0.11
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,15 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v0.15.1
+- FIX: Resolve issue with styleModifiers not being replaced when the partial has spaces in it.
+- ADD: Support multiple styleModifier classes using the | pipe syntax
+- FIX: Resolve issue with styleModifiers not being applied correctly when mixed with pattern parameters
+- THX: Thanks @theorise for the issue reports!
+
+PL-node-v0.15.0
+- CHG: Updated package.json devDependencies for Node 4.X and 5.X support.
+- CHG: Updated package.gulp.json devDependencies for Node 4.X and 5.X support.
+
 PL-node-v0.14.0
 - ADD: Support for style modifiers
 - ADD: Support for styleGuideExcludes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 #Contributing to Patternlab - Node
 If you'd like to contribute to patternlab - node, please do so! There is always a lot of ground to cover, with patternlab - php being so feature-rich.  
 
-No pull request is too small.
+No pull request is too small. Check out any [up for grabs issues](https://github.com/pattern-lab/patternlab-node/labels/up%20for%20grabs) as a good way to get your feet wet. 
 
 ##Guidelines
 1. Please keep your pull requests concise and limited to **ONE** substantive change at a time.
diff --git a/README.md b/README.md
@@ -10,14 +10,12 @@ This repository contains the vanilla builder logic, grunt and gulp configuration
 
 * Download the [latest release of patternlab-node](https://github.com/pattern-lab/patternlab-node/releases/latest) from Github
 * Via npm, run `npm install patternlab-node` (Note this will auto install the grunt version currently. see below)
-* **NOTE** Node version 4.X is not officially supported yet, citing [a lot of Windows issues](https://github.com/nodejs/node-gyp/issues/629), including [mine](https://github.com/pattern-lab/patternlab-node/issues/162). Upgrade node at your own risk until otherwise stated.
+* **NOTE** Node version 4.X and 5.X have tentative support, citing [a lot of Windows issues](https://github.com/nodejs/node-gyp/issues/629), including [mine](https://github.com/pattern-lab/patternlab-node/issues/162). Upgrade node at your own risk until otherwise stated. I've tried to catalog some issues and troubleshooting steps on the [wiki](https://github.com/pattern-lab/patternlab-node/wiki/Windows-Issues).
 
 ### Choose Your Adventure! Now Vanilla, Grunt & Gulp
 
 This repository ships with two `package.json` files, a `Gruntfile.js`, and a `gulpfile.js`. The default is grunt currently. The core builder is not dependent on either.
 
-**HELP WANTED** Please help me test both of the configurations by [reporting](https://github.com/pattern-lab/patternlab-node/blob/dev/CONTRIBUTING.md) any issues encountered.
-
 ### Getting Started - Grunt
 
 To run patternlab-node using grunt, do the following in the directory you downloaded and extracted the zipped release:
@@ -27,7 +25,7 @@ To run patternlab-node using grunt, do the following in the directory you downlo
 * Not deleting `builder/patternlab_gulp.js` may cause a harmless error when running grunt. Delete it.
 3. Run `grunt` or `grunt serve` from the command line
 
-This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `grunt serve` to see have BrowserSync spin up and serve the files to you.
+This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `grunt serve` to have BrowserSync spin up and serve the files to you.
 
 ### Getting Started - Gulp
 
@@ -51,7 +49,7 @@ It's not expected to toggle between the two build systems, but for those migrati
 
 ### Upgrading
 
-You can find some simple upgrade documenation in it's current home here (unreleased but confirmed to work): [https://github.com/pattern-lab/website/blob/dev/patternlabsite/docs/node/upgrading.md](https://github.com/pattern-lab/website/blob/dev/patternlabsite/docs/node/upgrading.md)
+You can find instructions on how to upgrade from version to version of Pattern Lab Node here: [https://github.com/pattern-lab/patternlab-node/wiki/Upgrading](https://github.com/pattern-lab/patternlab-node/wiki/Upgrading)
 
 ### Command Line Interface
 
@@ -214,6 +212,11 @@ Once rendered, it looks like this:
 </div>
 ```
 
+You may also specify multiple classes using a pipe character (|).
+
+```
+{{> atoms-message:error|is-on }}
+```
 
 
 
diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js
@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v0.14.0 - 2015
- *
+/* 
+ * patternlab-node - v0.15.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
diff --git a/builder/list_item_hunter.js b/builder/list_item_hunter.js
@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v0.14.0 - 2015
- *
+/* 
+ * patternlab-node - v0.15.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
diff --git a/builder/media_hunter.js b/builder/media_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/object_factory.js b/builder/object_factory.js
@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v0.14.0 - 2015
- *
+/* 
+ * patternlab-node - v0.15.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
diff --git a/builder/parameter_hunter.js b/builder/parameter_hunter.js
@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v0.14.0 - 2015
+ * patternlab-node - v0.15.1 - 2015
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -28,6 +28,8 @@
 					//find the partial's name and retrieve it
 					var partialName = pMatch.match(/([\w\-\.\/~]+)/g)[0];
 					var partialPattern = pattern_assembler.get_pattern_by_key(partialName, patternlab);
+					//if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
+					partialPattern.extendedTemplate = partialPattern.template;
 
 					if(patternlab.config.debug){
 						console.log('found patternParameters for ' + partialName);
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v0.14.0 - 2015
+ * patternlab-node - v0.15.1 - 2015
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -192,7 +192,7 @@
 
         //do something with the regular old partials
         for(i = 0; i < foundPatternPartials.length; i++){
-          var partialKey = foundPatternPartials[i].replace(/{{>([ ])?([\w\-\.\/~]+)(:[A-z-_]+)?(?:\:[A-Za-z0-9-]+)?(?:(| )\(.*)?([ ])?}}/g, '$2');
+          var partialKey = foundPatternPartials[i].replace(/{{>([ ])?([\w\-\.\/~]+)(:[A-z-_|]+)?(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)?([ ])?}}/g, '$2');
 
           var partialPath;
 
diff --git a/builder/pattern_engines/engine_mustache.js b/builder/pattern_engines/engine_mustache.js
@@ -19,9 +19,9 @@
     engineFileExtension: '.mustache',
 
     // regexes, stored here so they're only compiled once
-    findPartialsRE: /{{>\s*((?:\d+-[\w-]+\/)+(\d+-[\w-]+(\.\w+)?)|[A-Za-z0-9-]+)(\:[A-Za-z0-9-]+)?(\(\s*\w+\s*:\s*(?:'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")\))?\s*}}/g,
-    findPartialsWithStyleModifiersRE: /{{>([ ])?([\w\-\.\/~]+)(?!\()(\:[A-Za-z0-9-_]+)+(?:(| )\(.*)?([ ])?}}/g,
-    findPartialsWithPatternParametersRE: /{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)+([ ])?}}/g,
+    findPartialsRE: /{{>\s*((?:\d+-[\w-]+\/)+(\d+-[\w-]+(\.\w+)?)|[A-Za-z0-9-]+)(\:[\w-]+)?(\(\s*\w+\s*:\s*(?:'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")\))?\s*}}/g,
+    findPartialsWithStyleModifiersRE: /{{>([ ])?([\w\-\.\/~]+)(?!\()(\:[A-Za-z0-9-_|]+)+(?:(| )\(.*)?([ ])?}}/g,
+    findPartialsWithPatternParametersRE: /{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_|]+)?(?:(| )\(.*)+([ ])?}}/g,
     findListItemsRE: /({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g,
 
     // render it
diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v0.14.0 - 2015
- *
+/* 
+ * patternlab-node - v0.15.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
diff --git a/builder/patternlab_grunt.js b/builder/patternlab_grunt.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab_gulp.js b/builder/patternlab_gulp.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.1 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pseudopattern_hunter.js b/builder/pseudopattern_hunter.js
@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v0.14.0 - 2015
- *
+/* 
+ * patternlab-node - v0.15.1 - 2015 
+ * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
  *
diff --git a/builder/style_modifier_hunter.js b/builder/style_modifier_hunter.js
@@ -1,10 +1,10 @@
-/* 
- * patternlab-node - v0.14.0 - 2015 
- * 
+/*
+ * patternlab-node - v0.15.1 - 2015
+ *
  * Brian Muenzenmeyer, 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.
  *
  */
 
@@ -16,15 +16,18 @@
 		function consumestylemodifier(pattern, partial, patternlab){
 
 			//extract the classname from the stylemodifier which comes in the format of :className
-			var styleModifier = partial.match(/:([\w\-_])+/g) ? partial.match(/:([\w\-_])+/g)[0].slice(1) : null;
+			var styleModifier = partial.match(/:([\w\-_|])+/g) ? partial.match(/:([\w\-_|])+/g)[0].slice(1) : null;
 			if(styleModifier){
 
+				//replace the special character pipe | used to separate multiple classes with a space
+				styleModifier = styleModifier.replace(/\|/g, ' ');
+
 				if(patternlab.config.debug){
 					console.log('found partial styleModifier within pattern ' + pattern.key);
 				}
 
 				//replace the stylemodifier placeholder with the class name
-				pattern.extendedTemplate = pattern.extendedTemplate.replace('{{styleModifier}}', styleModifier);
+				pattern.extendedTemplate = pattern.extendedTemplate.replace(/{{[ ]?styleModifier[ ]?}}/i, styleModifier);
 			}
 		}
 
diff --git a/package.gulp.json b/package.gulp.json
@@ -1,34 +1,36 @@
 {
   "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.14.0",
+  "version": "0.15.1",
   "devDependencies": {
-    "browser-sync": "^2.8.2",
-    "del": "^1.2.1",
-    "diveSync": "^0.2.1",
-    "fs-extra": "^0.14.0",
-    "glob": "^4.3.5",
-    "gulp": "^3.8.8",
-    "gulp-connect": "^2.0.6",
+    "browser-sync": "^2.10.0",
+    "del": "^2.0.2",
+    "diveSync": "^0.3.0",
+    "fs-extra": "^0.26.2",
+    "glob": "^6.0.1",
+    "gulp": "^3.9.0",
+    "gulp-connect": "^2.2.0",
     "gulp-copy": "0.0.2",
-    "gulp-header": "^1.0.5",
+    "gulp-header": "^1.7.1",
     "gulp-load": "^0.1.1",
     "gulp-nodeunit": "0.0.5",
     "gulp-strip-banner": "0.0.2",
-    "html-entities": "^1.1.1",
-    "mustache": "^1.0.0"
+    "html-entities": "^1.2.0",
+    "mustache": "^2.2.0"
   },
   "keywords": [
     "Pattern Lab",
     "Atomic Web Design",
     "Node",
     "Grunt",
+    "Gulp",
     "Javascript"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "author": "Brian Muenzenmeyer",
   "license": "MIT",
   "scripts": {
diff --git a/package.json b/package.json
@@ -1,33 +1,35 @@
 {
   "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.14.0",
+  "version": "0.15.1",
   "devDependencies": {
-    "bs-html-injector": "^2.0.4",
-    "diveSync": "^0.2.1",
-    "fs-extra": "^0.24.0",
-    "glob": "^4.3.5",
-    "grunt": "~0.4.0",
-    "grunt-browser-sync": "^2.1.3",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-copy": "^0.7.0",
+    "bs-html-injector": "^3.0.0",
+    "diveSync": "^0.3.0",
+    "fs-extra": "^0.26.2",
+    "glob": "^6.0.1",
+    "grunt": "~0.4.5",
+    "grunt-browser-sync": "^2.2.0",
+    "grunt-contrib-concat": "^0.5.1",
+    "grunt-contrib-copy": "^0.8.2",
     "grunt-contrib-nodeunit": "^0.4.1",
     "grunt-contrib-watch": "^0.6.1",
-    "html-entities": "^1.1.1",
-    "matchdep": "^0.3.0",
-    "mustache": "^1.0.0"
+    "html-entities": "^1.2.0",
+    "matchdep": "^1.0.0",
+    "mustache": "^2.2.0"
   },
   "keywords": [
     "Pattern Lab",
     "Atomic Web Design",
     "Node",
     "Grunt",
+    "Gulp",
     "Javascript"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "author": "Brian Muenzenmeyer",
   "license": "MIT",
   "scripts": {
diff --git a/test/files/_patterns/00-test/03-styled-atom.mustache b/test/files/_patterns/00-test/03-styled-atom.mustache
@@ -0,0 +1,3 @@
+<span class="test_base {{styleModifier}}">
+    {{message}}
+</span>
diff --git a/test/files/_patterns/00-test/04-group.mustache b/test/files/_patterns/00-test/04-group.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom:test_1 }}
+    {{> test-styled-atom:test_2 }}
+    {{> test-styled-atom:test_3 }}
+    {{> test-styled-atom:test_4 }}
+</div>
diff --git a/test/files/_patterns/00-test/05-group2.mustache b/test/files/_patterns/00-test/05-group2.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom:test_1(message: "1" ) }}
+    {{> test-styled-atom:test_2(message: "2" ) }}
+    {{> test-styled-atom:test_3(message: "3" ) }}
+    {{> test-styled-atom:test_4(message: "4" ) }}
+</div>
diff --git a/test/files/_patterns/00-test/06-mixed.mustache b/test/files/_patterns/00-test/06-mixed.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom:test_2 }}
+    {{> test-styled-atom:test_3 }}
+    {{> test-styled-atom:test_4 }}
+</div>
diff --git a/test/files/_patterns/00-test/07-mixed-params.mustache b/test/files/_patterns/00-test/07-mixed-params.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom:test_2(message: '2') }}
+    {{> test-styled-atom:test_3(message: '3') }}
+    {{> test-styled-atom:test_4(message: '4') }}
+</div>
diff --git a/test/files/_patterns/00-test/08-bookend-params.mustache b/test/files/_patterns/00-test/08-bookend-params.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom:test_2(message: '2') }}
+    {{> test-styled-atom:test_3(message: '3') }}
+    {{> test-styled-atom }}
+</div>
diff --git a/test/files/_patterns/00-test/09-bookend.mustache b/test/files/_patterns/00-test/09-bookend.mustache
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom:test_2 }}
+    {{> test-styled-atom:test_3 }}
+    {{> test-styled-atom}}
+</div>
diff --git a/test/pattern_assembler_tests.js b/test/pattern_assembler_tests.js
diff --git a/test/style_modifier_hunter_tests.js b/test/style_modifier_hunter_tests.js

-Original file line number
+Diff line change
@@ @@ -1,6 +1,8 @@ @@
 language: node_js
 node_js:
 +  - stable
 +  - 4.0
   - 0.12
   - 0.11
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * patternlab-node - v0.14.0 - 2015`
	`2`	`+ * patternlab-node - v0.15.1 - 2015`
`3`	`3`	`*`
`4`	`4`	`* Brian Muenzenmeyer, and the web community.`
`5`	`5`	`* Licensed under the MIT license.`