Merge tag '4.0.1' into develop

4.0.1

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "6"
-  - "4"
   - "0.12"
+  - "node"
+  - "lts/*"
 services: 
   - mongodb
 sudo: false

lib/sequence.js

@@ -1,4 +1,5 @@
 var _ = require('lodash'),
+    async = require('async'),
     mongoose = null,
     SequenceArchive = require('./sequence_archive'),
     sequenceArchive = SequenceArchive.getSingleton(),
@@ -254,18 +255,24 @@ Sequence.prototype._resetCounter = function(id, reference, callback){
  * @param      {Function}  callback  Called with the sequence counter
  */
 Sequence.prototype._setNextCounter = function(doc, callback) {
-    var id = this.getId();
-    var referenceValue = this._getCounterReferenceField(doc);
-    this._counterModel.findOneAndUpdate(
-        { id: id, reference_value: referenceValue },
-        { $inc: { seq: 1 } },
-        { new: true, upsert: true, passRawResult: true },
-        function(err, counter) {
-            if (err) return callback(err);
-            return callback(null, counter.seq);
-        }
 
-    );
+    var retriable = function(callback) {
+        var id = this.getId();
+        var referenceValue = this._getCounterReferenceField(doc);
+        this._counterModel.findOneAndUpdate(
+            { id: id, reference_value: referenceValue },
+            { $inc: { seq: 1 } },
+            { new: true, upsert: true, passRawResult: true },
+            function(err, counter) {
+                if (err) return callback(err);
+                return callback(null, counter.seq);
+            }
+
+        );
+    };
+
+    async.retry(0, retriable.bind(this), callback);
+
 };
 
 module.exports = function(goose){

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongoose-sequence",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Very generic autoincrement plugin for mongoose",
   "main": "index.js",
   "scripts": {
@@ -23,16 +23,17 @@
   },
   "license": "GPL-2.0",
   "dependencies": {
+    "async": "^2.5.0",
     "lodash": "^4.6.1"
   },
   "peerDependencies": {
     "mongoose": ">=4"
   },
   "devDependencies": {
-    "async": "^1.4.2",
     "chai": "^3.3.0",
     "coveralls": "^2.11.8",
     "grunt": "^0.4.5",
+    "grunt-cli": "^1.2.0",
     "grunt-eslint": "^18.0.0",
     "grunt-mocha-istanbul": "^3.0.1",
     "istanbul": "^0.4.2",

test/base.js

@@ -156,6 +156,18 @@ describe('Basic => ', function() {
                 );
             });
 
+            it('can create multiple document in parallel when the sequence is on _id', function(done) {
+                async.parallel(
+                    [
+                        function(callback){ this.MainId.create({}, callback); }.bind(this),
+                        function(callback){ this.MainId.create({}, callback); }.bind(this),
+                        function(callback){ this.MainId.create({}, callback); }.bind(this)
+                    ],
+                    done
+                );
+            });
+
+
             it('updating a document do not increment the counter', function(done) {
                 this.SimpleField.findOne({}, function(err, entity) {
                     var id = entity.id;
@@ -187,7 +199,7 @@ describe('Basic => ', function() {
                         var ids = documents.map(function(d) {return d._id;});
 
                         try {
-                            assert.deepEqual(ids, [1, 2, 3, 4, 5]);
+                            assert.deepEqual([4, 5, 6, 7, 8], ids);
                         }catch (e) {
                             return done(e);
                         }