superagent 0.20.0 → 0.21.0

package/History.md

@@ -1,3 +1,13 @@
+
+0.21.0 / 2014-11-11
+==================
+
+ * Trim text before parsing json (gjohnson)
+ * Update tests to express 4 (gaastonsr)
+ * Prevent double callback when error is thrown (pgn-vole)
+ * Fix missing clearTimeout (nickdima)
+ * Update debug (TooTallNate)
+
 0.20.0 / 2014-10-02
 ==================
 

package/component.json

@@ -2,7 +2,7 @@
   "name": "superagent",
   "repo": "visionmedia/superagent",
   "description": "awesome http requests",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "keywords": [
     "http",
     "ajax",

package/lib/client.js

@@ -294,7 +294,9 @@ function Response(req, options) {
   options = options || {};
   this.req = req;
   this.xhr = this.req.xhr;
-  this.text = this.xhr.responseText;
+  this.text = this.req.method !='HEAD' 
+     ? this.xhr.responseText 
+     : null;
   this.setStatusProperties(this.xhr.status);
   this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());
   // getAllResponseHeaders sometimes falsely returns "" for CORS requests, but
@@ -450,16 +452,18 @@ function Request(method, url) {
   this.header = {};
   this._header = {};
   this.on('end', function(){
+    var err = null;
+    var res = null;
+
     try {
-      var res = new Response(self);
-      if ('HEAD' == method) res.text = null;
-      self.callback(null, res);
+      res = new Response(self); 
     } catch(e) {
-      var err = new Error('Parser is unable to parse the response');
+      err = new Error('Parser is unable to parse the response');
       err.parse = true;
       err.original = e;
-      self.callback(err);
     }
+
+    self.callback(err, res);
   });
 }
 
@@ -806,6 +810,7 @@ Request.prototype.send = function(data){
 
 Request.prototype.callback = function(err, res){
   var fn = this._callback;
+  this.clearTimeout();
   if (2 == fn.length) return fn(err, res);
   if (err) return this.emit('error', err);
   fn(res);

package/lib/node/parsers/json.js

@@ -5,9 +5,12 @@ module.exports = function(res, fn){
   res.on('data', function(chunk){ res.text += chunk; });
   res.on('end', function(){
     try {
-      fn(null, JSON.parse(res.text));
-    } catch (err) {
-      fn(err);
+      var text = res.text && res.text.replace(/^\s*|\s*$/g, '');
+      var body = text && JSON.parse(text);
+    } catch (e) {
+      var err = e;
+    } finally {
+      fn(err, body);
     }
   });
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "test": "make test"
@@ -26,18 +26,22 @@
     "component-emitter": "1.1.2",
     "methods": "1.0.1",
     "cookiejar": "2.0.1",
-    "debug": "~2.0.0",
+    "debug": "2",
     "reduce-component": "1.0.1",
     "extend": "~1.2.1",
     "form-data": "0.1.3",
     "readable-stream": "1.0.27-1"
   },
   "devDependencies": {
-    "zuul": "~1.6.0",
-    "express": "3.5.0",
+    "basic-auth-connect": "^1.0.0",
     "better-assert": "~1.0.1",
+    "body-parser": "^1.9.2",
+    "cookie-parser": "^1.3.3",
+    "express": "^4.9.8",
+    "express-session": "^1.9.1",
+    "mocha": "*",
     "should": "3.1.3",
-    "mocha": "*"
+    "zuul": "~1.6.0"
   },
   "browser": {
     "./lib/node/index.js": "./lib/client.js",

package/superagent.js

@@ -690,7 +690,9 @@ function Response(req, options) {
   options = options || {};
   this.req = req;
   this.xhr = this.req.xhr;
-  this.text = this.xhr.responseText;
+  this.text = this.req.method !='HEAD' 
+     ? this.xhr.responseText 
+     : null;
   this.setStatusProperties(this.xhr.status);
   this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());
   // getAllResponseHeaders sometimes falsely returns "" for CORS requests, but
@@ -846,16 +848,18 @@ function Request(method, url) {
   this.header = {};
   this._header = {};
   this.on('end', function(){
+    var err = null;
+    var res = null;
+
     try {
-      var res = new Response(self);
-      if ('HEAD' == method) res.text = null;
-      self.callback(null, res);
+      res = new Response(self); 
     } catch(e) {
-      var err = new Error('Parser is unable to parse the response');
+      err = new Error('Parser is unable to parse the response');
       err.parse = true;
       err.original = e;
-      self.callback(err);
     }
+
+    self.callback(err, res);
   });
 }
 
@@ -1202,6 +1206,7 @@ Request.prototype.send = function(data){
 
 Request.prototype.callback = function(err, res){
   var fn = this._callback;
+  this.clearTimeout();
   if (2 == fn.length) return fn(err, res);
   if (err) return this.emit('error', err);
   fn(res);