Injecting Express stuff into OKServer as runtime dependency ya diggy

1 files changed, 9 insertions, 10 deletions

diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index d665d65..bb38e1f 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -5,25 +5,24 @@ var slash = require('express-slash');
 function OKServer(options) {
   if (!(this instanceof OKServer)) return new OKServer(options);
   options = options || {};
+  if (!options.express)
+    throw new Error('No Express provided to OKServer');
+  if (!options.app)
+    throw new Error('No Express app provided to OKServer')
   if (!options.views)
-    throw new Error('No views provided to OKServer!');
+    throw new Error('No views provided to OKServer');
   var views = options.views;
-  var app = this._app = express();
-  app.enable('strict routing');
-  var router = express.Router({
-    strict: app.get('strict routing')
-  });
-  // Add views
+  var express = options.express;
+  var app = this._app = options.app;
   Object.keys(views)
     .sort(specificity)
     .forEach(function(route) {
       // We want to enforce trailing slashes for middleware
       routeNoSlash = route.charAt(route.length - 1) === '/' ?
           route.slice(0, route.length - 1) : route;
-      router.all(routeNoSlash, redirect(routeNoSlash));
-      router.use(routeNoSlash + '/', views[route].middleware());
+      app.all(routeNoSlash, redirect(routeNoSlash));
+      app.use(routeNoSlash + '/', views[route].middleware());
     });
-  app.use(router);
   // This enforces trailing slashes for stuff that isn't middleware
   app.use(slash());