1
0
mirror of /repos/Prototyper.git synced 2025-12-30 06:31:32 +01:00

upgraded to node 0.10.4

This commit is contained in:
Aiko Mastboom 2013-04-19 23:06:06 +02:00
parent 88cb04ff3c
commit 9d45323422
3 changed files with 23 additions and 22 deletions

View File

@ -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"

View File

@ -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;
};

View File

@ -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);
});