From 75f56dde6f1270abd687052edf02065456b29359 Mon Sep 17 00:00:00 2001
From: Is Isilon <wassname@wassname.org>
Date: Fri, 29 Jan 2016 07:42:04 +0800
Subject: [PATCH] Updated to express 4

---
 package.json |  5 ++++-
 server.js    | 27 +++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index fa63dd2..706a16d 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,11 @@
   "version": "0.0.2",
   "description": "A simple WorkFlowy clone",
   "dependencies": {
+    "body-parser": "^1.14.2",
     "config": "~1.19.0",
-    "express": "<4.0.0",
+    "errorhandler": "^1.4.3",
+    "express": "^4",
+    "method-override": "^2.3.5",
     "path": "~0.12.7",
     "pg": "~3.4.1",
     "sequelize": "~3.17.3",
diff --git a/server.js b/server.js
index 6a2f9d7..c4ff2b2 100644
--- a/server.js
+++ b/server.js
@@ -6,17 +6,28 @@ var application_root = __dirname,
     orm = require('./orm').configure(config.get('database')),
     Tasks = require('./db/models/task').instance(orm),
     server = require('http').createServer(app),
-    socket = require('socket.io')
+    socket = require('socket.io'),
+    bodyParser = require('body-parser'),
+    methodOverride = require('method-override'),
+    errorhandler = require('errorhandler');
 
 
-app.use(express.bodyParser());
-app.use(express.methodOverride());
-app.use(app.router);
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
+
+// override with the X-HTTP-Method-Override header in the request
+app.use(methodOverride('X-HTTP-Method-Override'));
+
 app.use(express.static(path.join(application_root, 'public')));
-app.use(express.errorHandler({
-    dumpExceptions: true,
-    showStack: true
-}));
+
+if (process.env.NODE_ENV === 'development') {
+  // only use in development
+  app.use(errorHandler({
+      dumpExceptions: true,
+      showStack: true
+  }));
+}
+
 
 var port = process.env.PORT || config.get('port');
 server.listen(port, function () {