Merge branch 'dev' into code-cleanup

Conflicts:
	Gruntfile.js
	builder/parameter_hunter.js

Author: bmuenzenmeyer

.eslintrc

@@ -49,7 +49,7 @@
     "no-multi-spaces": 1,
     "no-native-reassign": 2,
     "no-new": 2,
-    "no-param-reassign": 2,
+    "no-param-reassign": 1,
     "no-proto": 2,
     "no-redeclare": 0,
     "no-script-url": 2,

Gruntfile.js

@@ -12,7 +12,7 @@ module.exports = function (grunt) {
     concat: {
       options: {
         stripBanners: true,
-        banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n'
+        banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
       },
       patternlab: {
         src: './builder/patternlab.js',
@@ -107,7 +107,7 @@ module.exports = function (grunt) {
           },
           snippetOptions: {
             // Ignore all HTML files within the templates folder
-            blacklist: ['/index.html', '/']
+            blacklist: ['/index.html', '/', '/?*']
           },
           plugins: [
             {

builder/parameter_hunter.js

@@ -90,5 +90,3 @@ var parameter_hunter = function () {
 };
 
 module.exports = parameter_hunter;
-
-

builder/pattern_assembler.js

@@ -79,7 +79,7 @@ var pattern_assembler = function () {
 
   //http://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array-in-javascript
   function shuffle(o) {
-        for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
+    for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x); //eslint-disable-line curly
     return o;
   }
 
@@ -302,10 +302,12 @@ var pattern_assembler = function () {
   }
 
   function mergeData(obj1, obj2) {
-        if (typeof obj2 === 'undefined') {
+    if (typeof obj2 === 'undefined') {
+      //noinspection Eslint
       obj2 = {};
     }
-    for (var p in obj1) {
+
+    for (var p in obj1) { //eslint-disable-line guard-for-in
       try {
         // Only recurse if obj1[p] is an object.
         if (obj1[p].constructor === Object) {

gulpfile.js

@@ -112,7 +112,7 @@ gulp.task('connect', ['lab'], function () {
     },
     snippetOptions: {
       // Ignore all HTML files within the templates folder
-      blacklist: ['/index.html', '/']
+      blacklist: ['/index.html', '/', '/?*']
     },
     notify: {
       styles: [

test/parameter_hunter_tests.js

@@ -158,32 +158,32 @@
       test.done();
     },
 
-    'parameter hunter parses parameters with single-quoted keys and single-quoted values' : function(test){
+    'parameter hunter parses parameters with single-quoted keys and single-quoted values wrapping internal escaped single-quotes' : function(test){
       var currentPattern = currentPatternClosure();
       var patternlab = patternlabClosure();
       var parameter_hunter = new ph();
 
-      currentPattern.template = "{{> molecules-single-comment('description': 'true') }}";
+      currentPattern.template = "{{> molecules-single-comment('description': 'true not,\\'true\\'') }}";
       currentPattern.extendedTemplate = currentPattern.template;
       currentPattern.parameteredPartials[0] = currentPattern.template;
 
       parameter_hunter.find_parameters(currentPattern, patternlab);
-      test.equals(currentPattern.extendedTemplate, '<p>true</p>');
+      test.equals(currentPattern.extendedTemplate, '<p>true not,&#39;true&#39;</p>');
 
       test.done();
     },
 
-    'parameter hunter parses parameters with single-quoted keys and double-quoted values' : function(test){
+    'parameter hunter parses parameters with single-quoted keys and double-quoted values wrapping internal single-quotes' : function(test){
       var currentPattern = currentPatternClosure();
       var patternlab = patternlabClosure();
       var parameter_hunter = new ph();
 
-      currentPattern.template = "{{> molecules-single-comment('description': \"true\") }}";
+      currentPattern.template = "{{> molecules-single-comment('description': \"true not:'true'\") }}";
       currentPattern.extendedTemplate = currentPattern.template;
       currentPattern.parameteredPartials[0] = currentPattern.template;
 
       parameter_hunter.find_parameters(currentPattern, patternlab);
-      test.equals(currentPattern.extendedTemplate, '<p>true</p>');
+      test.equals(currentPattern.extendedTemplate, '<p>true not:&#39;true&#39;</p>');
 
       test.done();
     },
@@ -203,32 +203,32 @@
       test.done();
     },
 
-    'parameter hunter parses parameters with double-quoted keys and single-quoted values' : function(test){
+    'parameter hunter parses parameters with double-quoted keys and single-quoted values wrapping internal double-quotes' : function(test){
       var currentPattern = currentPatternClosure();
       var patternlab = patternlabClosure();
       var parameter_hunter = new ph();
 
-      currentPattern.template = "{{> molecules-single-comment(\"description\": 'true') }}";
+      currentPattern.template = "{{> molecules-single-comment(\"description\": 'true not{\"true\"') }}";
       currentPattern.extendedTemplate = currentPattern.template;
       currentPattern.parameteredPartials[0] = currentPattern.template;
 
       parameter_hunter.find_parameters(currentPattern, patternlab);
-      test.equals(currentPattern.extendedTemplate, '<p>true</p>');
+      test.equals(currentPattern.extendedTemplate, '<p>true not{&quot;true&quot;</p>');
 
       test.done();
     },
 
-    'parameter hunter parses parameters with double-quoted keys and double-quoted values' : function(test){
+    'parameter hunter parses parameters with double-quoted keys and double-quoted values wrapping internal escaped double-quotes' : function(test){
       var currentPattern = currentPatternClosure();
       var patternlab = patternlabClosure();
       var parameter_hunter = new ph();
 
-      currentPattern.template = "{{> molecules-single-comment(\"description\": \"true\") }}";
+      currentPattern.template = "{{> molecules-single-comment(\"description\": \"true not}\\\"true\\\"\") }}";
       currentPattern.extendedTemplate = currentPattern.template;
       currentPattern.parameteredPartials[0] = currentPattern.template;
 
       parameter_hunter.find_parameters(currentPattern, patternlab);
-      test.equals(currentPattern.extendedTemplate, '<p>true</p>');
+      test.equals(currentPattern.extendedTemplate, '<p>true not}&quot;true&quot;</p>');
 
       test.done();
     }