Merge pull request #195 from pattern-lab/dev

v0.15.1
pattern-lab · Nov 25, 2015 · e8f060f · e8f060f
2 parents 3912333 + 8584231
commit e8f060f
Show file tree

Hide file tree

Showing 26 changed files with 296 additions and 38 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,11 @@
 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.

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
@@ -49,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
 
@@ -212,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,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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.15.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,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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,10 +1,10 @@
-/* 
- * patternlab-node - v0.15.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.
  *
  */
 
@@ -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,10 +1,10 @@
-/* 
- * patternlab-node - v0.15.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.
  *
  */
 
@@ -24,19 +24,19 @@
 
     // returns any patterns that match {{> value:mod }} or {{> value:mod(foo:"bar") }} within the pattern
     function findPartialsWithStyleModifiers(pattern){
-      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?!\()(\:[A-Za-z0-9-_]+)+(?:(| )\(.*)?([ ])?}}/g);
+      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?!\()(\:[A-Za-z0-9-_|]+)+(?:(| )\(.*)?([ ])?}}/g);
       return matches;
     }
 
     // returns any patterns that match {{> value(foo:"bar") }} or {{> value:mod(foo:"bar") }} within the pattern
     function findPartialsWithPatternParameters(pattern){
-      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)+([ ])?}}/g);
+      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_|]+)?(?:(| )\(.*)+([ ])?}}/g);
       return matches;
     }
 
     //find and return any {{> template-name* }} within pattern
     function findPartials(pattern){
-      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_]+)?(?:(| )\(.*)?([ ])?}}/g);
+      var matches = pattern.template.match(/{{>([ ])?([\w\-\.\/~]+)(?:\:[A-Za-z0-9-_|]+)?(?:(| )\(.*)?([ ])?}}/g);
       return matches;
     }
 
@@ -207,7 +207,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;
 
@@ -262,7 +262,7 @@
       throw 'Could not find pattern with key ' + key;
     }
 
-    
+
     function mergeData(obj1, obj2){
       if(typeof obj2 === 'undefined'){
         obj2 = {};

diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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.15.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.15.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,5 +1,5 @@
 /* 
- * patternlab-node - v0.15.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.15.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,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.15.0",
+  "version": "0.15.1",
   "devDependencies": {
     "browser-sync": "^2.10.0",
     "del": "^2.0.2",

diff --git a/package.json b/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.15.0",
+  "version": "0.15.1",
   "devDependencies": {
     "bs-html-injector": "^3.0.0",
     "diveSync": "^0.3.0",

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>