Merge pull request #289 from Yaska/master

Handle null subobject case
node-config · Feb 5, 2016 · 934b416 · 934b416
2 parents dc0ca71 + 4322018
commit 934b416
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/config.js b/lib/config.js
@@ -145,7 +145,8 @@ var getImpl= function(object, property) {
   if (elems.length <= 1) {
     return value;
   }
-  if (typeof value !== 'object') {
+  // Note that typeof null === 'object'
+  if (value === null || typeof value !== 'object') {
     return undefined;
   }
   return getImpl(value, elems.slice(1));

diff --git a/test/2-config-test.js b/test/2-config-test.js
@@ -276,6 +276,10 @@ vows.describe('Test suite for node-config')
     'A sub level item can be tested': function() {
       assert.isTrue(CONFIG.has('Customers.dbHost'));
     },
+    'A missing sub level item can be tested': function() {
+      assert.isTrue(CONFIG.has('Customers.emptySub'));
+      assert.isFalse(CONFIG.has('Customers.emptySub.foo'));
+    },
     'has is attached deeply': function() {
       assert.isTrue(CONFIG.Customers.has('dbHost'));
     },

diff --git a/test/config/default.yaml b/test/config/default.yaml
@@ -3,6 +3,8 @@
 Customers:
   dbPort: 5984
   dbName: from_default_yaml
+  emptySub:
+    # empty
 
 AnotherModule:
   parm2: value2