Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ while (n--) {
}

app.use(function(req, res, next){
res.send('Hello World')
res.send('Hello World');
});

app.listen(3333);
4 changes: 2 additions & 2 deletions examples/auth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

var express = require('../..');
var hash = require('pbkdf2-password')()
var hash = require('pbkdf2-password')();
var path = require('path');
var session = require('express-session');

Expand All @@ -16,7 +16,7 @@ app.set('views', path.join(__dirname, 'views'));

// middleware

app.use(express.urlencoded({ extended: false }))
app.use(express.urlencoded({ extended: false }));
app.use(session({
resave: false, // don't save session if unmodified
saveUninitialized: false, // don't create session until something stored
Expand Down
4 changes: 2 additions & 2 deletions examples/cookie-sessions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ app.use(count);

// custom middleware
function count(req, res) {
req.session.count = (req.session.count || 0) + 1
res.send('viewed ' + req.session.count + ' times\n')
req.session.count = (req.session.count || 0) + 1;
res.send('viewed ' + req.session.count + ' times\n');
}

/* istanbul ignore next */
Expand Down
2 changes: 1 addition & 1 deletion examples/cookies/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if ('test' != process.env.NODE_ENV) app.use(logger(':method :url'));
app.use(cookieParser('my secret here'));

// parses x-www-form-urlencoded
app.use(express.urlencoded({ extended: false }))
app.use(express.urlencoded({ extended: false }));

app.get('/', function(req, res){
if (req.cookies.remember) {
Expand Down
8 changes: 4 additions & 4 deletions examples/error-pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ app.use(function(req, res, next){

res.format({
html: function () {
res.render('404', { url: req.url })
res.render('404', { url: req.url });
},
json: function () {
res.json({ error: 'Not found' })
res.json({ error: 'Not found' });
},
default: function () {
res.type('txt').send('Not found')
res.type('txt').send('Not found');
}
})
});
});

// error-handling middleware, take the same form
Expand Down
2 changes: 1 addition & 1 deletion examples/mvc/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ app.use(session({
}));

// parse request bodies (req.body)
app.use(express.urlencoded({ extended: true }))
app.use(express.urlencoded({ extended: true }));

// allow overriding methods in query (?_method=put)
app.use(methodOverride('_method'));
Expand Down
2 changes: 1 addition & 1 deletion examples/mvc/lib/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function(parent, options){
var dir = path.join(__dirname, '..', 'controllers');
var verbose = options.verbose;
fs.readdirSync(dir).forEach(function(name){
var file = path.join(dir, name)
var file = path.join(dir, name);
if (!fs.statSync(file).isDirectory()) return;
verbose && console.log('\n %s:', name);
var obj = require(file);
Expand Down
2 changes: 1 addition & 1 deletion examples/route-middleware/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function andRestrictTo(role) {
} else {
next(new Error('Unauthorized'));
}
}
};
}

// Middleware for faux authentication
Expand Down
2 changes: 1 addition & 1 deletion examples/route-separation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (!module.parent) {

app.use(methodOverride('_method'));
app.use(cookieParser());
app.use(express.urlencoded({ extended: true }))
app.use(express.urlencoded({ extended: true }));
app.use(express.static(path.join(__dirname, 'public')));

// General
Expand Down
2 changes: 1 addition & 1 deletion examples/static-files/public/js/app.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
foo
foo;
2 changes: 1 addition & 1 deletion examples/view-constructor/github-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GithubView.prototype.render = function(options, fn){
https.request(opts, function(res) {
var buf = '';
res.setEncoding('utf8');
res.on('data', function(str){ buf += str });
res.on('data', function(str){ buf += str; });
res.on('end', function(){
self.engine(buf, options, fn);
});
Expand Down
12 changes: 6 additions & 6 deletions examples/view-locals/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ app.get('/', function(req, res, next){
count: count,
users: users.filter(ferrets)
});
})
})
});
});
});


Expand All @@ -48,15 +48,15 @@ function count(req, res, next) {
if (err) return next(err);
req.count = count;
next();
})
});
}

function users(req, res, next) {
User.all(function(err, users){
if (err) return next(err);
req.users = users;
next();
})
});
}

app.get('/middleware', count, users, function(req, res, next){
Expand Down Expand Up @@ -86,15 +86,15 @@ function count2(req, res, next) {
if (err) return next(err);
res.locals.count = count;
next();
})
});
}

function users2(req, res, next) {
User.all(function(err, users){
if (err) return next(err);
res.locals.users = users.filter(ferrets);
next();
})
});
}

