(pouchdb/pouchdb#3410) - use pouchdb-upsert

package.json

@@ -37,6 +37,7 @@
     "lie": "^2.6.0",
     "pouchdb-collate": "^1.2.0",
     "pouchdb-extend": "^0.1.0",
+    "pouchdb-upsert": "^1.0.2",
     "spark-md5": "0.0.5"
   },
   "devDependencies": {

test/test.js

@@ -54,7 +54,7 @@ describe('upsert', function () {
       }
     }, 'foo', function () {
       return false;
-    }).should.become('lalala');
+    }).should.be.fulfilled;
   });
   it('should error if it can\'t put', function () {
     return upsert({

upsert.js

@@ -1,41 +1,7 @@
 'use strict';
-var Promise = require('./utils').Promise;
 
-// this is essentially the "update sugar" function from daleharvey/pouchdb#1388
-// the diffFun tells us what delta to apply to the doc.  it either returns
-// the doc, or false if it doesn't need to do an update after all
-function upsert(db, docId, diffFun) {
-  return new Promise(function (fulfill, reject) {
-    if (docId && typeof docId === 'object') {
-      docId = docId._id;
-    }
-    if (typeof docId !== 'string') {
-      return reject(new Error('doc id is required'));
-    }
+var upsert = require('pouchdb-upsert').upsert;
 
-    db.get(docId, function (err, doc) {
-      if (err) {
-        if (err.status !== 404) {
-          return reject(err);
-        }
-        return fulfill(tryAndPut(db, diffFun({_id : docId}), diffFun));
-      }
-      var newDoc = diffFun(doc);
-      if (!newDoc) {
-        return fulfill(doc);
-      }
-      fulfill(tryAndPut(db, newDoc, diffFun));
-    });
-  });
-}
-
-function tryAndPut(db, doc, diffFun) {
-  return db.put(doc).catch(function (err) {
-    if (err.status !== 409) {
-      throw err;
-    }
-    return upsert(db, doc, diffFun);
-  });
-}
-
-module.exports = upsert;
+module.exports = function (db, doc, diffFun) {
+  return upsert.apply(db, [doc, diffFun]);
+};