melhorias na lib

lib/IuguMethod.js

@@ -34,7 +34,7 @@ module.exports = function iuguMethod(spec) {
 
     for (var i = 0, l = urlParams.length; i < l; ++i) {
       var arg = args[0];
-      if (urlParams[i] && !arg) {
+      if (urlParams[i] && (!arg && arg !== 0)) {
         throw new Error('Iugu: I require argument "' + urlParams[i] + '", but I got: ' + arg);
       }
       urlData[urlParams[i]] = args.shift();

lib/IuguResource.js

@@ -4,7 +4,7 @@ var http = require('http');
 var https = require('https');
 var path = require('path');
 var when = require('when');
-
+var request = require('request');
 var utils = require('./utils');
 var Error = require('./Error');
 
@@ -46,10 +46,10 @@ IuguResource.prototype = {
 
   createFullPath: function(commandPath, urlData) {
     return path.join(
-      this.basePath(urlData),
-      this.path(urlData),
-      typeof commandPath == 'function' ?
-        commandPath(urlData) : commandPath
+        this.basePath(urlData),
+        this.path(urlData),
+        typeof commandPath == 'function' ?
+            commandPath(urlData) : commandPath
     ).replace(/\\/g, '/'); // ugly workaround for Windows
   },
 
@@ -65,19 +65,19 @@ IuguResource.prototype = {
   },
 
   createDeferred: function(callback) {
-      var deferred = when.defer();
-
-      if (callback) {
-        // Callback, if provided, is a simply translated to Promise'esque:
-        // (Ensure callback is called outside of promise stack)
-        deferred.promise.then(function(res) {
-          setTimeout(function(){ callback(null, res) }, 0);
-        }, function(err) {
-          setTimeout(function(){ callback(err, null); }, 0);
-        });
-      }
+    var deferred = when.defer();
+
+    if (callback) {
+      // Callback, if provided, is a simply translated to Promise'esque:
+      // (Ensure callback is called outside of promise stack)
+      deferred.promise.then(function(res) {
+        setTimeout(function(){ callback(null, res) }, 0);
+      }, function(err) {
+        setTimeout(function(){ callback(err, null); }, 0);
+      });
+    }
 
-      return deferred;
+    return deferred;
   },
 
   _timeoutHandler: function(timeout, req, callback) {
@@ -90,12 +90,12 @@ IuguResource.prototype = {
       req.abort();
 
       callback.call(
-        self,
-        new Error.IuguConnectionError({
-          message: 'Request aborted due to timeout being reached (' + timeout + 'ms)',
-          detail: timeoutErr
-        }),
-        null
+          self,
+          new Error.IuguConnectionError({
+            message: 'Request aborted due to timeout being reached (' + timeout + 'ms)',
+            detail: timeoutErr
+          }),
+          null
       );
     }
   },
@@ -123,13 +123,13 @@ IuguResource.prototype = {
           }
         } catch (e) {
           return callback.call(
-            self,
-            new Error.IuguAPIError({
-              message: 'Invalid JSON received from the Iugu API',
-              response: response,
-              exception: e
-            }),
-            null
+              self,
+              new Error.IuguAPIError({
+                message: 'Invalid JSON received from the Iugu API',
+                response: response,
+                exception: e
+              }),
+              null
           );
         }
         callback.call(self, null, response);
@@ -142,71 +142,111 @@ IuguResource.prototype = {
     return function(error) {
       if (req._isAborted) return; // already handled
       callback.call(
-        self,
-        new Error.IuguConnectionError({
-          message: 'An error occurred with our connection to Iugu',
-          detail: error
-        }),
-        null
+          self,
+          new Error.IuguConnectionError({
+            message: 'An error occurred with our connection to Iugu',
+            detail: error
+          }),
+          null
       );
     }
   },
 
   _request: function(method, path, data, auth, callback) {
-
-    var requestData = utils.stringifyRequestData(data || {});
     var self = this;
-console.log(requestData);
+
+    var  host =  self._iugu.getApiField('host');
+    var  protocol = self._iugu.getApiField('protocol') === 'http' ? 'http' : 'https';
+    var  port =  self._iugu.getApiField('port');
     var apiVersion = this._iugu.getApiField('version');
+
+
     var headers = {
       // Use specified auth token or use default from this stripe instance:
       'Authorization': auth ?
-        'Basic ' + new Buffer(auth + ':').toString('base64') :
-        this._iugu.getApiField('auth'),
+      'Basic ' + new Buffer(auth + ':').toString('base64') :
+          this._iugu.getApiField('auth'),
       'Accept': 'application/json',
-      'Content-Type': 'application/x-www-form-urlencoded',
-      'Content-Length': requestData.length,
-      'User-Agent': 'Iugu/v1 NodeBindings/' + this._iugu.getConstant('PACKAGE_VERSION')
+      'Content-Type': 'application/json'
     };
 
-    if (apiVersion) {
-      headers['Iugu-Version'] = apiVersion;
-    }
+    var uri = protocol + "://" + host + ':' + port + '/' + path;
 
-    // Grab client-user-agent before making the request:
-    this._iugu.getClientUserAgent(function(cua) {
-      headers['X-Iugu-Client-User-Agent'] = cua;
-      makeRequest();
-    });
-
-    function makeRequest() {
+    var options = {
+      uri: uri,
+      method: method,
+      json: true,
+      headers: headers
+    };
 
-      var timeout = self._iugu.getApiField('timeout');
+    if ((method === 'POST' || method === 'PUT')&& data){
+      options.body = data;
+    }
 
-      var req = (
-        self._iugu.getApiField('protocol') == 'http' ? http : https
-      ).request({
-        host: self._iugu.getApiField('host'),
-        port: self._iugu.getApiField('port'),
-        path: path,
-        method: method,
-        headers: headers
-      });
 
-      req.setTimeout(timeout, self._timeoutHandler(timeout, req, callback));
-      req.on('response', self._responseHandler(req, callback));
-      req.on('error', self._errorHandler(req, callback));
+    request(options,callback);
+    console.log(data);
 
-      req.on('socket', function(socket) {
-        socket.on('secureConnect', function() {
-          req.write(requestData);
-          req.end();
-        });
-      });
+  }
 
-    }
 
-  }
+  //_request: function(method, path, data, auth, callback) {
+  //
+  //  //var requestData = utils.stringifyRequestData(data || {});
+  //  var requestData = data;
+  //  var self = this;
+  //  console.log(requestData);
+  //  var apiVersion = this._iugu.getApiField('version');
+  //  var headers = {
+  //    // Use specified auth token or use default from this stripe instance:
+  //    'Authorization': auth ?
+  //      'Basic ' + new Buffer(auth + ':').toString('base64') :
+  //      this._iugu.getApiField('auth'),
+  //    'Accept': 'application/json',
+  //    'Content-Type': 'application/json',
+  //    //'Content-Type': 'application/x-www-form-urlencoded',
+  //    'Content-Length': requestData.length,
+  //    'User-Agent': 'Iugu/v1 NodeBindings/' + this._iugu.getConstant('PACKAGE_VERSION')
+  //  };
+  //
+  //  if (apiVersion) {
+  //    headers['Iugu-Version'] = apiVersion;
+  //  }
+  //
+  //  // Grab client-user-agent before making the request:
+  //  this._iugu.getClientUserAgent(function(cua) {
+  //    headers['X-Iugu-Client-User-Agent'] = cua;
+  //    makeRequest();
+  //  });
+  //
+  //  function makeRequest() {
+  //
+  //    var timeout = self._iugu.getApiField('timeout');
+  //
+  //    var req = (
+  //      self._iugu.getApiField('protocol') == 'http' ? http : https
+  //    ).request({
+  //      host: self._iugu.getApiField('host'),
+  //      port: self._iugu.getApiField('port'),
+  //      path: path,
+  //      method: method,
+  //      headers: headers
+  //    });
+  //
+  //    req.setTimeout(timeout, self._timeoutHandler(timeout, req, callback));
+  //    req.on('response', self._responseHandler(req, callback));
+  //    req.on('error', self._errorHandler(req, callback));
+  //
+  //    req.on('socket', function(socket) {
+  //      socket.on('secureConnect', function() {
+  //        req.write(requestData);
+  //        req.end();
+  //      });
+  //    });
+  //
+  //  }
+  //
+  //}
 
 };
 

lib/iugu.js

@@ -33,6 +33,7 @@ var resources = {
   Subscriptions: require('./resources/Subscriptions'),
   PaymentToken: require('./resources/PaymentToken'),
   Transfers: require('./resources/Transfers'),
+  WithDrawRequests: require('./resources/WithDrawRequests'),
 
   // The following rely on pre-filled customer IDs:
   CustomerPaymentMethods: require('./resources/CustomerPaymentMethods'),

lib/resources/Accounts.js

@@ -12,12 +12,6 @@ module.exports = IuguResource.extend({
     method: 'POST',
     path: '{accountId}/request_verification',
     urlParams: ['accountId']
-  }),
-
-  request_withdraw: iuguMethod({
-    method: 'POST',
-    path: '{accountId}/request_withdraw',
-    urlParams: ['accountId']
   })
 
 });

lib/resources/Invoices.js

@@ -20,4 +20,12 @@ module.exports = IuguResource.extend({
     urlParams: ['invoiceId']
   }),
 
+
+  listPaginated : iuguMethod({
+    method: 'GET',
+    path: '?limit={limit}&start={start}&created_at_from={created_at_from}&created_at_to={created_at_to}',
+    urlParams: ['limit','start','created_at_from','created_at_to']
+  })
+
+
 });

lib/resources/WithDrawRequests.js

@@ -0,0 +1,14 @@
+'use strict';
+
+var IuguResource = require('../IuguResource');
+var iuguMethod = IuguResource.method;
+
+module.exports = IuguResource.extend({
+
+  path: 'withdraw_requests',
+  includeBasic: ['list' , 'retrieve'],
+
+
+
+});
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iugu",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Biblioteca Iugu para Node.js",
   "homepage": "https://github.com/iugu/iugu-node",
   "author": {
@@ -24,6 +24,9 @@
     "mocha-as-promised": "~1.4.0"
   },
   "dependencies": {
+    "continuation-local-storage": "^3.1.4",
+    "request": "^2.67.0",
+    "request-promise": "^1.0.2",
     "when": "~3.1.0"
   },
   "scripts": {