Added .end() callback arity check to node side

Author: tj

lib/node/index.js

@@ -121,7 +121,7 @@ function Request(method, url) {
   this._buffer = true;
   this.attachments = [];
   this.on('response', function(res){
-    self.callback(res);
+    self.callback(null, res);
   });
 }
 
@@ -380,7 +380,7 @@ Request.prototype.redirect = function(res){
   this._data = null;
   this.url = url;
   this.emit('redirect', res);
-  this.end(this.callback);
+  this.end(this._callback);
   return this;
 };
 
@@ -468,6 +468,21 @@ Request.prototype.request = function(){
   return req;
 };
 
+/**
+ * Invoke the callback with `err` and `res`
+ * and handle arity check.
+ *
+ * @param {Error} err
+ * @param {Response} res
+ * @api private
+ */
+
+Request.prototype.callback = function(err, res){
+  var fn = this._callback;
+  if (2 == fn.length) return fn(err, res);
+  fn(res); // TODO: emit error
+};
+
 /**
  * Initiate request, invoking callback `fn(err, res)`
  * with an instanceof `Response`.
@@ -485,7 +500,7 @@ Request.prototype.end = function(fn){
     , method = this.method;
 
   // store callback
-  this.callback = fn || noop;
+  this._callback = fn || noop;
 
   // body
   switch (method) {
@@ -536,7 +551,7 @@ Request.prototype.end = function(fn){
         response.body = fields;
         response.files = files;
         self.emit('end');
-        self.callback(response);
+        self.callback(null, response);
       });
       return;
     }

test/node/basic.js

@@ -284,4 +284,17 @@ describe('request', function(){
       })
     })
   })
+
+  describe('.end(fn)', function(){
+    it('should check arity', function(done){
+      request
+      .post('http://localhost:3000/echo')
+      .send({ name: 'tobi' })
+      .end(function(err, res){
+        assert(null == err);
+        res.text.should.equal('{"name":"tobi"}');
+        done();
+      });
+    })
+  })
 })