Injecting Express stuff into OKServer as runtime dependency ya diggy

1 files changed, 14 insertions, 3 deletions

diff --git a/app/index.js b/app/index.js
index 82be55b..a639477 100644
--- a/app/index.js
+++ b/app/index.js
@@ -1,5 +1,6 @@
 var path = require('path');
 var format = require('util').format;
+var express = require('express');
 var OKQuery = require('okquery');
 var OKView = require('okview');
 var OKDB = require('okdb');
@@ -16,15 +17,23 @@ var OKSchema = require('okschema');
 function OKCMS(options) {
   if (!(this instanceof OKCMS)) return new OKCMS(options);
   options = options || {};
-  var root = this._root = options.root || 'www';
+
+  var app = express();
+  app.enable('strict routing');
+
+  var root = this._root = options.root || 'public';
+
   var schemaConfig = options.schemas || {};
   var resourceConfig = options.resources || [];
   var viewConfig = options.views || {
     '/': { template: 'index' }
   };
+
+  var templateProvider = this._templateProvider =
+      new OKTemplate({root: templateRoot});
+
   var db = new OKDB(options.db || 'fs');
-  var templateCache = this._templateCache = new OKTemplate({root: root});
-  var server = this._server = new OKServer({root: root});
+  // Special query to get project wide meta data
   var meta = this._meta = {
     name: 'meta',
     get: function() {
@@ -39,6 +48,8 @@ function OKCMS(options) {
   var views = this._views =
       this._createViews(viewConfig, db, meta, resources, templateProvider);
   var server = this._server = new OKServer({
+    express: express,
+    app: app,
     views: views,
     root: root,
     adminRoot: adminRoot