refactored using &&

lib/core.js

@@ -69,14 +69,17 @@ module.exports = function(type, properties, store) {
    */
   Model.create = function(props, cb) {
     var m = new Model(props)
-    m.save(cb || noop)
+    m.save(cb)
   }
 
   /** Find an object or create it if it doesn't exist
     */
   Model.find_or_create = function(props, cb) {
     Model.find(props.id, function(m) {
-      m ? cb(m) : Model.create(props, cb || noop) 
+      if(m)
+        cb && cb(m)
+      else
+        Model.create(props, cb) 
     })
   }
 
@@ -120,15 +123,14 @@ module.exports = function(type, properties, store) {
     */
   Model.prototype.update = function(params, cb) {
     params || (params == {})
-    cb || (cb == noop)
 
     Model.find(params.id, function(m) {
       if(!m) {
-        cb()
+        cb && cb()
       } else {
         m.merge(params)
         m.save(function(ok) {
-          cb.call(m, ok)
+          cb && cb.call(m, ok)
         })
       }
     })
@@ -140,10 +142,9 @@ module.exports = function(type, properties, store) {
     */
   Model.prototype.save = function(cb) {
     var self = this
-    cb || (cb = noop)
     utils.achain.call(self, self._saveStack, [], function(err, results) {
       if(!err) self._synchronize()
-      cb.call(self, self)
+      cb && cb.call(self, self)
     })
   }
 
@@ -161,10 +162,9 @@ module.exports = function(type, properties, store) {
     */
   Model.prototype.destroy = function(cb) {
     var self = this
-    cb || (cb = noop)
     Model.destroy(this.id, function(ok) {
       if(ok) self.trigger("destroyed")
-      cb(ok)
+      cb && cb(ok)
     })
   }
 
@@ -210,7 +210,7 @@ module.exports = function(type, properties, store) {
     this.errors = []
     this._property_validate()
     this.trigger("saving").complete(function() {
-      cb.call(this, !this.in_error()) 
+      cb && cb.call(this, !this.in_error()) 
     })
   }
 
@@ -232,7 +232,7 @@ module.exports = function(type, properties, store) {
   Model.prototype._finalize_save = function(cb) {
     if(this.in_error()) {
       this.trigger("error", "saving failed").complete(function(){
-        cb(false)
+        cb && cb(false)
       })
     } else {
       this._synchronize()

lib/stores/memory.js

@@ -32,9 +32,9 @@ exports.mixin = function(Model) {
   Model.destroy = function(id, cb) {
     if(Model.DB[id]) {
       delete Model.DB[id]
-      cb(true)
+      cb && cb(true)
     }
-    else cb(false)
+    else cb && cb(false)
   }
 
   Model.count = function(cb) {

lib/stores/redis.js

@@ -15,7 +15,7 @@ exports.mixin = function(Model) {
   Model.destroy = function(id, cb) {
     Model.client.del(Model.type + ":" + id, function(err, data) {
       Model.client.ZREM(Model.type +"s", id, function(err, data) {
-        cb()
+        cb && cb()
       })
     })
   }
@@ -178,7 +178,6 @@ exports.mixin = function(Model) {
     }
 
     Model.client.ZADD(this.key() +":"+type, fscore, id, function(err, data) {
-      console.log(err, data, "X")
       cb && cb(!err)
     })
   }

lib/stores/rest.js

@@ -36,7 +36,7 @@ exports.mixin = function(Model) {
   Model.destroy = function(id, cb) {
     var self = this
     Model.ajax.post(Model.url + "/" + id + "/destroy", {}, function(o) {
-      cb(o)
+      cb && cb(o)
     })
   }
 }