Updates

package.json

@@ -4,12 +4,14 @@
     "version": "0.0.1",
     "private": true,
     "dependencies": {
-        "express": "3.x",
-        "mongodb": "1.1.8",
-        "socket.io": "0.9.10"
+        "express": "4.15.3",
+        "body-parser": "1.17.2",
+        "morgan": "1.8.2",
+        "mongodb": "2.2.30",
+        "socket.io": "2.0.3"
     },
     "engines": {
-        "node": "0.8.4",
-        "npm": "1.1.49"
+        "node": "8.1.4",
+        "npm": "5.2.0"
     }
 }

public/dashboard.html

@@ -23,8 +23,8 @@
     <![endif]-->
 
 
-    <script src="http://use.edgefonts.net/andika.js"></script>
-    <script src="http://use.edgefonts.net/arvo.js"></script>
+    <script src="https://use.edgefonts.net/andika.js"></script>
+    <script src="https://use.edgefonts.net/arvo.js"></script>
 
 </head>
 
@@ -130,4 +130,4 @@ <h5>active visitors</h5>
 </script>
 
 </body>
-</html>
+</html>

public/index.html

@@ -22,8 +22,8 @@
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <script src="http://use.edgefonts.net/andika.js"></script>
-    <script src="http://use.edgefonts.net/arvo.js"></script>
+    <script src="https://use.edgefonts.net/andika.js"></script>
+    <script src="https://use.edgefonts.net/arvo.js"></script>
 
 	<script type="text/javascript" src="socket.io/socket.io.js"></script>
     <script>

public/tpl/HomeView.html

@@ -16,10 +16,10 @@ <h3>A sample application built with Backbone.js, Twitter Bootstrap, Node.js, Exp
   <div class="container">
     <ul class="bs-docs-social-buttons">
       <li>
-        <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=ccoenraets&repo=nodecellar&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=ccoenraets&repo=nodecellar&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
       </li>
       <li>
-        <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=ccoenraets&repo=nodecellar&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
+        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=ccoenraets&repo=nodecellar&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
       </li>
 
         <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
@@ -35,4 +35,4 @@ <h3>A sample application built with Backbone.js, Twitter Bootstrap, Node.js, Exp
 
     </ul>
   </div>
-</div>
+</div>

routes/wines.js

@@ -2,16 +2,19 @@ var mongo = require('mongodb');
 
 var Server = mongo.Server,
     Db = mongo.Db,
-    BSON = mongo.BSONPure;
+    ObjectID = mongo.ObjectID;
 
