Merge pull request #63 from SchoonologyRRL/patch-1

Updated Memory.merge to handle null values

lib/nconf/stores/memory.js

@@ -157,7 +157,7 @@ Memory.prototype.merge = function (key, value) {
   // If the key is not an `Object` or is an `Array`,
   // then simply set it. Merging is for Objects.
   //
-  if (typeof value !== 'object' || Array.isArray(value)) {
+  if (typeof value !== 'object' || Array.isArray(value) || value === null) {
     return this.set(key, value);
   }
 

test/fixtures/merge/file1.json

@@ -12,5 +12,8 @@
       "first": 1,
       "second": 2
     }
+  },
+  "unicorn": {
+    "exists": true
   }
 }

test/fixtures/merge/file2.json

@@ -5,5 +5,6 @@
     "something4": true
   },
   "dates": true,
-  "elderberries": true
+  "elderberries": true,
+  "unicorn": null
 }

test/provider-test.js

@@ -84,6 +84,11 @@ vows.describe('nconf/provider').addBatch({
           provider.merge(override);
           helpers.assertMerged(null, provider.stores.file.store);
           assert.equal(provider.stores.file.store.candy.something, 'file1');
+        },
+        "should merge Objects over null": function (provider) {
+          provider.load();
+          provider.merge(override);
+          assert.equal(provider.stores.file.store.unicorn.exists, true);
         }
       }
     }