removed dep on object-assign, which didnt support node < 0.10

Author: sdellysse

lib/generic-parser.js

@@ -34,8 +34,21 @@ module.exports = generic
  * @public
  */
 
-function generic (options) {
-  var opts = options || {}
+function generic (parserOptions, parserOverrides) {
+  var opts = {}
+
+  // Squash the options and the overrides down into one object
+  var squashKey
+  for (squashKey in (parserOptions || {})) {
+    if (Object.prototype.hasOwnProperty.call(parserOptions, squashKey)) {
+      opts[squashKey] = parserOptions[squashKey]
+    }
+  }
+  for (squashKey in (parserOverrides || {})) {
+    if (Object.prototype.hasOwnProperty.call(parserOverrides, squashKey)) {
+      opts[squashKey] = parserOverrides[squashKey]
+    }
+  }
 
   var limit = typeof opts.limit !== 'number'
     ? bytes.parse(opts.limit || '100kb')

lib/types/json.js

@@ -12,7 +12,6 @@
  * @private
  */
 
-var assign = require('object-assign')
 var genericParser = require('../..').generic
 var debug = require('debug')('body-parser:json')
 
@@ -55,7 +54,7 @@ function json (options) {
   var parser = opts.parser || JSON.parse
   var type = opts.type || 'application/json'
 
-  return genericParser(assign({}, opts, {
+  return genericParser(opts, {
     type: type,
 
     charset: function validateCharset (charset) {
@@ -88,7 +87,7 @@ function json (options) {
         })
       }
     }
-  }))
+  })
 }
 
 /**

lib/types/raw.js

@@ -10,7 +10,6 @@
  * Module dependencies.
  */
 
-var assign = require('object-assign')
 var genericParser = require('../..').generic
 
 /**
@@ -32,7 +31,7 @@ function raw (options) {
 
   var type = opts.type || 'application/octet-stream'
 
-  return genericParser(assign({}, opts, {
+  return genericParser(opts, {
     type: type
-  }))
+  })
 }

lib/types/text.js

@@ -10,7 +10,6 @@
  * Module dependencies.
  */
 
-var assign = require('object-assign')
 var genericParser = require('../..').generic
 
 /**
@@ -33,9 +32,9 @@ function text (options) {
   var defaultCharset = opts.defaultCharset || 'utf-8'
   var type = opts.type || 'text/plain'
 
-  return genericParser(assign({}, opts, {
+  return genericParser(opts, {
     type: type,
     charset: function validateCharset () { return true },
     defaultCharset: defaultCharset
-  }))
+  })
 }

lib/types/urlencoded.js

@@ -12,7 +12,6 @@
  * @private
  */
 
-var assign = require('object-assign')
 var createError = require('http-errors')
 var debug = require('debug')('body-parser:urlencoded')
 var genericParser = require('../..').generic
@@ -47,7 +46,7 @@ function urlencoded (options) {
       : simpleparser(opts)
   )
 
-  return genericParser(assign({}, opts, {
+  return genericParser(opts, {
     type: type,
     charset: charset,
 
@@ -56,7 +55,7 @@ function urlencoded (options) {
         ? queryparse(buf)
         : {}
     }
-  }))
+  })
 }
 
 /**