Remove unecessary promises.

andymoon · Mar 26, 2013 · 38b084e · 38b084e
1 parent 9b2e75a
commit 38b084e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
+.idea
+atlassian-ide-plugin.xml
 node_modules
 *.iml
diff --git a/lib/aws/sns.js b/lib/aws/sns.js
@@ -1,7 +1,7 @@
 var extd = require("../extended"),
     BaseService = require("./baseService");
 
-extd.declare(BaseService, {
+BaseService.extend( {
 
     instance : {
 
@@ -12,7 +12,6 @@ extd.declare(BaseService, {
         __topicArn : null,
 
         addPermission : function(label, actions) {
-            var ret = new extd.Promise();
             if (this.topicArn) {
                 var query = {Action : "AddPermission", TopicArn : this.topicArn, label : label};
                 if (actions) {
@@ -25,29 +24,26 @@ extd.declare(BaseService, {
                         query["AWSAccountId.1"] = actions.accountId;
                         query["ActionName.1"] = actions.actionName;
                     }
-                    this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(this));
+                    return this.doRequest(query);
                 } else {
                     throw Error("Invalid query params.");
                 }
             } else {
                 throw Error("TopicArc required");
             }
-            return ret;
         },
 
         removePermission : function(label) {
-            var ret = new extd.Promise();
             if (this.topicArn) {
                 if (label) {
                     var query = {Action : "RemovePermission", TopicArn : this.topicArn, label : label};
-                    this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(this));
+                    return this.doRequest(query);
                 } else {
                     throw Error("Invalid query params.");
                 }
             } else {
                 throw Error("TopicArc required");
             }
-            return ret;
         },
 
         createTopic : function(name) {
@@ -142,13 +138,11 @@ extd.declare(BaseService, {
         },
 
         unSubscribe : function() {
-            var ret = new extd.Promise();
             if (this.topicArn) {
-                this.doRequest({Action : "Unsubscribe", SubscriptionArn: this.topicArn}).then(ret.callback.bind(ret), ret.errback.bind(this));
+                return this.doRequest({Action : "Unsubscribe", SubscriptionArn: this.topicArn});
             } else {
                 throw Error("TopicArc required");
             }
-            return ret;
         },
 
 

diff --git a/lib/aws/sqs.js b/lib/aws/sqs.js
@@ -1,7 +1,7 @@
 var extd = require("../extended"),
     BaseService = require("./baseService");
 
-extd.declare(BaseService, {
+BaseService.extend({
 
     instance : {
 
@@ -35,14 +35,12 @@ extd.declare(BaseService, {
         },
 
         deleteMessage : function(receiptHandle) {
-            var ret = new extd.Promise();
             if (receiptHandle) {
                 var query = {Action : "DeleteMessage", ReceiptHandle : receiptHandle};
-                this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(ret));
+                return this.doRequest(query);
             } else {
-                ret.errback("Invalid query params.");
+                throw Error("Invalid query params.");
             }
-            return ret;
         },
 
         receiveMessages : function(options) {
@@ -77,7 +75,6 @@ extd.declare(BaseService, {
         },
 
         addPermission : function(label, actions) {
-            var ret = new extd.Promise();
             var query = {Action : "AddPermission",label : label};
             if (actions) {
                 if (extd.isArray(actions)) {
@@ -89,22 +86,19 @@ extd.declare(BaseService, {
                     query["AWSAccountId.1"] = actions.accountId;
                     query["ActionName.1"] = actions.actionName;
                 }
-                this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(ret));
+                return this.doRequest(query);
             } else {
-                ret.errback("Invalid query params.");
+                throw Error("Invalid query params.");
             }
-            return ret;
         },
 
         removePermission : function(label) {
-            var ret = new extd.Promise();
             if (label) {
                 var query = {Action : "RemovePermission", label : label};
-                this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(ret));
+                return this.doRequest(query);
             } else {
-                ret.errback("Invalid query params.");
+                throw Error("Invalid query params.");
             }
-            return ret;
         },
 
         sendMessage : function(messageBody) {
@@ -123,14 +117,12 @@ extd.declare(BaseService, {
         },
 
         changeMessageVisibility : function(receiptHandle, visibilityTimeout) {
-            var ret = new extd.Promise();
             if (receiptHandle && !isNaN(visibilityTimeout)) {
                 var query = {Action : "ChangeMessageVisibility", ReceiptHandle : receiptHandle, VisibilityTimeout : visibilityTimeout};
-                this.doRequest(query).then(ret.callback.bind(ret), ret.errback.bind(ret));
+                return this.doRequest(query);
             } else {
-                ret.errback("Invalid query params.");
+                throw Error("Invalid query params.");
             }
-            return ret;
         },
 
         getters : {