some regex helpers for style modifiers and pattern parameters, with unit test coverage

bmuenzenmeyer · bmuenzenmeyer · commit c15d488b8422 · 2015-10-27T23:20:51.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-node-v0.14.0
+- ADD: Support for style modifiers
+
 PL-node-v0.13.1
 - FIX: Allow verbose partials for list items
 - THX: Thanks @e2tha-e
diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
@@ -22,6 +22,17 @@
       return true;
     }
 
+    // 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);
+      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);
+      return matches;
+    }
 
     //find and return any {{> template-name }} within pattern
     function findPartials(pattern){
@@ -300,6 +311,12 @@
       find_pattern_partials: function(pattern){
         return findPartials(pattern);
       },
+      find_pattern_partials_with_style_modifiers: function(pattern){
+        return findPartialsWithStyleModifiers(pattern);
+      },
+      find_pattern_partials_with_parameters: function(pattern){
+        return findPartialsWithPatternParameters(pattern);
+      },
       find_list_items: function(pattern){
         return findListItems(pattern)
       },
diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 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.13.0 - 2015 
+ * patternlab-node - v0.14.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
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.13.0",
+  "version": "0.14.0",
   "devDependencies": {
     "browser-sync": "^2.8.2",
     "del": "^1.2.1",
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.13.1",
+  "version": "0.14.0",
   "devDependencies": {
     "bs-html-injector": "^2.0.4",
     "diveSync": "^0.2.1",
diff --git a/test/pattern_assembler_tests.js b/test/pattern_assembler_tests.js
@@ -38,6 +38,165 @@
 			test.done();
 		},
 
+		'find_pattern_partials_with_style_modifiers finds style modifiers' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
+      test.equals(results.length, 1);
+			test.equals(results[0], '{{> molecules-single-comment:foo }}');
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_style_modifiers finds style modifiers with parameters present too' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+				 "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+			var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
+			test.equals(results.length, 1);
+			test.equals(results[0], "{{> molecules-single-comment:foo(bar:'baz') }}");
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_style_modifiers finds style modifiers with verbose partials' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment:foo }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
+      test.equals(results.length, 1);
+			test.equals(results[0], '{{> 01-molecules/06-components/molecules-single-comment:foo }}');
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_style_modifiers finds no style modifiers when only partials present' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
+      test.equals(results, null);
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_style_modifiers finds no style modifiers when only partials with pattern parameters present' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(foo: 'bar') }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
+      test.equals(results, null);
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_parameters finds parameters' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(bar:'baz') }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
+      test.equals(results.length, 1);
+			test.equals(results[0], "{{> molecules-single-comment(bar:'baz') }}");
+
+			test.done();
+
+		},
+
+		'find_pattern_partials_with_parameters finds parameters when stylemodifiers present too' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
+      test.equals(results.length, 1);
+			test.equals(results[0], "{{> molecules-single-comment:foo(bar:'baz') }}");
+
+			test.done();
+
+		},
+
+		'find_pattern_partials_with_parameters finds parameters with verbose partials' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment(bar:'baz') }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
+      test.equals(results.length, 1);
+			test.equals(results[0], "{{> 01-molecules/06-components/molecules-single-comment(bar:'baz') }}");
+
+			test.done();
+
+		},
+
+		'find_pattern_partials_with_parameters finds no style modifiers when only partials present' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
+      test.equals(results, null);
+
+			test.done();
+		},
+
+		'find_pattern_partials_with_parameters finds no style modifiers when only partials with style modifiers present' : function(test){
+
+			//setup current pattern from what we would have during execution
+			var currentPattern = {
+         "template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
+			};
+
+			var pattern_assembler = new pa();
+
+      var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
+      test.equals(results, null);
+
+			test.done();
+		},
+
 		'process_pattern_recursive recursively includes partials' : function(test){
 
 			//tests inclusion of partial that will be discovered by diveSync later in iteration than parent

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * patternlab-node - v0.13.0 - 2015`
	`2`	`+ * patternlab-node - v0.14.0 - 2015`
`3`	`3`	`*`
`4`	`4`	`* Brian Muenzenmeyer, and the web community.`
`5`	`5`	`* Licensed under the MIT license.`