Make queue creation sync again, separate ensureIndexes()

Author: chilts

README.md

@@ -166,7 +166,9 @@ change it and store it back.
 ### 0.6.0 (not yet released) ###
 
 * [NEW] The msg.id is now returned on successful Queue.ping() and Queue.ack() calls
+* [NEW] Call quueue.ensureIndexes(callback) to create them
 * [CHANGE] When a message is acked, 'deleted' is now set to the current time (not true)
+* [CHANGE] The queue is now created synchronously
 
 ### 0.5.0 (2014-03-21) ###
 

mongodb-queue.js

@@ -24,20 +24,9 @@ function datePlus(date, s) {
     return (new Date(delayDate)).toISOString()
 }
 
-module.exports = function(mongoDbClient, name, opts, callback) {
-    if ( !callback ) {
-        callback = opts
-        opts = {}
-    }
-
+module.exports = function(mongoDbClient, name, opts) {
     var queue = new Queue(mongoDbClient, name, opts)
-    queue.col.ensureIndex({ visible : 1 }, function(err) {
-        if (err) return callback(err)
-        queue.col.ensureIndex({ ack : 1 }, { unique : true, sparse : true }, function(err) {
-            if (err) return callback(err)
-            callback(null, queue)
-        })
-    })
+    return queue
 }
 
 // the Queue object itself
@@ -56,6 +45,18 @@ function Queue(mongoDbClient, name, opts) {
     this.delay = opts.delay || 0
 }
 
+Queue.prototype.ensureIndexes = function(callback) {
+    var self = this
+
+    self.col.ensureIndex({ visible : 1 }, function(err) {
+        if (err) return callback(err)
+        self.col.ensureIndex({ ack : 1 }, { unique : true, sparse : true }, function(err) {
+            if (err) return callback(err)
+            callback()
+        })
+    })
+}
+
 Queue.prototype.add = function(payload, callback) {
     var self = this
     var aDate = date()

test/default.js

@@ -7,24 +7,17 @@ var mongoDbQueue = require('../')
 setup(function(db) {
 
     test('first test', function(t) {
-        mongoDbQueue(db, 'default', function(err, queue) {
-            t.ok(queue, 'Queue created ok')
-            t.end()
-        })
+        var queue = mongoDbQueue(db, 'default')
+        t.ok(queue, 'Queue created ok')
+        t.end()
     });
 
     test('single round trip', function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'default')
         var msg
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'default', function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     queue.add('Hello, World!', function(err, id) {
                         t.ok(!err, 'There is no error when adding a message.')

test/delay.js

@@ -7,16 +7,10 @@ var mongoDbQueue = require('../')
 setup(function(db) {
 
     test('delay: check messages on this queue are returned after the delay', function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'delay', { delay : 3 })
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'delay', { delay : 3 }, function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     queue.add('Hello, World!', function(err, id) {
                         t.ok(!err, 'There is no error when adding a message.')

test/multi.js

@@ -9,17 +9,11 @@ var total = 250
 setup(function(db) {
 
     test('multi: add ' + total + ' messages, get ' + total + ' back', function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'multi')
         var msgs = []
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'multi', function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     var i, done = 0
                     for(i=0; i<total; i++) {

test/ping.js

@@ -7,17 +7,11 @@ var mongoDbQueue = require('../')
 setup(function(db) {
 
     test('ping: check a retrieved message with a ping can still be acked', function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'ping', { visibility : 5 })
         var msg
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'ping', { visibility : 5 }, function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     queue.add('Hello, World!', function(err, id) {
                         t.ok(!err, 'There is no error when adding a message.')

test/visibility.js

@@ -7,16 +7,10 @@ var mongoDbQueue = require('../')
 setup(function(db) {
 
     test('visibility: check message is back in queue after 3s', function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'visibility', { visibility : 3 })
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'visibility', { visibility : 3 }, function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     queue.add('Hello, World!', function(err) {
                         t.ok(!err, 'There is no error when adding a message.')
@@ -58,17 +52,11 @@ setup(function(db) {
     })
 
     test("visibility: check that a late ack doesn't remove the msg", function(t) {
-        var queue
+        var queue = mongoDbQueue(db, 'visibility', { visibility : 3 })
         var originalAck
 
         async.series(
             [
-                function(next) {
-                    mongoDbQueue(db, 'visibility', { visibility : 3 }, function(err, q) {
-                        queue = q
-                        next(err)
-                    })
-                },
                 function(next) {
                     queue.add('Hello, World!', function(err) {
                         t.ok(!err, 'There is no error when adding a message.')