DRY formData construction

Author: kornelski

Diff for: lib/client.js

@@ -691,11 +691,17 @@ Request.prototype.query = function(val){
  */
 
 Request.prototype.attach = function(field, file, filename){
-  if (!this._formData) this._formData = new root.FormData();
-  this._formData.append(field, file, filename || file.name);
+  this._getFormData().append(field, file, filename || file.name);
   return this;
 };
 
+Request.prototype._getFormData = function(){
+  if (!this._formData) {
+    this._formData = new root.FormData();
+  }
+  return this._formData;
+};
+
 /**
  * Send `data` as the request body, defaulting the `.type()` to "json" when
  * an object is given.

Diff for: lib/node/index.js

@@ -177,24 +177,28 @@ for (var key in requestBase) {
  */
 
 Request.prototype.attach = function(field, file, filename){
-  if (!this._formData) {
-    this._formData = new FormData();
-    this._formData.on('error', function(err) {
-      this.emit('error', err);
-      this.abort();
-    }.bind(this));
-  }
   if ('string' == typeof file) {
     if (!filename) filename = file;
     debug('creating `fs.ReadStream` instance for file: %s', file);
     file = fs.createReadStream(file);
-  } else if(!filename && file.path) {
+  } else if (!filename && file.path) {
     filename = file.path;
   }
-  this._formData.append(field, file, { filename: filename });
+  this._getFormData().append(field, file, { filename: filename });
   return this;
 };
 
+Request.prototype._getFormData = function() {
+  if (!this._formData) {
+    this._formData = new FormData();
+    this._formData.on('error', function(err) {
+      this.emit('error', err);
+      this.abort();
+    }.bind(this));
+  }
+  return this._formData;
+};
+
 /**
  * Set the max redirects to `n`.
  *

Diff for: lib/node/part.js

@@ -125,14 +125,7 @@ Part.prototype._attach = function(){
   if (!this._name) throw new Error('must call `Part#name()` first!');
 
   // add `this` Stream's readable side as a stream for this Part
-  if (!this._req._formData) {
-    this._req._formData = new FormData();
-    this._req._formData.on('error', function(err) {
-      this._req.emit('error', err);
-      this._req.abort();
-    }.bind(this));
-  }
-  this._req._formData.append(this._name, this, {
+  this._req._getFormData().append(this._name, this, {
     contentType: this._type,
     filename: this._filename
   });

Diff for: lib/request-base.js

@@ -161,14 +161,6 @@ exports.unset = function(field){
  * @api public
  */
 exports.field = function(name, val) {
-  if (!this._formData) {
-    var FormData = require('form-data'); // browserify compatible. May throw if FormData is not supported natively.
-    this._formData = new FormData();
-    this._formData.on('error', function(err) {
-      this.emit('error', err);
-      this.abort();
-    }.bind(this));
-  }
-  this._formData.append(name, val);
+  this._getFormData().append(name, val);
   return this;
 };