Updated versions

server.js

@@ -1,64 +1,68 @@
 var application_root = __dirname,
-  express = require('express'),
-  app = express(),
-  path = require('path'),
-  config = require('config'),
-  orm = require('./orm').configure(config.get('database')),
-  Tasks = require('./db/models/task').instance(orm),
-  server = require('http').createServer(app),
-  io = require('socket.io').listen(server);
+    express = require('express'),
+    app = express(),
+    path = require('path'),
+    config = require('config'),
+    orm = require('./orm').configure(config.get('database')),
+    Tasks = require('./db/models/task').instance(orm),
+    server = require('http').createServer(app),
+    socket = require('socket.io')
 
-app.configure(function() {
-  app.use(express.bodyParser());
-  app.use(express.methodOverride());
-  app.use(app.router);
-  app.use(express.static( path.join( application_root, 'public')));
-  app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
-});
+
+app.use(express.bodyParser());
+app.use(express.methodOverride());
+app.use(app.router);
+app.use(express.static(path.join(application_root, 'public')));
+app.use(express.errorHandler({
+    dumpExceptions: true,
+    showStack: true
+}));
 
 var port = process.env.PORT || config.get('port');
-server.listen(port, function() {
-  console.log( 'Express server listening on port %d in %s mode', port, app.settings.env );
+server.listen(port, function () {
+    console.log('Express server listening on port %d in %s mode', port, app.settings.env);
 });
+var io = socket.listen(server);
 
-app.get('/tasks', function(req,res){
-  Tasks.all().success(function(tasks){
-    res.send(tasks);
-  });
-});
-
-app.post('/tasks', function(req,res){
-  Tasks.create({
-    content: req.body.content,
-    parent: parseInt(req.body.parent) || 0,
-    isCompleted: false
-  }).success(function(task){
-    res.send(task);
-  });
-});
-
-app.put('/tasks/:id', function(req,res){
-  console.log(req.body.isCompleted);
-  Tasks.find(req.params.id).success(function(task){
-    task.content = req.body.content;
-    task.parent = parseInt(req.body.parent) || 0,
-    task.isCompleted = req.body.isCompleted == 1;
-    task.save().success(function(task){
-      res.send(task);
-    })
-  });
-});
-
-app.delete('/tasks/:id', function(req,res){
-  Tasks.find(req.params.id).success(function(task){
-    task.destroy().success(function(){
-        res.send('');
+app.get('/tasks', function (req, res) {
+    Tasks.all().then(function (tasks) {
+        res.send(tasks);
+    });
+});
+
+app.post('/tasks', function (req, res) {
+    Tasks.create({
+        content: req.body.content,
+        parent: parseInt(req.body.parent) || 0,
+        isCompleted: false
+    }).then(function (task) {
+        res.send(task);
+    });
+});
+
+app.put('/tasks/:id', function (req, res) {
+    console.log(req.body.isCompleted);
+    Tasks.findById(req.params.id).then(function (task) {
+        task.content = req.body.content;
+        task.parent = parseInt(req.body.parent) || 0,
+            task.isCompleted = req.body.isCompleted == 1;
+        task.save().then(function (task) {
+            res.send(task);
+        })
+    });
+});
+
+app.delete('/tasks/:id', function (req, res) {
+    Tasks.findById(req.params.id).then(function (task) {
+        task.destroy().then(function () {
+            res.send('');
+        });
     });
-  })
 });
 
 io.sockets.on('connection', function (socket) {
-  socket.on('task', function (data) {
-    socket.broadcast.emit('task', data);
-  });
+    socket.on('task', function (data) {
+        console.log(data);
+        socket.broadcast.emit('task', data);
+    });
 });