From 41af081c55266a8ad364d1bc913e2a4c0e132309 Mon Sep 17 00:00:00 2001 From: Dennis Ashby Date: Sat, 25 Jul 2015 09:56:28 -0700 Subject: [PATCH 1/2] Added code to allow model-config to respect model-config.local.js and model-config.env.js as do other config files. --- lib/config-loader.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/config-loader.js b/lib/config-loader.js index cd7926a..30842d9 100644 --- a/lib/config-loader.js +++ b/lib/config-loader.js @@ -32,7 +32,8 @@ ConfigLoader.loadDataSources = function(rootDir, env) { */ ConfigLoader.loadModels = function(rootDir, env) { /*jshint unused:false */ - return tryReadJsonConfig(rootDir, 'model-config') || {}; + //return tryReadJsonConfig(rootDir, 'model-config') || {}; + return loadNamed(rootDir, env, 'model-config', mergeModelConfig); }; /** @@ -148,6 +149,15 @@ function mergeDataSourceConfig(target, config, fileName) { } } +function mergeModelConfig(target, config, fileName) { + for (var mc in target) { + var err = mergeObjects(target[mc], config[mc]); + if (err) { + throw new Error('Cannot apply ' + fileName + ' to `' + mc + '`: ' + err); + } + } +} + function mergeAppConfig(target, config, fileName) { var err = mergeObjects(target, config); if (err) { From ab723b54903e7a3d0ecdee3d1f3720fdf8089bc8 Mon Sep 17 00:00:00 2001 From: Dennis Ashby Date: Fri, 31 Jul 2015 06:29:03 -0700 Subject: [PATCH 2/2] Resolved style issue --- lib/config-loader.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/config-loader.js b/lib/config-loader.js index 30842d9..edf7cc7 100644 --- a/lib/config-loader.js +++ b/lib/config-loader.js @@ -32,7 +32,6 @@ ConfigLoader.loadDataSources = function(rootDir, env) { */ ConfigLoader.loadModels = function(rootDir, env) { /*jshint unused:false */ - //return tryReadJsonConfig(rootDir, 'model-config') || {}; return loadNamed(rootDir, env, 'model-config', mergeModelConfig); };