From 4b8ce7383397a35bc2a01e1d9ea24222201fb1aa Mon Sep 17 00:00:00 2001
From: Typicode <typicode@gmail.com>
Date: Mon, 16 Mar 2015 21:35:29 +0100
Subject: [PATCH] Fix #54 Move required middlewares to router instead of server

---
 src/router.js | 9 ++++++++-
 src/server.js | 5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/router.js b/src/router.js
index df1bf32..a6b8525 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,7 +1,9 @@
 var express = require('express')
+var methodOverride = require('method-override')
+var bodyParser = require('body-parser')
 var _ = require('underscore')
-var utils = require('./utils')
 var low = require('lowdb')
+var utils = require('./utils')
 
 low.mixin(require('underscore-db'))
 low.mixin(require('underscore.inflections'))
@@ -11,6 +13,11 @@ module.exports = function(source) {
   // Create router
   var router = express.Router()
   
+  // Add middlewares
+  router.use(bodyParser.json({limit: '10mb'}))
+  router.use(bodyParser.urlencoded({ extended: false }))
+  router.use(methodOverride())
+
   // Create database
   if (_.isObject(source)) {
     var db = low()
diff --git a/src/server.js b/src/server.js
index a7fd517..29b6667 100644
--- a/src/server.js
+++ b/src/server.js
@@ -3,8 +3,6 @@ var http = require('http')
 var express = require('express')
 var logger = require('morgan')
 var cors = require('cors')
-var methodOverride = require('method-override')
-var bodyParser = require('body-parser')
 var serveStatic = require('serve-static')
 var errorhandler = require('errorhandler')
 
@@ -17,9 +15,6 @@ module.exports = function() {
   }
 
   server.set('json spaces', 2)
-  server.use(bodyParser.json({limit: '10mb'}))
-  server.use(bodyParser.urlencoded({ extended: false }))
-  server.use(methodOverride())
 
   // Serve static files
   if (fs.existsSync(process.cwd() + '/public')) {