Release 2.5.3

Use os.platform to determine End-of-line

History.md

@@ -1,4 +1,9 @@
 
+2.5.3 / 2011-12-30 
+==================
+
+  * Fixed `req.is()` when a charset is present
+
 2.5.2 / 2011-12-10 
 ==================
 

bin/express

@@ -5,6 +5,7 @@
  */
 
 var fs = require('fs')
+  , os = require('os')
   , exec = require('child_process').exec
   , mkdirp = require('mkdirp');
 
@@ -26,6 +27,12 @@ var sessions = false;
 
 var cssEngine;
 
+/**
+ * End-of-line code.
+ */
+
+var eol = 'win32' == os.platform() ? '\r\n' : '\n';
+
 /**
  * Template engine to utilize.
  */
@@ -61,7 +68,7 @@ var index = [
   , 'exports.index = function(req, res){'
   , '  res.render(\'index\', { title: \'Express\' })'
   , '};'
-].join('\r\n');
+].join(eol);
 
 /**
  * Jade layout template.
@@ -74,7 +81,7 @@ var jadeLayout = [
   , '    title= title'
   , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
   , '  body!= body'
-].join('\r\n');
+].join(eol);
 
 /**
  * Jade index template.
@@ -83,7 +90,7 @@ var jadeLayout = [
 var jadeIndex = [
     'h1= title'
   , 'p Welcome to #{title}'
-].join('\r\n');
+].join(eol);
 
 /**
  * EJS layout template.
@@ -100,7 +107,7 @@ var ejsLayout = [
   , '    <%- body %>'
   , '  </body>'
   , '</html>'
-].join('\r\n');
+].join(eol);
 
 /**
  * EJS index template.
@@ -109,7 +116,7 @@ var ejsLayout = [
 var ejsIndex = [
     '<h1><%= title %></h1>'
   , '<p>Welcome to <%= title %></p>'
-  ].join('\r\n');
+  ].join(eol);
 
 /**
  * Default css template.
@@ -124,7 +131,7 @@ var css = [
   , 'a {'
   , '  color: #00B7FF;'
   , '}'
-].join('\r\n');
+].join(eol);
 
 /**
  * Default stylus template.
@@ -136,7 +143,7 @@ var stylus = [
   , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif'
   , 'a'
   , '  color: #00B7FF'
-].join('\r\n');
+].join(eol);
 
 /**
  * App template.
@@ -179,7 +186,7 @@ var app = [
   , 'app.listen(3000);'
   , 'console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);'
   , ''
-].join('\r\n');
+].join(eol);
 
 // Parse arguments
 
@@ -287,7 +294,7 @@ function createApplicationAt(path) {
     // CSS Engine support
     switch (cssEngine) {
       case 'stylus':
-        app = app.replace('{css}', '\r\n  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
+        app = app.replace('{css}', eol + '  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
         break;
       default:
         app = app.replace('{css}', '');
@@ -295,22 +302,22 @@ function createApplicationAt(path) {
 
     // Session support
     app = app.replace('{sess}', sessions
-      ? '\r\n  app.use(express.cookieParser());\r\n  app.use(express.session({ secret: \'your secret here\' }));'
+      ? eol + '  app.use(express.cookieParser());' + eol + '  app.use(express.session({ secret: \'your secret here\' }));'
       : '');
 
     // Template support
     app = app.replace(':TEMPLATE', templateEngine);
 
     // package.json
-    var json = '{\r\n';
-    json += '    "name": "application-name"\r\n';
-    json += '  , "version": "0.0.1"\r\n';
-    json += '  , "private": true\r\n';
-    json += '  , "dependencies": {\r\n';
-    json += '      "express": "' + version + '"\r\n';
-    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"\r\n';
-    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"\r\n';
-    json += '  }\r\n';
+    var json = '{' + eol;
+    json += '    "name": "application-name"' + eol;
+    json += '  , "version": "0.0.1"' + eol;
+    json += '  , "private": true' + eol;
+    json += '  , "dependencies": {' + eol;
+    json += '      "express": "' + version + '"' + eol;
+    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"' + eol;
+    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"' + eol;
+    json += '  }' + eol;
     json += '}';
 
 

lib/express.js

@@ -28,7 +28,7 @@ var exports = module.exports = connect.middleware;
  * Framework version.
  */
 
-exports.version = '2.5.2';
+exports.version = '2.5.3';
 
 /**
  * Shortcut for `new Server(...)`.

lib/request.js

@@ -292,16 +292,18 @@ req.flash = function(type, msg){
 req.is = function(type){
   var fn = this.app.is(type);
   if (fn) return fn(this);
-  var contentType = this.headers['content-type'];
-  if (!contentType) return;
+  var ct = this.headers['content-type'];
+  if (!ct) return false;
+  ct = ct.split(';')[0];
   if (!~type.indexOf('/')) type = mime.lookup(type);
   if (~type.indexOf('*')) {
-    type = type.split('/')
-    contentType = contentType.split('/');
-    if ('*' == type[0] && type[1] == contentType[1]) return true;
-    if ('*' == type[1] && type[0] == contentType[0]) return true;
+    type = type.split('/');
+    ct = ct.split('/');
+    if ('*' == type[0] && type[1] == ct[1]) return true;
+    if ('*' == type[1] && type[0] == ct[0]) return true;
+    return false;
   }
-  return !! ~contentType.indexOf(type);
+  return !! ~ct.indexOf(type);
 };
 
 // Callback for isXMLHttpRequest / xhr

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [ 
     { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, 
@@ -10,7 +10,7 @@
     { "name": "Guillermo Rauch", "email": "rauchg@gmail.com" }
   ],
   "dependencies": {
-    "connect": "1.8.x",
+    "connect": "1.x",
     "mime": ">= 0.0.1",
     "qs": ">= 0.3.1",
     "mkdirp": "0.0.7"

test/view.test.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , connect = require('connect')
   , assert = require('assert')
   , should = require('should')