merge options

request · May 15, 2014 · 54a51c6 · 54a51c6
1 parent 9166a04
commit 54a51c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -16,6 +16,7 @@ var cookies = require('./lib/cookies')
   , copy = require('./lib/copy')
   , Request = require('./request')
   , util = require('util')
+  , _merge = require('lodash.merge')
   ;
 
 
@@ -67,9 +68,7 @@ request.defaults = function (options, requester) {
   var def = function (method) {
     var d = function (uri, opts, callback) {
       var params = initParams(uri, opts, callback)
-      for (var i in options) {
-        if (params.options[i] === undefined) params.options[i] = options[i]
-      }
+      params.options = _merge(options, params.options)
       if(typeof requester === 'function') {
         if(method === request) {
           method = requester

diff --git a/package.json b/package.json
@@ -22,11 +22,12 @@
   ],
   "main": "index.js",
   "dependencies": {
-    "qs": "~0.6.0",
-    "json-stringify-safe": "~5.0.0",
     "forever-agent": "~0.5.0",
+    "json-stringify-safe": "~5.0.0",
+    "lodash.merge": "^2.4.1",
+    "mime": "~1.2.9",
     "node-uuid": "~1.4.0",
-    "mime": "~1.2.9"
+    "qs": "~0.6.0"
   },
   "optionalDependencies": {
     "tough-cookie": ">=0.12.0",