Fixed Memory and Mongo persistence ready callback support.

lib/persistence/memory.js

@@ -13,16 +13,18 @@ var factory = function (location) { return new MemDOWN(location); };
  * minus the `db`, which is set to MemDOWN for convenience.
  *
  * @api public
+ * @param {Object} options The options to create this persistance
+ * @param {Function} callback Called when ready.
  */
-function MemoryPersistence(options) {
+function MemoryPersistence(options, callback) {
   if (!(this instanceof MemoryPersistence)) {
-    return new MemoryPersistence(options);
+    return new MemoryPersistence(options, callback);
   }
 
   options = options || {};
   options.db = factory;
   options.path = "RAM";
-  LevelUpPersistence.call(this, options);
+  LevelUpPersistence.call(this, options, callback);
 }
 
 util.inherits(MemoryPersistence, LevelUpPersistence);

lib/persistence/mongo.js

@@ -39,7 +39,7 @@ var defaults = {
  */
 function MongoPersistence(options, done) {
   if (!(this instanceof MongoPersistence)) {
-    return new MongoPersistence(options);
+    return new MongoPersistence(options, done);
   }
 
 

test/persistence/abstract.js

@@ -3,18 +3,32 @@
 var async = require("async");
 var EventEmitter = require("events").EventEmitter;
 
-module.exports = function(create) {
+module.exports = function(create, buildOpts) {
+  var _opts;
+
+  if (typeof buildOpts !== "function") {
+    _opts = buildOpts;
+    buildOpts = function(cb) {
+      cb(null, _opts); 
+    };
+  }
 
   beforeEach(function(done) {
     var that = this;
-    create.call(this, function(err, result, opts) {
+    buildOpts(function(err, opts) {
       if (err) {
         return done(err);
       }
 
-      that.instance = result;
-      that.opts = opts;
-      done();
+      create(opts, function(err, result) {
+        if (err) {
+          return done(err);
+        }
+
+        that.instance = result;
+        that.opts = opts;
+        done();
+      });
     });
   });
 

test/persistence/levelup_spec.js

@@ -15,16 +15,15 @@ describe("mosca.persistence.LevelUp", function() {
     }
   };
 
-  abstract(function(cb) {
+  abstract(LevelUp, function(cb) {
     var that = this;
     tmp.dir(function (err, path) {
       if (err) {
         return cb(err);
       }
 
-      that.path = path;
       opts.path = path;
-      cb(null, new LevelUp(opts), opts);
+      cb(null, opts);
     });
   });
 

test/persistence/memory_spec.js

@@ -13,7 +13,5 @@ describe("mosca.persistence.Memory", function() {
     }
   };
 
-  abstract(function(cb) {
-    cb(null, new Memory(opts), opts);
-  });
+  abstract(Memory, opts);
 });

test/persistence/mongo_spec.js

@@ -40,11 +40,7 @@ describe("mosca.persistence.Mongo", function() {
     this.secondInstance = null;
   });
 
-  abstract(function(cb) {
-    new Mongo(opts, function(err, mongo) {
-      cb(err, mongo, opts);
-    });
-  });
+  abstract(Mongo, opts);
 
   describe("two clients", function() {
 

test/persistence/redis_spec.js

@@ -14,11 +14,7 @@ describe("mosca.persistence.Redis", function() {
     }
   };
 
-  abstract(function(cb) {
-    new Redis(opts, function(err, instance) {
-      cb(null, instance, opts);
-    });
-  });
+  abstract(Redis, opts);
 
   afterEach(function(cb) {
     var flush = function() {