fixes arrays being incorrectly mapped k/v

leafty · Mar 20, 2015 · e10deaf · e10deaf
1 parent 68058b3
commit e10deaf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/lib/node-yaml-config.js b/lib/node-yaml-config.js
@@ -12,36 +12,14 @@
 var fs = require('fs');
 var path = require('path');
 var yaml = require('js-yaml');
+var extend = require('node.extend');
 
 /**
 * Hash of loaded files
 */
 
 var loaded_files = {};
 
-/**
-* Merges properties found in `extension` into `doc`
-*/
-
-function merge(doc, extension) {
-  var prop;
-
-  for (prop in extension) {
-    if (extension.hasOwnProperty(prop)) {
-      if (extension[prop] instanceof Object) {
-        if (!doc.hasOwnProperty(prop)) {
-          doc[prop] = {};
-        }
-        merge(doc[prop], extension[prop]);
-      } else {
-        doc[prop] = extension[prop];
-      }
-    }
-  }
-
-  return doc;
-}
-
 /**
 * Reads a yaml configuration file
 */
@@ -75,7 +53,7 @@ function load(filename, env) {
   default_config = data.default || {};
   extension_config = data[env] || {};
 
-  return merge(merge({}, default_config), extension_config);
+  return extend(true, extend(true, {}, default_config), extension_config);
 }
 
 /**

diff --git a/package.json b/package.json
@@ -4,7 +4,9 @@
   "version": "0.0.2",
   "main": "./lib/node-yaml-config",
   "dependencies": {
-    "js-yaml": "1.0.2"
+    "merge": "~1.2.0",
+    "js-yaml": "1.0.2",
+    "node.extend": "~1.1.3"
   },
   "directories": {
     "example": "examples",
@@ -15,7 +17,7 @@
     "should": "~1.2.0"
   },
   "scripts": {
-    "prepublish" : "npm prune",
+    "prepublish": "npm prune",
     "test": "make test"
   },
   "repository": {

diff --git a/test/config.yml b/test/config.yml
@@ -19,3 +19,7 @@ production:
     password: 'pass'
   cache:
     dir: 'static'
+  admins:
+    - "humans"
+    - "subhumans"
+    - "arachnids"
diff --git a/test/test.js b/test/test.js
@@ -8,7 +8,7 @@ var save_file = __dirname + '/config.yml.bak';
 var new_file = __dirname + '/config-reload.yml';
 
 var example_dev_config = {
-  server: { 
+  server: {
     port: 3000
   },
   database: {
@@ -19,7 +19,7 @@ var example_dev_config = {
 };
 
 var example_test_config = {
-  server: { 
+  server: {
     port: 3000
   },
   database: {
@@ -30,7 +30,7 @@ var example_test_config = {
 };
 
 var example_prod_config = {
-  server: { 
+  server: {
     port: 8000
   },
   database: {
@@ -42,7 +42,8 @@ var example_prod_config = {
   },
   cache: {
     dir: 'static'
-  }
+  },
+  admins: [ "humans", "subhumans", "arachnids" ]
 };
 
 var example_new_dev_config = {