superagent 1.8.1 → 1.8.5

package/History.md

@@ -1,3 +1,10 @@
+# 1.8.2 (2016-03-20)
+
+  * Fixed handling of HTTP status 204 with content-encoding: gzip (Andrew Shelton)
+  * Handling of FormData error events (scriptype)
+  * Fixed parsing of `vnd+json` MIME types (Kornel Lesiński)
+  * Aliased browser implementation of `.parse()` as `.serialize()` for forward compatibility
+
 # 1.8.1 (2016-03-14)
 
   * Fixed form-data incompatibility with IE9

package/bower.json

@@ -1,7 +1,4 @@
 {
   "name": "superagent",
-  "main": "lib/client.js",
-  "dependencies": {
-    "form-data": "form-data-superagent#^1.0.0"
-  }
+  "main": "lib/client.js"
 }

package/component.json

@@ -1,8 +1,8 @@
 {
   "name": "superagent",
   "repo": "visionmedia/superagent",
-  "description": "awesome http requests",
-  "version": "1.2.0",
+  "version": "1.8.2",
+  "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "keywords": [
     "http",
     "ajax",

package/lib/client.js

@@ -390,6 +390,9 @@ Response.prototype.setHeaderProperties = function(header){
 
 Response.prototype.parseBody = function(str){
   var parse = request.parse[this.type];
+  if (!parse && isJSON(this.type)) {
+    parse = request.parse['application/json'];
+  }
   return parse && str && (str.length || str instanceof Object)
     ? parse(str)
     : null;
@@ -544,7 +547,7 @@ for (var key in requestBase) {
 Request.prototype.abort = function(){
   if (this.aborted) return;
   this.aborted = true;
-  this.xhr.abort();
+  this.xhr && this.xhr.abort();
   this.clearTimeout();
   this.emit('abort');
   return this;
@@ -691,11 +694,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.
@@ -764,6 +773,22 @@ Request.prototype.send = function(data){
   return this;
 };
 
+/**
+ * @deprecated
+ */
+Response.prototype.parse = function serialize(fn){
+  if (root.console) {
+    console.warn("Client-side parse() method has been renamed to serialize(). This method is not compatible with superagent v2.0");
+  }
+  this.serialize(fn);
+  return this;
+};
+
+Response.prototype.serialize = function serialize(fn){
+  this._parser = fn;
+  return this;
+};
+
 /**
  * Invoke the callback with `err` and `res`
  * and handle arity check.

package/lib/node/index.js

@@ -177,18 +177,28 @@ for (var key in requestBase) {
  */
 
 Request.prototype.attach = function(field, file, filename){
-  if (!this._formData) this._formData = new FormData();
   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`.
  *
@@ -429,7 +439,7 @@ Request.prototype.pipe = function(stream, options){
       return self.redirect(res).pipe(stream, options);
     }
 
-    if (/^(deflate|gzip)$/.test(res.headers['content-encoding'])) {
+    if (self._shouldUnzip(res)) {
       res.pipe(zlib.createUnzip()).pipe(stream, options);
     } else {
       res.pipe(stream, options);
@@ -662,7 +672,7 @@ Request.prototype.callback = function(err, res){
   // Avoid the error which is emitted from 'socket hang up' to cause the fn undefined error on JS runtime.
   var fn = this._callback || noop;
   this.clearTimeout();
-  if (this.called) return console.warn('double callback!');
+  if (this.called) return console.warn('superagent: double callback bug. Upgrade to v3.2+ to fix this');
   this.called = true;
 
   if (err) {
@@ -811,10 +821,11 @@ Request.prototype.end = function(fn){
     }
 
     // zlib support
-    if (/^(deflate|gzip)$/.test(res.headers['content-encoding'])) {
+    if (self._shouldUnzip(res)) {
       utils.unzip(req, res);
     }
 
+
     // don't buffer multipart
     if (multipart) buffer = false;
 
@@ -962,6 +973,25 @@ Request.prototype.end = function(fn){
   return this;
 };
 
+/**
+ * Check whether response has a non-0-sized gzip-encoded body
+ */
+Request.prototype._shouldUnzip = function(res){
+  if (res.statusCode === 204 || res.statusCode === 304) {
+    // These aren't supposed to have any body
+    return false;
+  }
+
+  // header content is a string, and distinction between 0 and no information is crucial
+  if ('0' === res.headers['content-length']) {
+    // We know that the body is empty (unfortunately, this check does not cover chunked encoding)
+    return false;
+  }
+
+  // console.log(res);
+  return /^\s*(?:deflate|gzip)\s*$/.test(res.headers['content-encoding']);
+};
+
 /**
  * To json.
  *

package/lib/node/part.js

@@ -125,8 +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.append(this._name, this, {
+  this._req._getFormData().append(this._name, this, {
     contentType: this._type,
     filename: this._filename
   });

package/lib/request-base.js

@@ -161,10 +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.append(name, val);
+  this._getFormData().append(name, val);
   return this;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "1.8.1",
+  "version": "1.8.5",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "prepublish": "make all",
@@ -15,6 +15,8 @@
   "license": "MIT",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
+    "Kornel Lesiński <kornel@geekhood.net>",
+    "Peter Lyons <pete@peterlyons.com>",
     "Hunter Loftis <hunter@hunterloftis.com>"
   ],
   "repository": {

package/superagent.js

@@ -177,15 +177,11 @@ 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.append(name, val);
+  this._getFormData().append(name, val);
   return this;
 };
 
-},{"./is-object":1,"form-data":5}],3:[function(require,module,exports){
+},{"./is-object":1}],3:[function(require,module,exports){
 // The node and browser modules expose versions of this with the
 // appropriate constructor function bound as first argument
 /**
@@ -220,171 +216,171 @@ function request(RequestConstructor, method, url) {
 module.exports = request;
 
 },{}],4:[function(require,module,exports){
-
-/**
- * Expose `Emitter`.
- */
-
-module.exports = Emitter;
-
-/**
- * Initialize a new `Emitter`.
- *
- * @api public
- */
-
-function Emitter(obj) {
-  if (obj) return mixin(obj);
-};
-
-/**
- * Mixin the emitter properties.
- *
- * @param {Object} obj
- * @return {Object}
- * @api private
- */
-
-function mixin(obj) {
-  for (var key in Emitter.prototype) {
-    obj[key] = Emitter.prototype[key];
-  }
-  return obj;
-}
-
-/**
- * Listen on the given `event` with `fn`.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
-    .push(fn);
-  return this;
-};
-
-/**
- * Adds an `event` listener that will be invoked a single
- * time then automatically removed.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.once = function(event, fn){
-  function on() {
-    this.off(event, on);
-    fn.apply(this, arguments);
-  }
-
-  on.fn = fn;
-  this.on(event, on);
-  return this;
-};
-
-/**
- * Remove the given callback for `event` or all
- * registered callbacks.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.off =
-Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
-  var callbacks = this._callbacks['$' + event];
-  if (!callbacks) return this;
-
-  // remove all handlers
-  if (1 == arguments.length) {
-    delete this._callbacks['$' + event];
-    return this;
-  }
-
-  // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
-  return this;
-};
-
-/**
- * Emit `event` with the given args.
- *
- * @param {String} event
- * @param {Mixed} ...
- * @return {Emitter}
- */
-
-Emitter.prototype.emit = function(event){
-  this._callbacks = this._callbacks || {};
-  var args = [].slice.call(arguments, 1)
-    , callbacks = this._callbacks['$' + event];
-
-  if (callbacks) {
-    callbacks = callbacks.slice(0);
-    for (var i = 0, len = callbacks.length; i < len; ++i) {
-      callbacks[i].apply(this, args);
-    }
-  }
-
-  return this;
-};
-
-/**
- * Return array of callbacks for `event`.
- *
- * @param {String} event
- * @return {Array}
- * @api public
- */
-
-Emitter.prototype.listeners = function(event){
-  this._callbacks = this._callbacks || {};
-  return this._callbacks['$' + event] || [];
-};
-
-/**
- * Check if this emitter has `event` handlers.
- *
- * @param {String} event
- * @return {Boolean}
- * @api public
- */
-
-Emitter.prototype.hasListeners = function(event){
-  return !! this.listeners(event).length;
-};
+
+/**
+ * Expose `Emitter`.
+ */
+
+if (typeof module !== 'undefined') {
+  module.exports = Emitter;
+}
+
+/**
+ * Initialize a new `Emitter`.
+ *
+ * @api public
+ */
+
+function Emitter(obj) {
+  if (obj) return mixin(obj);
+};
+
+/**
+ * Mixin the emitter properties.
+ *
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+function mixin(obj) {
+  for (var key in Emitter.prototype) {
+    obj[key] = Emitter.prototype[key];
+  }
+  return obj;
+}
+
+/**
+ * Listen on the given `event` with `fn`.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.on =
+Emitter.prototype.addEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
+    .push(fn);
+  return this;
+};
+
+/**
+ * Adds an `event` listener that will be invoked a single
+ * time then automatically removed.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.once = function(event, fn){
+  function on() {
+    this.off(event, on);
+    fn.apply(this, arguments);
+  }
+
+  on.fn = fn;
+  this.on(event, on);
+  return this;
+};
+
+/**
+ * Remove the given callback for `event` or all
+ * registered callbacks.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.off =
+Emitter.prototype.removeListener =
+Emitter.prototype.removeAllListeners =
+Emitter.prototype.removeEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+
+  // all
+  if (0 == arguments.length) {
+    this._callbacks = {};
+    return this;
+  }
+
+  // specific event
+  var callbacks = this._callbacks['$' + event];
+  if (!callbacks) return this;
+
+  // remove all handlers
+  if (1 == arguments.length) {
+    delete this._callbacks['$' + event];
+    return this;
+  }
+
+  // remove specific handler
+  var cb;
+  for (var i = 0; i < callbacks.length; i++) {
+    cb = callbacks[i];
+    if (cb === fn || cb.fn === fn) {
+      callbacks.splice(i, 1);
+      break;
+    }
+  }
+  return this;
+};
+
+/**
+ * Emit `event` with the given args.
+ *
+ * @param {String} event
+ * @param {Mixed} ...
+ * @return {Emitter}
+ */
+
+Emitter.prototype.emit = function(event){
+  this._callbacks = this._callbacks || {};
+  var args = [].slice.call(arguments, 1)
+    , callbacks = this._callbacks['$' + event];
+
+  if (callbacks) {
+    callbacks = callbacks.slice(0);
+    for (var i = 0, len = callbacks.length; i < len; ++i) {
+      callbacks[i].apply(this, args);
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Return array of callbacks for `event`.
+ *
+ * @param {String} event
+ * @return {Array}
+ * @api public
+ */
+
+Emitter.prototype.listeners = function(event){
+  this._callbacks = this._callbacks || {};
+  return this._callbacks['$' + event] || [];
+};
+
+/**
+ * Check if this emitter has `event` handlers.
+ *
+ * @param {String} event
+ * @return {Boolean}
+ * @api public
+ */
+
+Emitter.prototype.hasListeners = function(event){
+  return !! this.listeners(event).length;
+};
 
 },{}],5:[function(require,module,exports){
-module.exports = FormData;
-},{}],6:[function(require,module,exports){
 
 /**
  * Reduce `arr` with `fn`.
@@ -409,7 +405,7 @@ module.exports = function(arr, fn, initial){
   
   return curr;
 };
-},{}],7:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 /**
  * Module dependencies.
  */
@@ -802,6 +798,9 @@ Response.prototype.setHeaderProperties = function(header){
 
 Response.prototype.parseBody = function(str){
   var parse = request.parse[this.type];
+  if (!parse && isJSON(this.type)) {
+    parse = request.parse['application/json'];
+  }
   return parse && str && (str.length || str instanceof Object)
     ? parse(str)
     : null;
@@ -956,7 +955,7 @@ for (var key in requestBase) {
 Request.prototype.abort = function(){
   if (this.aborted) return;
   this.aborted = true;
-  this.xhr.abort();
+  this.xhr && this.xhr.abort();
   this.clearTimeout();
   this.emit('abort');
   return this;
@@ -1103,11 +1102,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.
@@ -1176,6 +1181,22 @@ Request.prototype.send = function(data){
   return this;
 };
 
+/**
+ * @deprecated
+ */
+Response.prototype.parse = function serialize(fn){
+  if (root.console) {
+    console.warn("Client-side parse() method has been renamed to serialize(). This method is not compatible with superagent v2.0");
+  }
+  this.serialize(fn);
+  return this;
+};
+
+Response.prototype.serialize = function serialize(fn){
+  this._parser = fn;
+  return this;
+};
+
 /**
  * Invoke the callback with `err` and `res`
  * and handle arity check.
@@ -1463,5 +1484,5 @@ request.put = function(url, data, fn){
   return req;
 };
 
-},{"./is-object":1,"./request":3,"./request-base":2,"emitter":4,"reduce":6}]},{},[7])(7)
+},{"./is-object":1,"./request":3,"./request-base":2,"emitter":4,"reduce":5}]},{},[6])(6)
 });