app.get('/middleware-locals', count2, users2, function(req, res, next){
Expand Down
18 changes: 9 additions & 9 deletions lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var deprecate = require('depd')('express');
var flatten = require('array-flatten');
var merge = require('utils-merge');
var resolve = require('path').resolve;
var setPrototypeOf = require('setprototypeof')
var setPrototypeOf = require('setprototypeof');
var slice = Array.prototype.slice;

/**
Expand Down Expand Up @@ -95,10 +95,10 @@ app.defaultConfiguration = function defaultConfiguration() {
}

// inherit protos
setPrototypeOf(this.request, parent.request)
setPrototypeOf(this.response, parent.response)
setPrototypeOf(this.engines, parent.engines)
setPrototypeOf(this.settings, parent.settings)
setPrototypeOf(this.request, parent.request);
setPrototypeOf(this.response, parent.response);
setPrototypeOf(this.engines, parent.engines);
setPrototypeOf(this.settings, parent.settings);
});

// setup locals
Expand Down Expand Up @@ -207,7 +207,7 @@ app.use = function use(fn) {
var fns = flatten(slice.call(arguments, offset));

if (fns.length === 0) {
throw new TypeError('app.use() requires a middleware function')
throw new TypeError('app.use() requires a middleware function');
}

// setup router
Expand All @@ -228,8 +228,8 @@ app.use = function use(fn) {
router.use(path, function mounted_app(req, res, next) {
var orig = req.app;
fn.handle(req, res, function (err) {
setPrototypeOf(req, orig.request)
setPrototypeOf(res, orig.response)
setPrototypeOf(req, orig.request);
setPrototypeOf(res, orig.response);
next(err);
});
});
Expand Down Expand Up @@ -576,7 +576,7 @@ app.render = function render(name, options, callback) {
if (!view.path) {
var dirs = Array.isArray(view.root) && view.root.length > 1
? 'directories "' + view.root.slice(0, -1).join('", "') + '" or "' + view.root[view.root.length - 1] + '"'
: 'directory "' + view.root + '"'
: 'directory "' + view.root + '"';
var err = new Error('Failed to lookup view "' + name + '" in views ' + dirs);
err.view = view;
return done(err);
Expand Down
8 changes: 4 additions & 4 deletions lib/express.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Module dependencies.
*/

var bodyParser = require('body-parser')
var bodyParser = require('body-parser');
var EventEmitter = require('events').EventEmitter;
var mixin = require('merge-descriptors');
var proto = require('./application');
Expand Down Expand Up @@ -45,12 +45,12 @@ function createApplication() {
// expose the prototype that will get set on requests
app.request = Object.create(req, {
app: { configurable: true, enumerable: true, writable: true, value: app }
})
});

// expose the prototype that will get set on responses
app.response = Object.create(res, {
app: { configurable: true, enumerable: true, writable: true, value: app }
})
});

app.init();
return app;
Expand All @@ -75,7 +75,7 @@ exports.Router = Router;
* Expose middleware
*/

exports.json = bodyParser.json
exports.json = bodyParser.json;
exports.query = require('./middleware/query');
exports.static = require('serve-static');
exports.urlencoded = bodyParser.urlencoded
Expand Down
6 changes: 3 additions & 3 deletions lib/middleware/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* @private
*/

var setPrototypeOf = require('setprototypeof')
var setPrototypeOf = require('setprototypeof');

/**
* Initialization middleware, exposing the
Expand All @@ -32,8 +32,8 @@ exports.init = function(app){
res.req = req;
req.next = next;

setPrototypeOf(req, app.request)
setPrototypeOf(res, app.response)
setPrototypeOf(req, app.request);
setPrototypeOf(res, app.response);

res.locals = res.locals || Object.create(null);

Expand Down
4 changes: 2 additions & 2 deletions lib/middleware/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Module dependencies.
*/

var merge = require('utils-merge')
var merge = require('utils-merge');
var parseUrl = require('parseurl');
var qs = require('qs');

Expand All @@ -23,7 +23,7 @@ var qs = require('qs');
*/

module.exports = function query(options) {
var opts = merge({}, options)
var opts = merge({}, options);
var queryparse = qs.parse;

if (typeof options === 'function') {
Expand Down
20 changes: 10 additions & 10 deletions lib/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ var proxyaddr = require('proxy-addr');
* @public
*/

var req = Object.create(http.IncomingMessage.prototype)
var req = Object.create(http.IncomingMessage.prototype);

/**
* Module exports.
* @public
*/

module.exports = req
module.exports = req;

/**
* Return request header.
Expand Down Expand Up @@ -315,12 +315,12 @@ defineGetter(req, 'protocol', function protocol(){

// Note: X-Forwarded-Proto is normally only ever a
// single value, but this is to be safe.
var header = this.get('X-Forwarded-Proto') || proto
var index = header.indexOf(',')
var header = this.get('X-Forwarded-Proto') || proto;
var index = header.indexOf(',');

return index !== -1
? header.substring(0, index).trim()
: header.trim()
: header.trim();
});

/**
Expand Down Expand Up @@ -369,9 +369,9 @@ defineGetter(req, 'ips', function ips() {

// reverse the order (to farthest -> closest)
// and remove socket address
addrs.reverse().pop()
addrs.reverse().pop();

return addrs
return addrs;
});

/**
Expand Down Expand Up @@ -462,8 +462,8 @@ defineGetter(req, 'host', deprecate.function(function host(){

defineGetter(req, 'fresh', function(){
var method = this.method;
var res = this.res
var status = res.statusCode
var res = this.res;
var status = res.statusCode;

// GET or HEAD for weak freshness validation only
if ('GET' !== method && 'HEAD' !== method) return false;
Expand All @@ -473,7 +473,7 @@ defineGetter(req, 'fresh', function(){
return fresh(this.headers, {
'etag': res.get('ETag'),
'last-modified': res.get('Last-Modified')
})
});
}

return false;
Expand Down
Loading