Merge pull request #198 from selfcontained/config-null-check

[Convenience] Check if property is set before assuring environment is not null

Author: wzrdtales

lib/config.js

@@ -29,7 +29,7 @@ exports.load = function(fileName, currentEnv) {
       //Check config entry's for ENV objects
       //which will tell us to grab configuration from the environment
       for (var configEntry in config[env]) {
-        if (config[env][configEntry].ENV != null){
+        if (config[env][configEntry] && config[env][configEntry].ENV != null){
           config[env][configEntry] =  process.env[config[env][configEntry].ENV];
         }
       }

test/config_test.js

@@ -106,5 +106,22 @@ vows.describe('config').addBatch({
       assert.equal(current.settings.database, 'dbname');
     }
   }
-}).export(module);
+}).addBatch({
+  'loading a config with null values': {
+    topic: function() {
+        var configPath = path.join(__dirname, 'database_with_null_values.json');
+        config.load = _configLoad;
+        config.loadUrl = _configLoadUrl;
+        try {
+            config.load(configPath, 'dev');
+        }catch(e) {
+            return e;
+        }
+        return null;
+    },
 
+    'should something': function(err) {
+        assert.isNull(err);
+    }
+  }
+}).export(module);

test/database_with_null_values.json

@@ -0,0 +1,16 @@
+{
+    "dev": {
+        "driver": null,
+        "filename": ":memory:"
+    },
+
+    "test": {
+        "driver": null,
+        "filename": ":memory:"
+    },
+
+    "prod": {
+        "driver": null,
+        "filename": "prod.db"
+    }
+}