diff --git a/History.md b/History.md index eab1b1456e..9420d3439e 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,22 @@ +2.0.0beta3 / 2011-03-09 +================== + + * Added support for `res.contentType()` literal + The original `res.contentType('.json')`, + `res.contentType('application/json')`, and `res.contentType('json')` + will work now. + * Added `res.render()` status option support back + * Added charset option for `res.render()` + * Added `.charset` support (via connect 1.0.4) + * Added view resolution hints when in development and a lookup fails + * Added layout lookup support relative to the page view. + For example while rendering `./views/user/index.jade` if you create + `./views/user/layout.jade` it will be used in favour of the root layout. + * Fixed `res.redirect()`. RFC states absolute url [reported by unlink] + * Fixed; default `res.send()` string charset to utf8 + * Removed `Partial` constructor (not currently used) + 2.0.0beta2 / 2011-03-07 ================== diff --git a/bin/express b/bin/express index 0962b59224..6f8e0abb4d 100755 --- a/bin/express +++ b/bin/express @@ -11,7 +11,7 @@ var fs = require('fs') * Framework version. */ -var version = '2.0.0beta2'; +var version = '2.0.0beta3'; /** * Add session support. diff --git a/docs/guide.md b/docs/guide.md index 00931f8842..11bf7a2292 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -783,6 +783,10 @@ A literal _Content-Type_ works as well: res.contentType('application/json'); +Or simply the extension without leading `.`: + + res.contentType('json'); + ### res.attachment([filename]) Sets the _Content-Disposition_ response header to "attachment", with optional _filename_. diff --git a/lib/express.js b/lib/express.js index c0c1e9a1a5..8573ea7c7a 100644 --- a/lib/express.js +++ b/lib/express.js @@ -27,7 +27,7 @@ var exports = module.exports = connect.middleware; * Framework version. */ -exports.version = '2.0.0beta2'; +exports.version = '2.0.0beta3'; /** * Shortcut for `new Server(...)`. diff --git a/package.json b/package.json index e68e7c9689..6e9edb05cc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "express", "description": "Sinatra inspired web development framework", - "version": "2.0.0beta2", + "version": "2.0.0beta3", "author": "TJ Holowaychuk ", "contributors": [ { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, diff --git a/test/response.test.js b/test/response.test.js index 77d5fbf29e..6b91b503c2 100644 --- a/test/response.test.js +++ b/test/response.test.js @@ -30,7 +30,7 @@ module.exports = { app.get('/text', function(req, res){ res.header('X-Foo', 'bar'); - res.contentType('.txt'); + res.contentType('txt'); res.send('wahoo'); });