From 66b6dbca342eb1a99daa475838db1b28f63a9a75 Mon Sep 17 00:00:00 2001
From: lakshmivyas <lakshmi.vyas@gmail.com>
Date: Tue, 29 Jul 2014 17:56:45 +0530
Subject: [PATCH] Upgrade to latest version of libraries

---
 app.js          | 25 +++++++++++++------------
 apps/events.js  | 23 +++++++----------------
 apps/user.js    |  4 ++--
 lib/conf/dev.js |  4 ++--
 package.json    | 26 ++++++++++++++------------
 5 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/app.js b/app.js
index 5781bc8..c5259f6 100644
--- a/app.js
+++ b/app.js
@@ -4,6 +4,9 @@ var     express = require('express')
     ,   factory = require('./lib/factory')
     ,   redis = factory.Redis(config)
     ,   app = express()
+    ,   bodyParser = require('body-parser')
+    ,   errorHandler = require('errorhandler')
+    ,   morgan = require('morgan')
     ,   ping  = require('./lib/ping')
     ,   auth = require('./apps/auth')
     ,   events = require('./apps/events')
@@ -65,17 +68,15 @@ var responseError = function(req, res, next) {
     next();
 };
 
-app.configure(function() {
-    app.enable('trust proxy');
-    app.use(responseError);
-    app.use(express.bodyParser());
-    app.use(express.logger('dev')); // TODO: Get this from config
-    app.use(allowCrossDomain);
-    app.use(authcode(session));
-    app.use(app.router);
-    app.use(ping());
-    app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
-});
+app.enable('trust proxy');
+app.use(responseError);
+app.use(bodyParser.urlencoded({extended:true}));
+app.use(bodyParser.json());
+app.use(morgan('dev')); // TODO: Get this from config
+app.use(allowCrossDomain);
+app.use(authcode(session));
+app.use(ping());
+app.use(errorHandler({ dumpExceptions: true, showStack: true }));
 
 app.use('/auth', auth(config));
 app.use('/user', user(config));
@@ -90,4 +91,4 @@ if (!module.parent) {
     server.listen(config.api.port, config.api.ip);
     events.listen(server, config);
     console.log('Express is listening at [%s]:[%s]', config.api.ip, config.api.port);
-}
\ No newline at end of file
+}
diff --git a/apps/events.js b/apps/events.js
index f393094..d6a6eac 100644
--- a/apps/events.js
+++ b/apps/events.js
@@ -12,30 +12,19 @@ module.exports.listen = function(app, config) {
         ,   projectReadyPattern = '*' + projectReady
         ,   buildStatus = ':build:status'
         ,   buildStatusPattern = '*' + buildStatus
-        ,   io = require('socket.io').listen(app, conf)
         ,   users = new (require('../lib/model/account')).User(config, redis);
 
-
-    io.configure('production', function(){
-        io.enable('browser client minification');  // send minified client
-        io.enable('browser client etag');          // apply etag caching logic based on version number
-        io.enable('browser client gzip');          // gzip the file
-        io.set('log level', 1);
-
-        io.set('transports', [
+    io = require('socket.io')({
+        'transports': [
                 'websocket'
             ,   'flashsocket'
             ,   'htmlfile'
             ,   'xhr-polling'
             ,   'jsonp-polling'
-        ]);
-    });
-
-    io.configure('development', function(){
-        io.set('transports', ['websocket']);
+        ],
+        'log level': 1
     });
 
-
     sub.psubscribe(userReadyPattern);
     sub.psubscribe(projectReadyPattern);
     sub.psubscribe(buildStatusPattern);
@@ -73,4 +62,6 @@ module.exports.listen = function(app, config) {
             });
         });
     });
-};
\ No newline at end of file
+
+    io.listen(app, conf);
+};
diff --git a/apps/user.js b/apps/user.js
index 4987428..8d810ac 100644
--- a/apps/user.js
+++ b/apps/user.js
@@ -117,7 +117,7 @@ module.exports = function(config) {
     app.get(routes.projects, restrict, getProjects);
     app.put(routes.project, restrict, addProject);
     app.patch(routes.project, restrict, syncProject);
-    app.del(routes.project, restrict, deleteProject);
+    app.delete(routes.project, restrict, deleteProject);
 
     return app;
-};
\ No newline at end of file
+};
diff --git a/lib/conf/dev.js b/lib/conf/dev.js
index 6511ac2..ad99f13 100644
--- a/lib/conf/dev.js
+++ b/lib/conf/dev.js
@@ -10,7 +10,7 @@ module.exports  = {
         port: null
     },
     api: {
-        ip: '0.0.0.0',
+        ip: '127.0.0.1',
         port: 8081,
         url: "http://localhost:8081"
     },
@@ -21,4 +21,4 @@ module.exports  = {
         clientId: "c62353d0f816a5f3f50f",
         clientSecret: "c6559170c9f43bd225138fbfabf8ce1d4e37c5f8"
     }
-};
\ No newline at end of file
+};
diff --git a/package.json b/package.json
index 7aaf5e6..0b0dc9c 100644
--- a/package.json
+++ b/package.json
@@ -5,21 +5,23 @@
   "description": "API for gitbot.",
   "main": "app.js",
   "engines": {
-    "node": "~v0.8.20"
+    "node": "~v0.10.29"
   },
   "dependencies": {
-    "superagent": "~0.9.5",
-    "async": "~0.2.5",
-    "qs": "~0.5.1",
-    "express": "~3.1.0",
-    "redis": "~0.8.2",
-    "hiredis": "~0.1.14",
-    "connect-redis": "~1.4.4",
-    "js-yaml": "~2.0.2",
-    "socket.io": "~0.9.10",
-    "aws-sdk": "~0.9.3"
+    "superagent": "~0.18.2",
+    "morgan": "~1.2.2",
+    "body-parser": "~1.5.2",
+    "errorhandler": "1.1.1",
+    "async": "~0.9.0",
+    "qs": "~0.6.6",
+    "express": "~4.7.2",
+    "redis": "~0.11.0",
+    "connect-redis": "~2.0.0",
+    "js-yaml": "~3.1.0",
+    "socket.io": "~1.0.6",
+    "aws-sdk": "~2.0.9"
   },
-  "repository": "",
+  "repository": "https://github.com/gitbot/api",
   "author": "Lakshmi Vyas",
   "license": "MIT"
 }