Remove promise plugin

Author: smithsz

lib/client.js

@@ -23,8 +23,7 @@ const pkg = require('../package.json');
 const utils = require('./clientutils.js');
 
 const DEFAULTS = {
-  maxAttempt: 3,
-  usePromises: false
+  maxAttempt: 3
 };
 
 /**
@@ -42,7 +41,6 @@ class CloudantClient {
     var client;
     self._plugins = [];
     self._pluginIds = [];
-    self._usePromises = false;
     self.useLegacyPlugin = false;
 
     // Build plugin array.
@@ -120,12 +118,6 @@ class CloudantClient {
           if (plugin === 'base' || plugin === 'default') {
             return; // noop
           }
-          if (plugin === 'promises') {
-            // maps this.request -> this.doPromisesRequest
-            debug('Adding plugin: \'promises\'');
-            self._cfg.usePromises = true;
-            return;
-          }
 
           try {
             Plugin = require('../plugins/' + plugin);
@@ -196,35 +188,43 @@ class CloudantClient {
     this._client = require('request').defaults(requestDefaults);
   }
 
-  _doPromisesRequest(options, callback) {
-    var self = this;
+  _executeRequest(request, done) {
+    debug('Submitting request: %j', request.options);
 
-    return new Promise(function(resolve, reject) {
-      self._doRequest(options, function(error, response, data) {
-        if (typeof callback !== 'undefined') {
-          callback(error, response, data);
-        }
-        if (error) {
-          reject(error);
-        } else {
-          if (data) {
-            try {
-              data = JSON.parse(data);
-            } catch (err) {}
-          } else {
-            data = { statusCode: response.statusCode };
-          }
-          if (response.statusCode >= 200 && response.statusCode < 400) {
-            resolve(data);
-          } else {
-            reject(new CloudantError(response, data));
-          }
-        }
+    request.response = this._client(
+      request.options, utils.wrapCallback(request, done));
+
+    // define new source on event relay
+    request.eventRelay.setSource(request.response);
+
+    request.response
+      .on('response', function(response) {
+        request.response.pause();
+        utils.runHooks('onResponse', request, response, function() {
+          utils.processState(request, done); // process response hook results
+        });
       });
-    });
+
+    if (typeof request.clientCallback === 'undefined') {
+      debug('No client callback specified.');
+      request.response
+        .on('error', function(error) {
+          utils.runHooks('onError', request, error, function() {
+            utils.processState(request, done); // process error hook results
+          });
+        });
+    }
   }
 
-  _doRequest(options, callback) {
+  // public
+
+  /**
+   * Perform a request using this Cloudant client.
+   *
+   * @param {Object} options - HTTP options.
+   * @param {requestCallback} callback - The callback that handles the response.
+   */
+  request(options, callback) {
     var self = this;
 
     if (typeof options === 'string') {
@@ -346,50 +346,6 @@ class CloudantClient {
 
     return request.clientStream; // return stream to client
   }
-
-  _executeRequest(request, done) {
-    debug('Submitting request: %j', request.options);
-
-    request.response = this._client(
-      request.options, utils.wrapCallback(request, done));
-
-    // define new source on event relay
-    request.eventRelay.setSource(request.response);
-
-    request.response
-      .on('response', function(response) {
-        request.response.pause();
-        utils.runHooks('onResponse', request, response, function() {
-          utils.processState(request, done); // process response hook results
-        });
-      });
-
-    if (typeof request.clientCallback === 'undefined') {
-      debug('No client callback specified.');
-      request.response
-        .on('error', function(error) {
-          utils.runHooks('onError', request, error, function() {
-            utils.processState(request, done); // process error hook results
-          });
-        });
-    }
-  }
-
-  // public
-
-  /**
-   * Perform a request using this Cloudant client.
-   *
-   * @param {Object} options - HTTP options.
-   * @param {requestCallback} callback - The callback that handles the response.
-   */
-  request(options, callback) {
-    if (this._cfg.usePromises) {
-      return this._doPromisesRequest(options, callback);
-    } else {
-      return this._doRequest(options, callback);
-    }
-  }
 }
 
 module.exports = CloudantClient;