Error handling

Author: robhrt7

core/index.js

@@ -11,7 +11,34 @@ var Bubble = mongoose.model('Bubble', {
     timestamp: String
 });
 
+var resources = {
+    noConnection: 'MongoDB connection is inactive.',
+    dbError: 'Could not get information from DB.'
+};
+
+var config = {
+    statusCodes: {
+        OK: 200,
+        notFound: 404,
+        error: 500
+    }
+};
+
+var connectionErrorHandler = function(res){
+    res.status(config.statusCodes.notFound).send(resources.noConnection);
+};
+
+var DBErrorHandler = function(res, err){
+    res.status(config.statusCodes.error).send(resources.dbError);
+    console.log('Bubble: ', resources.dbError, err);
+};
+
 var getBubbles = function(req, res){
+    if (mongoose.connection.readyState === 0) {
+        connectionErrorHandler(res);
+        return;
+    }
+
     var specURI = req.query.pathToDataFile;
 
     var opts = {};
@@ -23,13 +50,21 @@ var getBubbles = function(req, res){
     }
 
     Bubble.find(opts, function(err, data){
-        if(!err) {
-            res.jsonp(data);
+        if (err) {
+            DBErrorHandler(res, err);
+            return;
         }
+
+        res.jsonp(data);
     })
 };
 
 var setBubble = function(req, res){
+    if (mongoose.connection.readyState === 0) {
+        connectionErrorHandler(res);
+        return;
+    }
+
     var bubble = new Bubble({
                 specURI: req.query.specURI,
                 section: req.query.section,
@@ -42,40 +77,64 @@ var setBubble = function(req, res){
     );
 
     bubble.save(function (err, data) {
-        if (!err){
-            console.log(arguments);
-            res.jsonp(data);
+        if (err) {
+            DBErrorHandler(res, err);
+            return;
         }
+
+        res.jsonp(data);
     });
 };
 
 var removeBubble = function(req, res){
+    if (mongoose.connection.readyState === 0) {
+        connectionErrorHandler(res);
+        return;
+    }
+
     var id = req.query.id;
 
     Bubble.remove({_id : id }, function (err, data) {
-        if (!err){
-            res.jsonp(data);
+        if (err) {
+            DBErrorHandler(res, err);
+            return;
         }
+
+        res.jsonp(data);
     });
 };
 
 var countBubbles = function(req, res){
+    if (mongoose.connection.readyState === 0) {
+        connectionErrorHandler(res);
+        return;
+    }
+
     var specURI = req.query.specURI;
 
     Bubble.count({specURI : specURI }, function (err, data) {
-        if (!err){
-            res.jsonp(data);
-        } else {
-            res.send(err);
+        if (err) {
+            DBErrorHandler(res, err);
+            return;
         }
+
+        res.jsonp(data);
     });
 };
 
 var removeAllBubbles = function(req, res){
+    if (mongoose.connection.readyState === 0) {
+        connectionErrorHandler(res);
+        return;
+    }
+
     Bubble.remove(function (err, data) {
-        if (!err){
-            res.send('removed all');
+        if (err) {
+            DBErrorHandler(res, err);
+            return;
         }
+
+        res.send('removed all');
     });
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sourcejs-comments",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "SourceJS plugin for spec comments",
   "repository": {
     "type": "git",