Release 3.3.4

Update commander and mkdirp dependencies.

History.md

@@ -1,4 +1,59 @@
 
+3.3.4 / 2013-07-08 
+==================
+
+ * update send and connect
+
+3.3.3 / 2013-07-04 
+==================
+
+ * update connect
+
+3.3.2 / 2013-07-03 
+==================
+
+ * update connect
+ * update send
+ * remove .version export
+
+3.3.1 / 2013-06-27 
+==================
+
+ * update connect
+
+3.3.0 / 2013-06-26 
+==================
+
+ * update connect
+ * add support for multiple X-Forwarded-Proto values. Closes #1646
+ * change: remove charset from json responses. Closes #1631
+ * change: return actual booleans from req.accept* functions
+ * fix jsonp callback array throw
+
+3.2.6 / 2013-06-02 
+==================
+
+ * update connect
+
+3.2.5 / 2013-05-21 
+==================
+
+ * update connect
+ * update node-cookie
+ * add: throw a meaningful error when there is no default engine
+ * change generation of ETags with res.send() to GET requests only. Closes #1619
+
+3.2.4 / 2013-05-09 
+==================
+  
+  * fix `req.subdomains` when no Host is present
+  * fix `req.host` when no Host is present, return undefined
+
+3.2.3 / 2013-05-07 
+==================
+
+  * update connect / qs
+
 3.2.2 / 2013-05-03 
 ==================
 

Readme.md

