Allowing .end()'s callback to not require an err param.

jpodwys · Apr 20, 2015 · 9047ba5 · 9047ba5
1 parent 5274589
commit 9047ba5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -68,7 +68,8 @@ module.exports = function(superagent, config){
       if(this.method === 'GET'){
         superagent.cacheService.get(key, function (err, response){
           if(!err && response){
-            cb(err, response, key);
+            callbackExecutor(cb, err, response, key);
+            //cb(err, response, key);
           }
           else{
             if(curProps.doQuery){
@@ -83,17 +84,20 @@ module.exports = function(superagent, config){
                   }
                   if(!isEmpty(response) || curProps.cacheWhenEmpty){
                     superagent.cacheService.set(key, response, curProps.expiration, function(){
-                      cb(err, response, key);
+                      callbackExecutor(cb, err, response, key);
+                      //cb(err, response, key);
                     });
                   }
                   else{
-                    cb(err, response, key);
+                    callbackExecutor(cb, err, response, key);
+                    //cb(err, response, key);
                   }
                 }
               });
             }
             else{
-              cb(null, null, key);
+              callbackExecutor(cb, null, null, key);
+              //cb(null, null, key);
             }
           }
         });
@@ -102,15 +106,17 @@ module.exports = function(superagent, config){
         this._end(function (err, response){
           if(!err && response){
             superagent.cacheService.del(key, function (){
-              cb(err, response, key);  
+              callbackExecutor(cb, err, response, key);
+              //cb(err, response, key);  
             });
           }
         });
       }
     }
     else{
       this._end(function (err, response){
-        cb(err, response, undefined);
+        callbackExecutor(cb, err, response, undefined);
+        //cb(err, response, undefined);
       });
     }
   }
@@ -211,6 +217,15 @@ module.exports = function(superagent, config){
     props = {doQuery: true, cacheWhenEmpty: true};
   }
 
+  function callbackExecutor(cb, err, result, key){
+    if(cb.length > 1){
+      cb(err, result, key);
+    }
+    else{
+      cb(result, key);
+    }
+  }
+
   var noop = function(){}
 
 }
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "superagent-cache",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Superagent with tiered caching provided by cache-service.",
   "main": "index.js",
   "dependencies": {
     "superagent": "1.1.0",
-    "cache-service": "0.1.4"
+    "cache-service": "0.1.5"
   },
   "devDependencies": {
     "mocha": "1.13.0",