Release 3.2.5

Throw a meaningful error when there is no default engine

History.md

@@ -1,4 +1,12 @@
 
+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 
 ==================
   

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/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();
 

lib/express.js

@@ -20,7 +20,7 @@ exports = module.exports = createApplication;
  * Framework version.
  */
 
-exports.version = '3.2.4';
+exports.version = '3.2.5';
 
 /**
  * Expose mime.

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));
     }

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.4",
+  "version": "3.2.5",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     {
@@ -22,11 +22,11 @@
     }
   ],
   "dependencies": {
-    "connect": "2.7.9",
+    "connect": "2.7.10",
     "commander": "0.6.1",
     "range-parser": "0.0.4",
     "mkdirp": "0.3.4",
-    "cookie": "0.0.5",
+    "cookie": "0.1.0",
     "buffer-crc32": "0.2.1",
     "fresh": "0.1.0",
     "methods": "0.0.1",
@@ -42,7 +42,7 @@
     "stylus": "*",
     "should": "*",
     "connect-redis": "*",
-    "github-flavored-markdown": "*",
+    "marked": "*",
     "supertest": "0.6.0"
   },
   "keywords": [

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();
@@ -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();