Merge pull request #400 from stevemartin/dev

Addresses #375 allow foo.json

core/lib/patternlab.js

@@ -11,11 +11,24 @@
 "use strict";
 
 var diveSync = require('diveSync'),
+  glob = require('glob'),
+  _ = require('lodash'),
   path = require('path');
 
 // GTP: these two diveSync pattern processors factored out so they can be reused
 // from unit tests to reduce code dupe!
 
+function buildPatternData(dataFilesPath, fs) {
+  var dataFilesPath = dataFilesPath;
+  var dataFiles = glob.sync(dataFilesPath + '*.json', {"ignore" : [dataFilesPath + 'listitems.json']});
+  var mergeObject = {}
+  dataFiles.forEach(function (filePath) {
+    var jsonData = fs.readJSONSync(path.resolve(filePath), 'utf8')
+    mergeObject = _.merge(mergeObject, jsonData)
+  })
+  return mergeObject;
+}
+
 function processAllPatternsIterative(pattern_assembler, patterns_dir, patternlab) {
   diveSync(
     patterns_dir,
@@ -183,7 +196,7 @@ var patternlab_engine = function (config) {
 
   function buildPatterns(deletePatternDir) {
     try {
-      patternlab.data = fs.readJSONSync(path.resolve(paths.source.data, 'data.json'));
+      patternlab.data = buildPatternData(paths.source.data, fs);
     } catch (ex) {
       plutils.logRed('missing or malformed' + paths.source.data + 'data.json  Pattern Lab may not work without this file.');
       patternlab.data = {};
@@ -392,6 +405,7 @@ var patternlab_engine = function (config) {
 // export these free functions so they're available without calling the exported
 // function, for use in reducing code dupe in unit tests. At least, until we
 // have a better way to do this
+patternlab_engine.build_pattern_data = buildPatternData;
 patternlab_engine.process_all_patterns_iterative = processAllPatternsIterative;
 patternlab_engine.process_all_patterns_recursive = processAllPatternsRecursive;
 

test/files/_data/data.json

@@ -0,0 +1,2 @@
+{ "data" : "test" }
+

test/files/_data/foo.json

@@ -0,0 +1 @@
+{ "foo" : "bar" }

test/files/_data/listitems.json

@@ -0,0 +1,4 @@
+{
+  "test_list_item" : "izzn thizzle"
+}
+

test/patternlab_tests.js

@@ -1,8 +1,15 @@
 'use strict';
 
 exports['test nodeunit'] = {
-	'hello world' : function(test){
-		test.equals(1,1);
-		test.done();
-	}
-};
+        'buildPatternData - should merge all JSON files in the data folder except listitems' : function(test){
+			var fs = require('fs-extra');
+            var plMain = require('../core/lib/patternlab');
+			var data_dir = './test/files/_data/';
+
+			var dataResult = plMain.build_pattern_data(data_dir, fs);
+			test.equals(dataResult.data, "test");
+			test.equals(dataResult.foo, "bar");
+			test.equals(dataResult.test_list_item, undefined);
+			test.done();
+        }
+};