@@ -64,7 +64,6 @@ app.listen(3000);
   * [Google Group](http://groups.google.com/group/express-js) for discussion
   * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
   * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
-  * [日本語ドキュメンテーション](http://hideyukisaito.com/doc/expressjs/) by [hideyukisaito](https://github.com/hideyukisaito)
   * [Русскоязычная документация](http://jsman.ru/express/)
   * Run express examples [online](https://runnable.com/express)
 

bin/express

@@ -323,10 +323,10 @@ function createApplicationAt(path) {
     // CSS Engine support
     switch (program.css) {
       case 'less':
-        app = app.replace('{css}', eol + '  app.use(require(\'less-middleware\')({ src: __dirname + \'/public\' }));');
+        app = app.replace('{css}', eol + 'app.use(require(\'less-middleware\')({ src: __dirname + \'/public\' }));');
         break;
       case 'stylus':
-        app = app.replace('{css}', eol + '  app.use(require(\'stylus\').middleware(__dirname + \'/public\'));');
+        app = app.replace('{css}', eol + 'app.use(require(\'stylus\').middleware(__dirname + \'/public\'));');
         break;
       default:
         app = app.replace('{css}', '');

examples/big-view/pets.jade

@@ -1,4 +1,4 @@
-style
+style.
   body {
     padding: 50px;
     font: 16px "Helvetica Neue", Helvetica;

examples/expose-data-to-client/views/page.jade

@@ -1,7 +1,7 @@
 html
   head
     title Express
-    script
+    script.
       // call this whatever you like,
       // or dump them into individual
       // props like "var user ="
@@ -10,5 +10,5 @@ html
     h1 Expose client data
     p The following was exposed to the client:
     pre
-      script
+      script.
         document.write(JSON.stringify(data, null, 2))

examples/markdown/index.js

@@ -5,7 +5,7 @@
 
 var express = require('../..')
   , fs = require('fs')
-  , md = require('github-flavored-markdown').parse;
+  , md = require('marked').parse;
 
 var app = module.exports = express();
 

examples/mvc/index.js

@@ -1,4 +1,3 @@
-
 var express = require('../..');
 
 var app = module.exports = express();
@@ -58,10 +57,10 @@ app.use(function(req, res, next){
    });
   */
 
+  next();
   // empty or "flush" the messages so they
   // don't build up
   req.session.messages = [];
-  next();
 });
 
 // load controllers
@@ -90,4 +89,4 @@ app.use(function(req, res, next){
 if (!module.parent) {
   app.listen(3000);
   console.log('\n  listening on port 3000\n');
-}
+}

examples/search/search.jade

@@ -2,7 +2,7 @@
 html
   head
     title Search example
-    style
+    style.
       body {
         font: 14px "Helvetica Neue", Helvetica;
         padding: 50px;

examples/vhost/index.js

@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -6,14 +5,14 @@
 var express = require('../..');
 
 /*
-edit /etc/vhosts:
+edit /etc/hosts:
 
 127.0.0.1       foo.example.com
 127.0.0.1       bar.example.com
 127.0.0.1       example.com
 */
 
-// Main app
+// Main server app
 
 var main = express();
 
@@ -36,12 +35,12 @@ redirect.all('*', function(req, res){
   res.redirect('http://example.com:3000/' + req.subdomains[0]);
 });
 
-// Main app
+// Vhost app
 
 var app = express();
 
-app.use(express.vhost('*.example.com', redirect))
-app.use(express.vhost('example.com', main));
+app.use(express.vhost('*.example.com', redirect)) // Serves all subdomains via Redirect app
+app.use(express.vhost('example.com', main)); // Serves top level domain via Main server app 
 
 app.listen(3000);
 console.log('Express app started on port 3000');

examples/view-constructor/index.js

@@ -6,7 +6,7 @@
 var express = require('../../')
   , http = require('http')
   , GithubView = require('./github-view')
-  , md = require('github-flavored-markdown').parse;
+  , md = require('marked').parse;
 
 var app = module.exports = express();
 

examples/view-locals/layout.jade

@@ -2,7 +2,7 @@ doctype 5
 html
   head
     title= title
-    style
+    style.
       body {
         padding: 50px;
         font: 16px Helvetica, Arial;

lib/application.js

@@ -117,7 +117,6 @@ app.use = function(route, fn){
     fn = function(req, res, next) {
       var orig = req.app;
       app.handle(req, res, function(err){
-        req.app = res.app = orig;
         req.__proto__ = orig.request;
         res.__proto__ = orig.response;
         next(err);

lib/express.js

@@ -16,12 +16,6 @@ var connect = require('connect')
 
 exports = module.exports = createApplication;
 
-/**
- * Framework version.
- */
-
-exports.version = '3.2.2';
-
 /**
  * Expose mime.
  */
@@ -38,8 +32,8 @@ exports.mime = connect.mime;
 function createApplication() {
   var app = connect();
   utils.merge(app, proto);
-  app.request = { __proto__: req };
-  app.response = { __proto__: res };
+  app.request = { __proto__: req, app: app };
+  app.response = { __proto__: res, app: app };
   app.init();
   return app;
 }

lib/middleware.js

@@ -17,7 +17,6 @@ var utils = require('./utils');
 
 exports.init = function(app){
   return function expressInit(req, res, next){
-    req.app = res.app = app;
     if (app.enabled('x-powered-by')) res.setHeader('X-Powered-By', 'Express');
     req.res = res;
     res.req = req;

lib/request.js

@@ -110,7 +110,7 @@ req.accepts = function(type){
  */
 
 req.acceptsEncoding = function(encoding){
-  return ~this.acceptedEncodings.indexOf(encoding);
+  return !! ~this.acceptedEncodings.indexOf(encoding);
 };
 
 /**
@@ -125,7 +125,7 @@ req.acceptsEncoding = function(encoding){
 req.acceptsCharset = function(charset){
   var accepted = this.acceptedCharsets;
   return accepted.length
-    ? ~accepted.indexOf(charset)
+    ? !! ~accepted.indexOf(charset)
     : true;
 };
 
@@ -141,7 +141,7 @@ req.acceptsCharset = function(charset){
 req.acceptsLanguage = function(lang){
   var accepted = this.acceptedLanguages;
   return accepted.length
-    ? ~accepted.indexOf(lang)
+    ? !! ~accepted.indexOf(lang)
     : true;
 };
 
@@ -345,11 +345,10 @@ req.is = function(type){
 
 req.__defineGetter__('protocol', function(){
   var trustProxy = this.app.get('trust proxy');
-  return this.connection.encrypted
-    ? 'https'
-    : trustProxy
-      ? (this.get('X-Forwarded-Proto') || 'http')
-      : 'http';
+  if (this.connection.encrypted) return 'https';
+  if (!trustProxy) return 'http';
+  var proto = this.get('X-Forwarded-Proto') || 'http';
+  return proto.split(/\s*,\s*/)[0];
 });
 
 /**
@@ -445,7 +444,7 @@ req.__defineGetter__('auth', function(){
 
 req.__defineGetter__('subdomains', function(){
   var offset = this.app.get('subdomain offset');
-  return this.get('Host')
+  return (this.host || '')
     .split('.')
     .reverse()
     .slice(offset);
@@ -473,6 +472,7 @@ req.__defineGetter__('host', function(){
   var trustProxy = this.app.get('trust proxy');
   var host = trustProxy && this.get('X-Forwarded-Host');
   host = host || this.get('Host');
+  if (!host) return;
   return host.split(':')[0];
 });
 

lib/response.js

@@ -78,9 +78,9 @@ res.links = function(links){
  */
 
 res.send = function(body){
-  var req = this.req
-    , head = 'HEAD' == req.method
-    , len;
+  var req = this.req;
+  var head = 'HEAD' == req.method;
+  var len;
 
   // allow status / body
   if (2 == arguments.length) {
@@ -128,7 +128,7 @@ res.send = function(body){
 
   // ETag support
   // TODO: W/ support
-  if (len > 1024) {
+  if (len > 1024 && 'GET' == req.method) {
     if (!this.get('ETag')) {
       this.set('ETag', etag(body));
     }
@@ -185,7 +185,6 @@ res.json = function(obj){
   var body = JSON.stringify(obj, replacer, spaces);
 
   // content-type
-  this.charset = this.charset || 'utf-8';
   this.get('Content-Type') || this.set('Content-Type', 'application/json');
 
   return this.send(body);
@@ -234,6 +233,7 @@ res.jsonp = function(obj){
 
   // jsonp
   if (callback) {
+    if (callback instanceof Array) callback = callback[0];
     this.set('Content-Type', 'text/javascript');
     var cb = callback.replace(/[^\[\]\w$.]/g, '');
     body = cb + ' && ' + cb + '(' + body + ');';

lib/view.js

@@ -38,6 +38,7 @@ function View(name, options) {
   var engines = options.engines;
   this.defaultEngine = options.defaultEngine;
   var ext = this.ext = extname(name);
+  if (!ext && !this.defaultEngine) throw new Error('No default engine was specified and no extension was provided.');
   if (!ext) name += (ext = this.ext = ('.' != this.defaultEngine[0] ? '.' : '') + this.defaultEngine);
   this.engine = engines[ext] || (engines[ext] = require(ext.slice(1)).__express);
   this.path = this.lookup(name);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "3.2.2",
+  "version": "3.3.4",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     {
@@ -22,28 +22,27 @@
     }
   ],
   "dependencies": {
-    "connect": "2.7.8",
-    "commander": "0.6.1",
+    "connect": "2.8.4",
+    "commander": "1.2.0",
     "range-parser": "0.0.4",
-    "mkdirp": "0.3.4",
-    "cookie": "0.0.5",
+    "mkdirp": "0.3.5",
+    "cookie": "0.1.0",
     "buffer-crc32": "0.2.1",
     "fresh": "0.1.0",
     "methods": "0.0.1",
-    "send": "0.1.0",
+    "send": "0.1.3",
     "cookie-signature": "1.0.1",
-    "debug": "*",
-    "qs": "0.6.3"
+    "debug": "*"
   },
   "devDependencies": {
     "ejs": "*",
     "mocha": "*",
-    "jade": "*",
+    "jade": "0.30.0",
     "hjs": "*",
     "stylus": "*",
     "should": "*",
     "connect-redis": "*",
-    "github-flavored-markdown": "*",
+    "marked": "*",
     "supertest": "0.6.0"
   },
   "keywords": [

test/exports.js

@@ -4,10 +4,6 @@ var express = require('../')
   , assert = require('assert');
 
 describe('exports', function(){
-  it('should have .version', function(){
-    express.should.have.property('version');
-  })
-  
   it('should expose connect middleware', function(){
     express.should.have.property('bodyParser');
     express.should.have.property('session');
@@ -21,15 +17,15 @@ describe('exports', function(){
   it('should expose Router', function(){
     express.Router.should.be.a('function');
   })
-  
+
   it('should expose the application prototype', function(){
     express.application.set.should.be.a('function');
   })
-  
+
   it('should expose the request prototype', function(){
     express.request.accepts.should.be.a('function');
   })
-  
+
   it('should expose the response prototype', function(){
     express.response.send.should.be.a('function');
   })
@@ -51,7 +47,7 @@ describe('exports', function(){
     .get('/')
     .expect('bar', done);
   })
-  
+
   it('should permit modifying the .response prototype', function(done){
     express.response.foo = function(){ this.send('bar'); };
     var app = express();

test/req.host.js

@@ -0,0 +1,34 @@
+
+var express = require('../')
+  , request = require('./support/http')
+  , assert = require('assert');
+
+describe('req', function(){
+  describe('.host', function(){
+    it('should return the Host when present', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.end(req.host);
+      });
+
+      request(app)
+      .post('/')
+      .set('Host', 'example.com')
+      .expect('example.com', done);
+    })
+
+    it('should return undefined otherwise', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        req.headers.host = null;
+        res.end(String(req.host));
+      });
+
+      request(app)
+      .post('/')
+      .expect('undefined', done);
+    })
+  })
+})

test/req.secure.js

@@ -0,0 +1,83 @@
+
+var express = require('../')
+  , request = require('./support/http');
+
+describe('req', function(){
+  describe('.secure', function(){
+    describe('when X-Forwarded-Proto is missing', function(){
+      it('should return false when http', function(done){
+        var app = express();
+
+        app.get('/', function(req, res){
+          res.send(req.secure ? 'yes' : 'no');
+        });
+
+        request(app)
+        .get('/')
+        .expect('no', done)
+      })
+    })
+  })
+
+  describe('.secure', function(){
+    describe('when X-Forwarded-Proto is present', function(){
+      it('should return false when http', function(done){
+        var app = express();
+
+        app.get('/', function(req, res){
+          res.send(req.secure ? 'yes' : 'no');
+        });
+
+        request(app)
+        .get('/')
+        .set('X-Forwarded-Proto', 'https')
+        .expect('no', done)
+      })
+
+      it('should return true when "trust proxy" is enabled', function(done){
+        var app = express();
+
+        app.enable('trust proxy');
+
+        app.get('/', function(req, res){
+          res.send(req.secure ? 'yes' : 'no');
+        });
+
+        request(app)
+        .get('/')
+        .set('X-Forwarded-Proto', 'https')
+        .expect('yes', done)
+      })
+
+      it('should return false when initial proxy is http', function(done){
+        var app = express();
+
+        app.enable('trust proxy');
+
+        app.get('/', function(req, res){
+          res.send(req.secure ? 'yes' : 'no');
+        });
+
+        request(app)
+        .get('/')
+        .set('X-Forwarded-Proto', 'http, https')
+        .expect('no', done)
+      })
+
+      it('should return true when initial proxy is https', function(done){
+        var app = express();
+
+        app.enable('trust proxy');
+
+        app.get('/', function(req, res){
+          res.send(req.secure ? 'yes' : 'no');
+        });
+
+        request(app)
+        .get('/')
+        .set('X-Forwarded-Proto', 'https, http')
+        .expect('yes', done)
+      })
+    })
+  })
+})

test/req.subdomains.js

@@ -34,6 +34,21 @@ describe('req', function(){
       })
     })
 
+    describe('with no host', function(){
+      it('should return an empty array', function(done){
+        var app = express();
+
+        app.use(function(req, res){
+          req.headers.host = null;
+          res.send(req.subdomains);
+        });
+
+        request(app)
+        .get('/')
+        .expect('[]', done);
+      })
+    })
+
     describe('when subdomain offset is set', function(){
       describe('when subdomain offset is zero', function(){
         it('should return an array with the whole domain', function(done){

test/res.json.js

@@ -28,7 +28,7 @@ describe('res', function(){
         request(app)
         .get('/')
         .end(function(err, res){
-          res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+          res.headers.should.have.property('content-type', 'application/json');
           res.text.should.equal('null');
           done();
         })
@@ -46,13 +46,13 @@ describe('res', function(){
         request(app)
         .get('/')
         .end(function(err, res){
-          res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+          res.headers.should.have.property('content-type', 'application/json');
           res.text.should.equal('["foo","bar","baz"]');
           done();
         })
       })
     })
-    
+
     describe('when given an object', function(){
       it('should respond with json', function(done){
         var app = express();
@@ -64,7 +64,7 @@ describe('res', function(){
         request(app)
         .get('/')
         .end(function(err, res){
-          res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+          res.headers.should.have.property('content-type', 'application/json');
           res.text.should.equal('{"name":"tobi"}');
           done();
         })
@@ -125,7 +125,7 @@ describe('res', function(){
       })
     })
   })
-  
+
   describe('.json(status, object)', function(){
     it('should respond with json and set the .statusCode', function(done){
       var app = express();
@@ -138,7 +138,7 @@ describe('res', function(){
       .get('/')
       .end(function(err, res){
         res.statusCode.should.equal(201);
-        res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+        res.headers.should.have.property('content-type', 'application/json');
         res.text.should.equal('{"id":1}');
         done();
       })
@@ -157,7 +157,7 @@ describe('res', function(){
       .get('/')
       .end(function(err, res){
         res.statusCode.should.equal(201);
-        res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+        res.headers.should.have.property('content-type', 'application/json');
         res.text.should.equal('{"id":1}');
         done();
       })

test/res.send.js

@@ -1,6 +1,7 @@
 
 var express = require('../')
-  , request = require('./support/http');
+  , request = require('./support/http')
+  , assert = require('assert');
 
 describe('res', function(){
   describe('.send(null)', function(){
@@ -16,7 +17,7 @@ describe('res', function(){
       .expect('', done);
     })
   })
-  
+
   describe('.send(undefined)', function(){
     it('should set body to ""', function(done){
       var app = express();
@@ -45,7 +46,7 @@ describe('res', function(){
       .expect(201, done);
     })
   })
-  
+
   describe('.send(code, body)', function(){
     it('should set .statusCode and body', function(done){
       var app = express();
@@ -107,7 +108,24 @@ describe('res', function(){
       .expect('ETag', '"-1498647312"')
       .end(done);
     })
-    
+
+    it('should not set ETag for non-GET/HEAD', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        var str = Array(1024 * 2).join('-');
+        res.send(str);
+      });
+
+      request(app)
+      .post('/')
+      .end(function(err, res){
+        if (err) return done(err);
+        assert(!res.header.etag, 'has an ETag');
+        done();
+      });
+    })
+
     it('should not override Content-Type', function(done){
       var app = express();
 
@@ -122,7 +140,7 @@ describe('res', function(){
       .expect(200, done);
     })
   })
-  
+
   describe('.send(Buffer)', function(){
     it('should send as octet-stream', function(done){
       var app = express();
@@ -172,7 +190,7 @@ describe('res', function(){
       })
     })
   })
-  
+
   describe('.send(Object)', function(){
     it('should send as application/json', function(done){
       var app = express();
@@ -184,7 +202,7 @@ describe('res', function(){
       request(app)
       .get('/')
       .end(function(err, res){
-        res.headers.should.have.property('content-type', 'application/json; charset=utf-8');
+        res.headers.should.have.property('content-type', 'application/json');
         res.text.should.equal('{"name":"tobi"}');
         done();
       })
@@ -224,7 +242,7 @@ describe('res', function(){
       })
     })
   })
-  
+
   describe('when .statusCode is 304', function(){
     it('should strip Content-* fields, Transfer-Encoding field, and body', function(done){
       var app = express();