(#1387) - prototype based plugins api

pouchdb · Feb 27, 2014 · 904838d · 904838d
1 parent d82e745
commit 904838d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/lib/constructor.js b/lib/constructor.js
@@ -137,23 +137,6 @@ function PouchDB(name, opts, callback) {
  callback(null, self);
 
  });
- for (var plugin in PouchDB.plugins) {
- if (PouchDB.plugins.hasOwnProperty(plugin)) {
-
- // In future these will likely need to be async to allow the plugin
- // to initialise
- var pluginObj = PouchDB.plugins[plugin](self);
- for (var api in pluginObj) {
- if (pluginObj.hasOwnProperty(api)) {
- // We let things like the http adapter use its own implementation
- // as it shares a lot of code
- if (!(api in self)) {
- self[api] = pluginObj[api];
- }
- }
- }
- }
- }
  if (opts.skipSetup) {
  self.taskqueue.ready(self);
  }

diff --git a/lib/index.js b/lib/index.js
@@ -20,7 +20,7 @@ PouchDB.adapter('https', httpAdapter);
 
 PouchDB.adapter('idb', require('./adapters/idb'));
 PouchDB.adapter('websql', require('./adapters/websql'));
-PouchDB.plugin('mapreduce', require('pouchdb-mapreduce'));
+PouchDB.plugin(require('pouchdb-mapreduce'));
 
 if (!process.browser) {
  var ldbAdapter = require('./adapters/leveldb');

diff --git a/lib/setup.js b/lib/setup.js
@@ -50,12 +50,6 @@ PouchDB.destroy = utils.toPromise(function (name, opts, callback) {
  var backend = PouchDB.parseAdapter(opts.name || name);
  var dbName = backend.name;
 
- for (var plugin in PouchDB.plugins) {
- if (PouchDB.plugins.hasOwnProperty(plugin)) {
- PouchDB.plugins[plugin]._delete(dbName);
- }
- }
-
  // call destroy method of the particular adaptor
  PouchDB.adapters[backend.adapter].destroy(dbName, opts, callback);
 });
@@ -70,8 +64,10 @@ PouchDB.adapter = function (id, obj) {
  }
 };
 
-PouchDB.plugin = function (id, obj) {
- PouchDB.plugins[id] = obj;
+PouchDB.plugin = function (obj) {
+ Object.keys(obj).forEach(function (id) {
+ PouchDB.prototype[id] = utils.toPromise(obj[id]);
+ });
 };
 
 module.exports = PouchDB;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "pouchdb",
- "version": "1.2.0-alpha",
+ "version": "2.0.0-alpha",
  "description": "PouchDB is a pocket-sized database.",
  "release": "nightly",
  "main": "./lib/index.js",
@@ -18,7 +18,7 @@
  ],
  "dependencies": {
  "request": "~2.28.0",
- "pouchdb-mapreduce": "0.6.2",
+ "pouchdb-mapreduce": "git:https://github.com/pouchdb/mapreduce.git#prototype",
  "bluebird": "~1.0.0",
  "level-sublevel": "~5.2.0",
  "levelup": "~0.18.2",