Refactored req/res proto assignments

since the names may change in the near future (is suspect at least)
due to inconsistancies

Author: tj

lib/request.js

@@ -11,7 +11,8 @@
 
 var http = require('http')
   , utils = require('./utils')
-  , mime = require('connect').utils.mime;
+  , mime = require('connect').utils.mime
+  , req = http.IncomingMessage.prototype;
 
 /**
  * Default flash formatters.
@@ -48,7 +49,7 @@ var flashFormatters = exports.flashFormatters = {
  * @api public
  */
 
-http.IncomingMessage.prototype.header = function(name, defaultValue){
+req.header = function(name, defaultValue){
   return this.headers[name.toLowerCase()] || defaultValue;
 };
 
@@ -82,7 +83,7 @@ http.IncomingMessage.prototype.header = function(name, defaultValue){
  * @api public
  */
 
-http.IncomingMessage.prototype.accepts = function(type){
+req.accepts = function(type){
   var accept = this.header('Accept');
 
   // Normalize extensions ".json" -> "json"
@@ -125,7 +126,7 @@ http.IncomingMessage.prototype.accepts = function(type){
  * @api public
  */
 
-http.IncomingMessage.prototype.param = function(name, defaultValue){
+req.param = function(name, defaultValue){
   // Route params like /user/:id
   if (this.params[name] !== undefined) {
     return this.params[name]; 
@@ -176,7 +177,7 @@ http.IncomingMessage.prototype.param = function(name, defaultValue){
  * @api public
  */
 
-http.IncomingMessage.prototype.flash = function(type, msg){
+req.flash = function(type, msg){
   var msgs = this.session.flash = this.session.flash || {};
   if (type && msg) {
     var i = 2
@@ -243,7 +244,7 @@ http.IncomingMessage.prototype.flash = function(type, msg){
  * @api public
  */
 
-http.IncomingMessage.prototype.is = function(type){
+req.is = function(type){
   var fn = this.app.is(type);
   if (fn) return fn(this);
   var contentType = this.headers['content-type'];
@@ -273,5 +274,5 @@ function isxhr() {
  * @api public
  */
 
-http.IncomingMessage.prototype.__defineGetter__('isXMLHttpRequest', isxhr);
-http.IncomingMessage.prototype.__defineGetter__('xhr', isxhr);
+req.__defineGetter__('isXMLHttpRequest', isxhr);
+req.__defineGetter__('xhr', isxhr);

lib/response.js

@@ -15,7 +15,8 @@ var fs = require('fs')
   , pump = require('sys').pump
   , utils = require('connect').utils
   , parseRange = require('./utils').parseRange
-  , mime = utils.mime;
+  , mime = utils.mime
+  , res = http.ServerResponse.prototype;
 
 /**
  * Header fields supporting multiple values.
@@ -45,7 +46,7 @@ var multiple = ['Set-Cookie'];
  * @api public
  */
 
-http.ServerResponse.prototype.send = function(body, headers, status){
+res.send = function(body, headers, status){
   // Allow status as second arg
   if (typeof headers === 'number') {
     status = headers,
@@ -129,7 +130,7 @@ http.ServerResponse.prototype.send = function(body, headers, status){
  * @api public
  */
 
-http.ServerResponse.prototype.sendfile = function(path, fn){
+res.sendfile = function(path, fn){
   var self = this
     , ranges = self.req.headers.range
     , head = 'HEAD' == self.req.method;
@@ -202,7 +203,7 @@ http.ServerResponse.prototype.sendfile = function(path, fn){
  * @api public
  */
 
-http.ServerResponse.prototype.contentType = function(type){
+res.contentType = function(type){
   if (!~type.indexOf('.')) type = '.' + type;
   return this.header('Content-Type', mime.type(type));
 };
@@ -215,7 +216,7 @@ http.ServerResponse.prototype.contentType = function(type){
  * @api public
  */
 
-http.ServerResponse.prototype.attachment = function(filename){
+res.attachment = function(filename){
   this.header('Content-Disposition', filename
     ? 'attachment; filename="' + path.basename(filename) + '"'
     : 'attachment');
@@ -234,7 +235,7 @@ http.ServerResponse.prototype.attachment = function(filename){
  * @api public
  */
 
-http.ServerResponse.prototype.download = function(path, filename, fn){
+res.download = function(path, filename, fn){
   this.attachment(filename || path).sendfile(path, fn);
 };
 
@@ -253,7 +254,7 @@ http.ServerResponse.prototype.download = function(path, filename, fn){
  * @api public
  */
 
-http.ServerResponse.prototype.header = function(name, val){
+res.header = function(name, val){
   if (val === undefined) {
     return this.headers[name];
   } else {
@@ -270,7 +271,7 @@ http.ServerResponse.prototype.header = function(name, val){
  * @api public
  */
 
-http.ServerResponse.prototype.clearCookie = function(name){
+res.clearCookie = function(name){
   this.cookie(name, '', { expires: new Date(1) });
 };
 
@@ -288,7 +289,7 @@ http.ServerResponse.prototype.clearCookie = function(name){
  * @api public
  */
 
-http.ServerResponse.prototype.cookie = function(name, val, options){
+res.cookie = function(name, val, options){
   var cookie = utils.serializeCookie(name, val, options);
   this.header('Set-Cookie', cookie);
 };
@@ -334,7 +335,7 @@ http.ServerResponse.prototype.cookie = function(name, val, options){
  * @api public
  */
 
-http.ServerResponse.prototype.redirect = function(url, status){
+res.redirect = function(url, status){
   var basePath = this.app.set('home') || '/'
     , status = status || 302
     , body;
@@ -379,7 +380,7 @@ http.ServerResponse.prototype.redirect = function(url, status){
  * @api public
  */
 
-http.ServerResponse.prototype.local = function(name, val){
+res.local = function(name, val){
   this.locals = this.locals || {};
   return undefined === val
     ? this.locals[name]