Merge pull request #6 from neighbourhoodie/chore/reconcile-pouchdb-server

chore: reconcile pouchdb-server version

Author: dheimoz

index.js

@@ -85,7 +85,7 @@ exports.createWrapperMethod = function (name, original, handler, db) {
 function createWrapper(name, original, handler, theWrapperBuilders, thisVal) {
   //thisVal is optional
   var buildWrapper = theWrapperBuilders[name];
-  if (typeof createWrapper === "undefined") {
+  if (typeof buildWrapper === "undefined") {
     throw new Error("No known wrapper for method name: " + name); //coverage: ignore
   }
   var handlers = [handler];
@@ -105,15 +105,14 @@ wrapperBuilders.destroy = function (db, destroy, handlers) {
 };
 
 wrapperBuilders.put = function (db, put, handlers) {
-  return function (doc, docId, docRev, options, callback) {
+  return function (/*doc, docId, docRev, options, callback*/) {
     var args = {};
     args.base = db || this;
-    args.db = db || this; //backwards compatibility
     var argsList = Array.prototype.slice.call(arguments);
     //parsing code borrowed from PouchDB (adapted).
     args.doc = argsList.shift();
     var id = '_id' in args.doc;
-    while (true) {
+    do {
       var temp = argsList.shift();
       var temptype = typeof temp;
       if (temptype === "string" && !id) {
@@ -126,10 +125,7 @@ wrapperBuilders.put = function (db, put, handlers) {
       } else if (temptype === "function") {
         args.callback = temp;
       }
-      if (!argsList.length) {
-        break;
-      }
-    }
+    } while (argsList.length);
     args.options = args.options || {};
     return callHandlers(handlers, args, function () {
       return put.call(this, args.doc, args.options);
@@ -148,7 +144,7 @@ wrapperBuilders.post = function (db, post, handlers) {
 };
 
 wrapperBuilders.get = function (db, get, handlers) {
-  return function(docId, options, callback) {
+  return function (docId, options, callback) {
     var args = parseBaseArgs(db, this, options, callback);
     args.docId = docId;
     return callHandlers(handlers, args, function () {
@@ -185,7 +181,7 @@ wrapperBuilders.bulkDocs = function (db, bulkDocs, handlers) {
   return function (docs, options, callback) {
     var args = parseBaseArgs(db, this, options, callback);
     //support the deprecated signature.
-    if ('new_edits' in docs) {
+    if (typeof(docs) === 'object' && 'new_edits' in docs) {
       args.options.new_edits = docs.new_edits;
     }
     args.docs = docs.docs || docs;
@@ -201,6 +197,7 @@ wrapperBuilders.allDocs = function (db, allDocs, handlers) {
     return callHandlers(handlers, args, makeCallWithOptions(allDocs, args));
   };
 };
+wrapperBuilders.bulkGet = wrapperBuilders.allDocs;
 
 wrapperBuilders.changes = function (db, changes, handlers) {
   return function (options, callback) {
@@ -297,13 +294,37 @@ wrapperBuilders.viewCleanup = function (db, viewCleanup, handlers) {
   };
 };
 
+wrapperBuilders.createIndex = function (db, createIndex, handlers) {
+  return function (index, options, callback) {
+    var args = parseBaseArgs(db, this, options, callback);
+    args.index = index;
+    return callHandlers(handlers, args, function () {
+      return createIndex.call(this, args.index);
+    });
+  };
+};
+wrapperBuilders.deleteIndex = wrapperBuilders.createIndex;
+
+
+wrapperBuilders.find = function (db, find, handlers) {
+  return function (request, options, callback) {
+    var args = parseBaseArgs(db, this, options, callback);
+    args.request = request;
+    return callHandlers(handlers, args, function () {
+      return find.call(this, args.request);
+    });
+  };
+};
+wrapperBuilders.explain = wrapperBuilders.find;
+
 wrapperBuilders.info = function (db, info, handlers) {
   return function (options, callback) {
     //see note on the options argument at putAttachment.
     var args = parseBaseArgs(db, this, options, callback);
     return callHandlers(handlers, args, makeCall(info));
   };
 };
+wrapperBuilders.getIndexes = wrapperBuilders.info;
 
 wrapperBuilders.compact = function (db, compact, handlers) {
   return function (options, callback) {
@@ -427,7 +448,6 @@ function parseBaseArgs(thisVal1, thisVal2, options, callback) {
   }
   return {
     base: thisVal1 || thisVal2,
-    db: thisVal1 || thisVal2, //backwards compatibility
     options: options || {},
     callback: callback
   };