From 9d45323422f62f7570970325255182735e60aa19 Mon Sep 17 00:00:00 2001
From: Aiko Mastboom <Aiko.Mastboom@informaat.nl>
Date: Fri, 19 Apr 2013 23:06:06 +0200
Subject: [PATCH] upgraded to node 0.10.4

---
 package.json | 11 ++++++-----
 routes.js    | 21 ++++++++++-----------
 server.js    | 13 +++++++------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 5bfa8d7..ec6333f 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "Prototyper",
-  "version": "0.0.0",
-  "main": "index.js",
+  "version": "0.0.1",
+  "main": "server.js",
+  "engine": "node 0.10.4",
   "private": "true",
   "dependencies": {
     "share": "~0.6.0",
-    "connect": "~2.7.5",
-	"express": "~2.5.11",
+    "connect": "~2.7.6",
+    "express": "~3.2.0",
     "mongodb": "~1.2.14",
     "handlebars": "~1.0.10",
     "underscore": "~1.4.4",
@@ -17,7 +18,7 @@
   },
   "repository": "",
   "author": "Aiko Mastboom",
-  "license": "BSD",
+  "license": "Unknown",
   "readmeFilename": "README.md",
   "directories": {
     "test": "test"
diff --git a/routes.js b/routes.js
index 2a7f4d8..008dcc8 100644
--- a/routes.js
+++ b/routes.js
@@ -3,16 +3,15 @@ var mongodata = require('./mongodata.js');
 var responder = require('./responder.js');
 var preview = require('./preview.js');
 
-module.exports = function (server, config) {
-
-	// Attach the sharejs REST and Socket.io interfaces to the server
-	sharejs.server.attach(server, config.share);
-	var model = server.model;
+module.exports = function (app, config) {
 
+	// share wraps express app with http.Server
+	var server = sharejs.server.attach(app, config.share);
+	var model = app.model;
 
 	var mongodataInstance = mongodata(config);
 
-	server.get('/data/:collection/:guid/:attribute.:ext(css|less|js|html)',
+	app.get('/data/:collection/:guid/:attribute.:ext(css|less|js|html)',
 		function getMongoAttribute(req, res, next) {
 			config.debug && console.log('/data/:collection/:guid/:attribute.:ext(less|js|html)');
 			var options = {
@@ -27,7 +26,7 @@ module.exports = function (server, config) {
 		}
 	);
 
-	server.get('/data/:collection/:guid.:ext(json)',
+	app.get('/data/:collection/:guid.:ext(json)',
 		function getMongoContent(req, res, next) {
 			config.debug && console.log('/data/:collection/:guid.:ext(json)');
 			var options = {
@@ -41,7 +40,7 @@ module.exports = function (server, config) {
 		}
 	);
 
-	server.get('/content/:collection/:name/:attribute.:ext(css|less|js|html)',
+	app.get('/content/:collection/:name/:attribute.:ext(css|less|js|html)',
 		function getMongoAttribute(req, res, next) {
 			config.debug && console.log('/content/:collection/:name/:attribute.:ext(less|js|html)');
 			var options = {
@@ -56,7 +55,7 @@ module.exports = function (server, config) {
 		}
 	);
 
-	server.get('/content/:collection/:name.:ext(json)',
+	app.get('/content/:collection/:name.:ext(json)',
 		function getMongoContent(req, res, next) {
 			config.debug && console.log('/content/:collection/:name.:ext(json)');
 			var options = {
@@ -270,7 +269,7 @@ module.exports = function (server, config) {
 
 	var previewInstance = preview(config);
 
-	server.get('/page/:collection/:name.:ext(html)',
+	app.get('/page/:collection/:name.:ext(html)',
 		function getPreviewContent(req, res, next) {
 			config.debug && console.log('/page/:collection/:name.:ext(html)');
 			var options = {
@@ -298,5 +297,5 @@ module.exports = function (server, config) {
 		}
 	);
 
-
+	return server;
 };
\ No newline at end of file
diff --git a/server.js b/server.js
index 85e365c..82ccdd5 100644
--- a/server.js
+++ b/server.js
@@ -16,7 +16,7 @@ var config = {
 				auto_reconnect: true
 			}
 		},
-		savedelay: 1000
+		savedelay: 200
 	},
 	share: {
 		sockjs: {},
@@ -24,13 +24,14 @@ var config = {
 	}
 };
 
-var server = express.createServer();
-server.use(connect.logger());
-server.use(express.static(__dirname + '/public'));
+var app = express();
+config.debug && app.use(connect.logger());
+app.use(express.static(__dirname + '/public'));
 
-instance(server, config);
+
+var server = instance(app, config);
 
 server.listen(config.port, function (err) {
-//	console.log('routes',server.routes);
+	config.debug && console.log('routes',server.routes);
 	console.log('Server running at http://127.0.0.1:', config.port);
 });