Merge pull request #53 from dhritzkiv/mongoskin2

Update to mongoskin v2
scttnlsn · Oct 1, 2015 · d0087e4 · d0087e4
2 parents a320b58 + bcc8680
commit d0087e4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 29 deletions.
diff --git a/lib/queue.js b/lib/queue.js
@@ -32,7 +32,7 @@ Queue.prototype.get = function (id, callback) {
     var self = this;
 
     if (typeof id === 'string') {
-        id = new mongoskin.BSONPure.ObjectID(id);
+        id = new mongoskin.helper.toObjectID(id);
     }
 
     this.collection.findOne({ _id: id, queue: this.name }, function (err, data) {
@@ -91,9 +91,9 @@ Queue.prototype.dequeue = function (options, callback) {
 
     this.collection.findAndModify(query, sort, update, options, function (err, doc) {
         if (err) return callback(err);
-        if (!doc) return callback();
+        if (!doc || !doc.value) return callback();
 
-        callback(null, self.job(doc));
+        callback(null, self.job(doc.value));
     });
 };
 

diff --git a/package.json b/package.json
@@ -1,27 +1,24 @@
 {
-    "name": "monq",
-    "version": "0.3.2",
-    "description": "MongoDB-backed job queue for Node.js",
-    "homepage": "http://github.com/scttnlsn/monq",
-    "author": "Scott Nelson <[email protected]>",
-    "main": "./lib/index",
-
-    "scripts": {
-        "test": "./node_modules/.bin/mocha"
-    },
-
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/scttnlsn/monq.git"
-    },
-
-    "dependencies": {
-        "mongoskin": "1.4.13"
-    },
-
-    "devDependencies": {
-        "async": "0.2.10",
-        "mocha": "1.18.2",
-        "sinon": "1.9.0"
-    }
+  "name": "monq",
+  "version": "0.3.2",
+  "description": "MongoDB-backed job queue for Node.js",
+  "homepage": "http://github.com/scttnlsn/monq",
+  "author": "Scott Nelson <[email protected]>",
+  "main": "./lib/index",
+  "scripts": {
+    "test": "./node_modules/.bin/mocha"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/scttnlsn/monq.git"
+  },
+  "dependencies": {
+    "mongodb": "^2.0.44",
+    "mongoskin": "^2.0.0"
+  },
+  "devDependencies": {
+    "async": "0.2.10",
+    "mocha": "1.18.2",
+    "sinon": "1.9.0"
+  }
 }
diff --git a/test/test_queue.js b/test/test_queue.js
@@ -108,4 +108,4 @@ describe('Queue', function () {
             });
         });
     });
-});
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,4 +108,4 @@ describe('Queue', function () { @@
                 });
             });
         });
-    });
+    });