(daleharvey/pouchdb#1387) - pass object instead of 2 arguments for pl…

…ugins
pouchdb · Feb 27, 2014 · b59c969 · b59c969
1 parent 2c9c3bc
commit b59c969
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 51 deletions.
diff --git a/index.js b/index.js
@@ -364,7 +364,7 @@ function httpQuery(db, fun, opts) {
   }, callback);
 }
 
-module.exports = function (fun, opts, callback) {
+exports.query = function (fun, opts, callback) {
   var db = this;
   if (typeof opts === 'function') {
     callback = opts;
@@ -374,60 +374,36 @@ module.exports = function (fun, opts, callback) {
   if (callback) {
     opts.complete = callback;
   }
-  var tempCB = opts.complete;
-  var realCB;
-  if (opts.complete) {
-    realCB = function (err, resp) {
-      process.nextTick(function () {
-        tempCB(err, resp);
-      });
-    };
-  } 
-  var promise = new Promise(function (resolve, reject) {
-    opts.complete = function (err, data) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(data);
-      }
-    };
 
-    if (db.type() === 'http') {
-      if (typeof fun === 'function') {
-        return httpQuery(db, {map: fun}, opts);
-      }
-      return httpQuery(db, fun, opts);
+  if (db.type() === 'http') {
+    if (typeof fun === 'function') {
+      return httpQuery(db, {map: fun}, opts);
     }
+    return httpQuery(db, fun, opts);
+  }
 
-    if (typeof fun === 'object') {
-      return viewQuery(db, fun, opts);
-    }
+  if (typeof fun === 'object') {
+    return viewQuery(db, fun, opts);
+  }
 
-    if (typeof fun === 'function') {
-      return viewQuery(db, {map: fun}, opts);
-    }
+  if (typeof fun === 'function') {
+    return viewQuery(db, {map: fun}, opts);
+  }
 
-    var parts = fun.split('/');
-    db.get('_design/' + parts[0], function (err, doc) {
-      if (err) {
-        opts.complete(err);
-        return;
-      }
+  var parts = fun.split('/');
+  db.get('_design/' + parts[0], function (err, doc) {
+    if (err) {
+      opts.complete(err);
+      return;
+    }
 
-      if (!doc.views[parts[1]]) {
-        opts.complete({ name: 'not_found', message: 'missing_named_view' });
-        return;
-      }
-      viewQuery(db, {
-        map: doc.views[parts[1]].map,
-        reduce: doc.views[parts[1]].reduce
-      }, opts);
-    });
+    if (!doc.views[parts[1]]) {
+      opts.complete({ name: 'not_found', message: 'missing_named_view' });
+      return;
+    }
+    viewQuery(db, {
+      map: doc.views[parts[1]].map,
+      reduce: doc.views[parts[1]].reduce
+    }, opts);
   });
-  if (realCB) {
-    promise.then(function (resp) {
-      realCB(null, resp);
-    }, realCB);
-  }
-  return promise;
 };
diff --git a/package.json b/package.json
@@ -29,6 +29,9 @@
     "lie": "~2.5.1",
     "pouchdb-collate": "~1.0.0"
   },
+  "peerDependencies": {
+    "pouchdb": "~2.0.0"
+  },
   "devDependencies": {
     "chai": "~1.8.1",
     "mocha": "~1.14.0",

diff --git a/test/test.js b/test/test.js
@@ -3,7 +3,7 @@
 
 var Pouch = require('Pouchdb');
 var Mapreduce = require('../');
-Pouch.plugin('query', Mapreduce);
+Pouch.plugin(Mapreduce);
 var chai = require('chai');
 var should = chai.should();
 require("mocha-as-promised")();