fix for out-of-order pseudopattern bug -- isPatternFile() should return

true for a pseudopattern JSON file and it wasn't. In fact, its unit test
was lying to us. Lies! Also: implement a proper isPseudoPatternJSON()
function in pattern_engines to centralize that logic and write a unit
test for it; move isPatternFile unit test to the right file

Author: geoffp

builder/pattern_assembler.js

@@ -89,7 +89,7 @@
       var currentPattern = new of.oPattern(file, subdir, filename);
 
       //if file is named in the syntax for variants
-      if(ext === '.json' && filename.indexOf('~') > -1){
+      if(patternEngines.isPseudoPatternJSON(filename)){
         //add current pattern to patternlab object with minimal data
         //processPatternRecursive() will run find_pseudopatterns() to fill out
         //the object in the next diveSync

builder/pattern_engines/pattern_engines.js

@@ -66,6 +66,13 @@
       return (supportedExtensions.lastIndexOf(fileExtension) !== -1);
     },
 
+    // given a filename, return a boolean: whether or not the filename indicates
+    // that the file is pseudopattern JSON
+    isPseudoPatternJSON: function (filename) {
+      var extension = path.extname(filename);
+      return (extension === '.json' && filename.indexOf('~') > -1);
+    },
+
     // takes a filename string, not a full path; a basename (plus extension)
     // ignore _underscored patterns, dotfiles, and anything not recognized by a
     // loaded pattern engine. Pseudo-pattern .json files ARE considered to be
@@ -75,13 +82,14 @@
       var extension = path.extname(filename);
       if(filename.charAt(0) === '.' ||
          filename.charAt(0) === '_' ||
-         (extension === '.json' && filename.indexOf('~') === -1)) {
+         (extension === '.json' && !PatternEngines.isPseudoPatternJSON(filename))) {
         return false;
       }
 
       // not a hidden pattern, let's dig deeper
       var supportedPatternFileExtensions = PatternEngines.getSupportedFileExtensions();
-      return (supportedPatternFileExtensions.lastIndexOf(extension) !== -1);
+      return (supportedPatternFileExtensions.lastIndexOf(extension) !== -1 ||
+             PatternEngines.isPseudoPatternJSON(filename));
     }
   });
 

test/pattern_assembler_tests.js

@@ -3,7 +3,6 @@
 
 	var pa = require('../builder/pattern_assembler');
   var of = require('../builder/object_factory');
-  var patternEngines = require('../builder/pattern_engines/pattern_engines');
 
 	exports['pattern_assembler'] = {
 		'find_pattern_partials finds partials' : function(test){
@@ -31,6 +30,9 @@
             "{{> molecules-single-comment(description: 'A life isn\\'t like a garden. Perfect moments can be had, but not preserved, except in memory.') }}" +
             '{{> molecules-single-comment(description: "A life is like a \\"garden\\". Perfect moments can be had, but not preserved, except in memory.") }}' +
             "{{> molecules-single-comment:foo }}" +
+            // questionable: is a partial call with a file extension really
+            // permitted? seems like no, based on
+            // http://patternlab.io/docs/pattern-including.html
             "{{> 01-molecules/06-components/03-comment-header.mustache }}" +
             "{{> 01-molecules/06-components/02-single-comment.mustache(description: 'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.') }}" +
             "{{> molecules-single-comment:foo }}" +
@@ -354,35 +356,7 @@
 			//test that 00-foo.mustache included partial 01-bar.mustache
 			test.equals(fooExtended, 'bar');
 
-			test.done();
-		},
-
-    'isPatternFile correctly identifies pattern files and rejects non-pattern files': function(test){
-      var pattern_assembler = new pa();
-
-      // each test case
-      var filenames = {
-        '00-comment-thread.mustache': true,
-        '00-comment-thread.fakeextthatdoesntexist': false,
-        '00-comment-thread': false,
-        '_00-comment-thread.mustache': false,
-        '.00-comment-thread.mustache': false,
-        '00-comment-thread.json': false,
-        '00-homepage~emergency.json': false
-      };
-      // expect one test per test case
-      test.expect(Object.keys(filenames).length);
-
-      // loop over each test case and test it
-      Object.keys(filenames).forEach(function (filename) {
-        var expectedResult = filenames[filename],
-            actualResult = patternEngines.isPatternFile(filename),
-            testMessage = 'isPatternFile should return ' + expectedResult + ' for ' + filename;
-        test.strictEqual(actualResult, expectedResult, testMessage);
-      });
-
-      // done
 			test.done();
 		}
 	};
-}());
+})();

test/pattern_engines_tests.js

@@ -39,7 +39,57 @@
       var engine = patternEngines.getEngineForPattern(mustacheTestPseudoPattern);
       test.equals(engine, patternEngines.mustache);
       test.done();
-    }
+    },
+    'isPseudoPatternJSON correctly identifies pseudo-pattern JSON filenames': function(test) {
+      // each test case
+      var filenames = {
+        '00-homepage~emergency.json': true,
+        '~emergency.json': true,
+        '00-homepage~emergency.js': false,
+        '00-homepage-emergency.js': false,
+        '00-homepage.hbs': false,
+        '00-homepage.json': false,
+        'greatpic.jpg': false
+      };
+      // expect one test per test case
+      test.expect(Object.keys(filenames).length);
+
+      // loop over each test case and test it
+      Object.keys(filenames).forEach(function (filename) {
+        var expectedResult = filenames[filename],
+            actualResult = patternEngines.isPseudoPatternJSON(filename),
+            testMessage = 'isPseudoPatternJSON should return ' + expectedResult + ' for ' + filename;
+        test.strictEqual(actualResult, expectedResult, testMessage);
+      });
+
+      // done
+			test.done();
+		},
+    'isPatternFile correctly identifies pattern files and rejects non-pattern files': function(test){
+      // each test case
+      var filenames = {
+        '00-comment-thread.mustache': true,
+        '00-comment-thread.fakeextthatdoesntexist': false,
+        '00-comment-thread': false,
+        '_00-comment-thread.mustache': false,
+        '.00-comment-thread.mustache': false,
+        '00-comment-thread.json': false,
+        '00-homepage~emergency.json': true
+      };
+      // expect one test per test case
+      test.expect(Object.keys(filenames).length);
+
+      // loop over each test case and test it
+      Object.keys(filenames).forEach(function (filename) {
+        var expectedResult = filenames[filename],
+            actualResult = patternEngines.isPatternFile(filename),
+            testMessage = 'isPatternFile should return ' + expectedResult + ' for ' + filename;
+        test.strictEqual(actualResult, expectedResult, testMessage);
+      });
+
+      // done
+			test.done();
+		}
   };
 
   // testProps() utility function: given an object, and a hash of expected