From e1378fa6621c660a99d73e7bb88906a3c5530675 Mon Sep 17 00:00:00 2001
From: Toke von Ryberg <tokeryberg@gmail.com>
Date: Sun, 18 Oct 2015 20:49:37 +0300
Subject: [PATCH] Update Express and middleware

---
 app.js       | 35 +++++++++++++++++++++++------------
 package.json |  9 +++++++--
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index 90fa055..469446f 100644
--- a/app.js
+++ b/app.js
@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -6,7 +5,12 @@
 var express = require('express')
   , routes = require('./routes')
   , http = require('http')
-  , path = require('path');
+  , path = require('path')
+  , morgan = require('morgan')
+  , bodyParser = require('body-parser')
+  , methodOverride = require('method-override')
+  , errorhandler = require('errorhandler')
+  , favicon = require('serve-favicon');
 
 var app = express();
 
@@ -14,21 +18,28 @@ var app = express();
 app.set('port', process.env.PORT || 3000);
 app.set('views', __dirname + '/views');
 app.set('view engine', 'jade');
-app.use(express.favicon());
+//app.use(favicon(__dirname + ''public/favicon.ico'));
 app.use(express.static(path.join(__dirname, 'public')));
-app.use(express.logger('dev'));
-app.use(express.bodyParser());
-app.use(express.methodOverride());
-app.use(app.router);
+app.use(morgan('dev'));
+app.use(bodyParser.urlencoded({
+  extended: false
+}));
+app.use(bodyParser.json());
+app.use(methodOverride(function(req, res) {
+  if (req.body && typeof req.body === 'object' && '_method' in req.body) {
+    // look in urlencoded POST bodies and delete it
+    var method = req.body._method;
+    delete req.body._method;
+    return method;
+  }
+}));
 
 // development only
 if ('development' == app.get('env')) {
-  app.use(express.errorHandler());
+  app.use(errorhandler());
 }
 
-app.locals({
-    title: 'Node-Neo4j Template'    // default title
-});
+app.locals.title = 'Node-Neo4j Template'; // default title
 
 // Routes
 
@@ -38,7 +49,7 @@ app.get('/users', routes.users.list);
 app.post('/users', routes.users.create);
 app.get('/users/:username', routes.users.show);
 app.post('/users/:username', routes.users.edit);
-app.del('/users/:username', routes.users.del);
+app.delete('/users/:username', routes.users.del);
 
 app.post('/users/:username/follow', routes.users.follow);
 app.post('/users/:username/unfollow', routes.users.unfollow);
diff --git a/package.json b/package.json
index cdd7c55..983d847 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,14 @@
   "author": "Aseem Kishore <aseem.kishore@gmail.com>",
   "private": true,
   "dependencies": {
-    "express": "^3.2.0",
+    "body-parser": "^1.14.1",
+    "errorhandler": "^1.4.2",
+    "express": "^4.13.3",
     "jade": "^0.26.3",
-    "neo4j": "2.0.0-RC2"
+    "method-override": "^2.3.5",
+    "morgan": "^1.6.1",
+    "neo4j": "2.0.0-RC2",
+    "serve-favicon": "^2.3.0"
   },
   "devDependencies": {
     "chai": "^1.8",