-var server = new Server('localhost', 27017, {auto_reconnect: true});
-db = new Db('winedb', server, {safe: true});
+var db;
+
+var mongoUri = process.env.MONGOLAB_URI || "mongodb://localhost/nodecellar";
+
+mongo.connect(mongoUri, {}, function(err, database) {
+    db = database;
 
-db.open(function(err, db) {
     if(!err) {
         console.log("Connected to 'winedb' database");
-        db.collection('wines', {safe:true}, function(err, collection) {
-            if (err) {
+        db.collections(function(err, collections) {
+            if (collections.indexOf("wines") == -1) {
                 console.log("The 'wines' collection doesn't exist. Creating it with sample data...");
                 populateDB();
             }
@@ -23,7 +26,7 @@ exports.findById = function(req, res) {
     var id = req.params.id;
     console.log('Retrieving wine: ' + id);
     db.collection('wines', function(err, collection) {
-        collection.findOne({'_id':new BSON.ObjectID(id)}, function(err, item) {
+        collection.findOne({'_id': new ObjectID(id)}, function(err, item) {
             res.send(item);
         });
     });
@@ -313,4 +316,4 @@ var populateDB = function() {
         collection.insert(wines, {safe:true}, function(err, result) {});
     });
 
-};
+};

server.js

@@ -1,23 +1,26 @@
 var express = require('express'),
+    bodyParser = require('body-parser');
+    logger = require('morgan'),
     path = require('path'),
     http = require('http'),
+    socketIo = require('socket.io'),
     wine = require('./routes/wines');
 
 var app = express();
+var server = http.createServer(app);
+var io = socketIo(server);
 
-app.configure(function () {
-    app.set('port', process.env.PORT || 3000);
-    app.use(express.logger('dev'));  /* 'default', 'short', 'tiny', 'dev' */
-    app.use(express.bodyParser()),
-    app.use(express.static(path.join(__dirname, 'public')));
-});
+app.set('port', process.env.PORT || 3000);
+app.use(bodyParser.json());
+app.use(logger('tiny'));
+app.use(express.static(path.join(__dirname, 'public')));
 
 app.get('/wines', wine.findAll);
 app.get('/wines/:id', wine.findById);
 app.post('/wines', wine.addWine);
 app.put('/wines/:id', wine.updateWine);
 app.delete('/wines/:id', wine.deleteWine);
 
-http.createServer(app).listen(app.get('port'), function () {
+server.listen(app.get('port'), function () {
     console.log("Express server listening on port " + app.get('port'));
 });

serverwithanalytics.js

@@ -1,54 +1,52 @@
 var express = require('express'),
+    bodyParser = require('body-parser');
+    logger = require('morgan'),
     path = require('path'),
     http = require('http'),
-    io = require('socket.io'),
+    socketIo = require('socket.io'),
     wine = require('./routes/wines');
 
 var app = express();
-
-app.configure(function () {
-    app.set('port', process.env.PORT || 3000);
-    app.use(express.logger('dev'));
-    app.use(express.bodyParser())
-    app.use(express.static(path.join(__dirname, 'public')));
-});
-
 var server = http.createServer(app);
-io = io.listen(server);
+var io = socketIo(server);
 
-
-io.configure(function () {
-    io.set('authorization', function (handshakeData, callback) {
-        if (handshakeData.xdomain) {
-            callback('Cross-domain connections are not allowed');
-        } else {
-            callback(null, true);
-        }
-    });
-});
-
-server.listen(app.get('port'), function () {
-    console.log("Express server listening on port " + app.get('port'));
-});
+app.set('port', process.env.PORT || 3000);
+app.use(bodyParser.json());
+app.use(logger('tiny'));
+app.use(express.static(path.join(__dirname, 'public')));
 
 app.get('/wines', wine.findAll);
 app.get('/wines/:id', wine.findById);
 app.post('/wines', wine.addWine);
 app.put('/wines/:id', wine.updateWine);
 app.delete('/wines/:id', wine.deleteWine);
 
-io.sockets.on('connection', function (socket) {
+server.listen(app.get('port'), function () {
+    console.log("Express server listening on port " + app.get('port'));
+});
+
+io.use(function(socket, next) {
+  var handshake = socket.request;
+
+  if (handshake.xdomain) {
+      next('Cross-domain connections are not allowed');
+  } else {
+      next(null, true);
+  }
+});
+
+io.on('connection', function (socket) {
 
     socket.on('message', function (message) {
         console.log("Got message: " + message);
-        ip = socket.handshake.address.address;
+        ip = socket.handshake.address;
         url = message;
-        io.sockets.emit('pageview', { 'connections': Object.keys(io.connected).length, 'ip': '***.***.***.' + ip.substring(ip.lastIndexOf('.') + 1), 'url': url, 'xdomain': socket.handshake.xdomain, 'timestamp': new Date()});
+        io.sockets.emit('pageview', { 'connections': Object.keys(io.sockets.connected).length, 'ip': '***.***.***.' + ip.substring(ip.lastIndexOf('.') + 1), 'url': url, 'xdomain': socket.handshake.xdomain, 'timestamp': new Date()});
     });
 
     socket.on('disconnect', function () {
         console.log("Socket disconnected");
-        io.sockets.emit('pageview', { 'connections': Object.keys(io.connected).length});
+        io.sockets.emit('pageview', { 'connections': Object.keys(io.sockets.connected).length});
     });
 
-});
+});