fix: shorter promise chains and better bind syntax

Author: bhovhannes

src/plugins/apiKey.js

@@ -51,16 +51,15 @@ module.exports = function(Api) {
      * @return {Promise}    A promise which will resolved if everything went ok and rejected otherwise
      */
     Api.prototype.clearApiKey = function () {
-        var that = this;
         return new Promise(function (resolve, reject) {
-            that.execute('USER', null, 'clearApiKey').then(function (result) {
+            this.execute('USER', null, 'clearApiKey').then(function (result) {
                 if (result) {
-                    delete that.httpParams.apiKey;
+                    delete this.httpParams.apiKey;
                     resolve();
                 } else {
                     reject();
                 }
-            });
-        });
+            }.bind(this));
+        }.bind(this));
     }
 };

src/plugins/count.js

@@ -26,12 +26,8 @@ module.exports = function(Api) {
      * @return {Promise}
      */
     Api.prototype.count = function (objCode, query) {
-        var that = this;
-        return new Promise(function (resolve, reject) {
-            that.request(objCode + '/count', query, null, Api.Methods.GET)
-                .then(function (data) {
-                    resolve(data.count);
-                }, reject);
+        return this.request(objCode + '/count', query, null, Api.Methods.GET).then(function (data) {
+            return data.count;
         });
     };
 };

src/plugins/login.js

@@ -28,13 +28,9 @@ module.exports = function(Api) {
      * @return {Promise}    A promise which will resolved with logged in user data if everything went ok and rejected otherwise
      */
     Api.prototype.login = function (username, password) {
-        var that = this;
-        return new Promise(function (resolve, reject) {
-            that.request('login', {username: username, password: password}, null, Api.Methods.POST)
-                .then(function (data) {
-                    that.httpOptions.headers.sessionID = data.sessionID;
-                    resolve(data);
-                }, reject);
-        });
+        return this.request('login', {username: username, password: password}, null, Api.Methods.POST).then(function (data) {
+            this.httpOptions.headers.sessionID = data.sessionID;
+            return data;
+        }.bind(this));
     };
 };

src/plugins/logout.js

@@ -25,16 +25,15 @@ module.exports = function(Api) {
      * @return {Promise}    A promise which will resolved if everything went ok and rejected otherwise
      */
     Api.prototype.logout = function () {
-        var that = this;
         return new Promise(function (resolve, reject) {
-            that.request('logout', null, null, Api.Methods.GET).then(function (result) {
+            this.request('logout', null, null, Api.Methods.GET).then(function (result) {
                 if (result && result.success) {
-                    delete that.httpOptions.headers.sessionID;
+                    delete this.httpOptions.headers.sessionID;
                     resolve();
                 } else {
                     reject();
                 }
-            });
-        });
+            }.bind(this));
+        }.bind(this));
     };
 };

src/plugins/remove.js

@@ -28,16 +28,15 @@ module.exports = function(Api) {
      * @returns {Promise}    A promise which will resolved if everything went ok and rejected otherwise
      */
     Api.prototype.remove = function (objCode, objID, bForce) {
-        var that = this;
         return new Promise(function (resolve, reject) {
             var params = bForce ? {force: true} : null;
-            that.request(objCode + '/' + objID, params, null, Api.Methods.DELETE).then(function (result) {
+            this.request(objCode + '/' + objID, params, null, Api.Methods.DELETE).then(function (result) {
                 if (result && result.success) {
                     resolve();
                 } else {
                     reject();
                 }
             }, reject);
-        });
+        }.bind(this));
     };
 };

src/plugins/request.js

@@ -27,31 +27,32 @@ module.exports = function(Api) {
         return method !== Api.Methods.GET && method !== Api.Methods.PUT;
     };
 
-    Api.prototype._handleResponse = function(resolve, reject){
-      return function (response) {
-          var body = '';
-          if (typeof response.setEncoding === 'function') {
-              response.setEncoding('utf8');
-          }
-          response.on('data', function (chunk) {
-              body += chunk;
-          });
-          response.on('end', function () {
-              var data;
-              try {
-                  data = JSON.parse(body);
-              }
-              catch(e) {
-                  reject(body);
-                  return;
-              }
-              if (data.error) {
-                  reject(data);
-              } else {
-                  resolve(data.data);
-              }
-          });
-      };
+    Api.prototype._handleResponse = function (resolve, reject) {
+        return function (response) {
+            var body = '';
+            if (typeof response.setEncoding === 'function') {
+                response.setEncoding('utf8');
+            }
+            response.on('data', function (chunk) {
+                body += chunk;
+            });
+            response.on('end', function () {
+                console.log('end'); //eslint-disable-line
+                var data;
+                try {
+                    data = JSON.parse(body);
+                }
+                catch (e) {
+                    reject(body);
+                    return;
+                }
+                if (data.error) {
+                    reject(data);
+                } else {
+                    resolve(data.data);
+                }
+            });
+        };
     };
 
     Api.prototype.request = function(path, params, fields, method) {
@@ -73,7 +74,6 @@ module.exports = function(Api) {
             options.method = method;
         }
 
-        util._extend(options, this.httpOptions);
         if (path.indexOf('/') === 0) {
             options.path = this.httpOptions.path + path;
         }

test/plugins/count.spec.js

@@ -41,6 +41,7 @@ describe('Api.count() method', function() {
 
 		var objCode = 'baz';
 
+		api.request.resolves();
 		api.count(objCode, query);
 		expect(api.request).to.have.callCount(1);
 		expect(api.request).to.have.been.calledWith(objCode + "/count", query, null, "GET");

test/plugins/login.spec.js

@@ -36,6 +36,7 @@ describe('Api.login() method', function() {
 	it('should call request() with proper params', function() {
 		var username = 'bar',
 			password = 'baz';
+		api.request.resolves();
 		api.login(username, password);
 		expect(api.request).to.have.callCount(1);
 		expect(api.request).to.have.been.calledWith("login", {username: username, password: password}, null, "POST");