improved promise polyfill usage under node.js

Workfront · Dec 26, 2014 · 6be94b6 · 6be94b6
1 parent 5e1138d
commit 6be94b6
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 70 deletions.
diff --git a/dist/attask.js b/dist/attask.js
diff --git a/examples/node/create-new-project.js b/examples/node/create-new-project.js
@@ -1,5 +1,3 @@
-global.Promise = require('promise');
-
 var ApiFactory = require('./../../').ApiFactory;
 var util = require('util');
 

diff --git a/examples/node/get-project-details.js b/examples/node/get-project-details.js
@@ -1,5 +1,3 @@
-global.Promise = require('promise');
-
 var ApiFactory = require('./../../').ApiFactory;
 var util = require('util');
 

diff --git a/examples/node/login.js b/examples/node/login.js
@@ -1,5 +1,3 @@
-global.Promise = require('promise');
-
 var ApiFactory = require('./../../').ApiFactory;
 var util = require('util');
 

diff --git a/examples/node/logout.js b/examples/node/logout.js
@@ -1,5 +1,3 @@
-global.Promise = require('promise');
-
 var ApiFactory = require('./../../').ApiFactory;
 var util = require('util');
 

diff --git a/examples/node/search-for-projects.js b/examples/node/search-for-projects.js
@@ -1,5 +1,3 @@
-global.Promise = require('promise');
-
 var ApiFactory = require('./../../').ApiFactory;
 var util = require('util');
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -37,6 +37,7 @@ gulp.task('build', ['clean-build'], function() {
 				standalone: 'AtTask'
 			}
 		)
+		.ignore('promise/polyfill')
 		.bundle()
 		.pipe(source('attask.js'))
 		.pipe(gulp.dest(BUILD_DIR));

diff --git a/index.js b/index.js
@@ -1,3 +1,5 @@
+require('promise/polyfill');
+
 var ApiFactory = require('./src/ApiFactory');
 var Api = require('./src/Api');
 var ApiUtil = require('./src/ApiUtil');

diff --git a/src/request.js b/src/request.js
@@ -16,18 +16,10 @@ module.exports = function(Api) {
         options.path = path_module.join(this.httpOptions.path, path);
 
         if (fields.length !== 0) {
-            params["fields"] = fields.join();
+            params['fields'] = fields.join();
         }
         options.path += '?' + queryString.stringify(params);
 
-        // Add xsrf header
-        //var xsrfValue = urlIsSameOrigin(config.url)
-        //    ? cookies.read(config.xsrfCookieName || defaults.xsrfCookieName)
-        //    : undefined;
-        //if (xsrfValue) {
-        //    headers[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
-        //}
-
         return new Promise(function (resolve, reject) {
             /*options = {
                 hostname: 'echo.jsontest.com',
@@ -36,13 +28,15 @@ module.exports = function(Api) {
                 withCredentials: false
             };*/
 
-            var req = http.request(options, function (res) {
+            var request = http.request(options, function (response) {
                 var body = '';
-                //res.setEncoding('utf8');
-                res.on('data', function (chunk) {
+                if (typeof response.setEncoding === 'function') {
+                    response.setEncoding('utf8');
+                }
+                response.on('data', function (chunk) {
                     body += chunk;
                 });
-                res.on('end', function () {
+                response.on('end', function () {
                     var data = JSON.parse(body);
                     if (data.error) {
                         reject(data);
@@ -51,8 +45,8 @@ module.exports = function(Api) {
                     }
                 });
             });
-            req.on('error', reject);
-            req.end();
+            request.on('error', reject);
+            request.end();
         });
     };
 };