Merge branch 'master' into 1.1.0

README.md

@@ -1,3 +1,5 @@
+![Build](https://circleci.com/gh/jusx/node-wufoo.svg?style=shield&circle-token=3c6bf745453828aa4cc23daf7befe363287e0b97)
+
 # Node-Wufoo 
 
 Node-Wufoo is a [Wufoo API] (http://www.wufoo.com/docs/api/v3/) wrapper for [node.js] (http://nodejs.org/). It simplifies working with the Wufoo API and provides an abstraction layer.
@@ -336,7 +338,7 @@ Please fork it. Add new features or fix bugs and do a pull request. Tests should
 - Create new Pull Request.
 
 ### Testing
-Be sure to have [mocha](http://visionmedia.github.io/mocha/) installed. Run the entire test suite from the root directory of the project:
+Be sure to have [mocha](http://mochajs.org/) installed. Run the entire test suite from the root directory of the project:
 
     $ mocha
 
@@ -346,4 +348,4 @@ Node-Wufoo implements almost all of the Wufoo RESTful API except the following:
 - Updating Entries ([POST API] (http://www.wufoo.com/docs/api/v3/entries/post/)).
 - [Login] (http://www.wufoo.com/docs/api/v3/login/).
 
-Implementation and support of the above will be included in future versions. 
+Implementation and support of the above will be included in future versions. 

circle.yml

@@ -0,0 +1,3 @@
+test:
+   override:
+      - mocha

lib/webhook.js

@@ -20,4 +20,4 @@ WebHook.prototype.delete = function(formid, hashId, fn) {
    this.wufoo.request("delete", this.wufoo._toUri("forms/" + formid + "/webhooks/" + hashId), function(err, json) {
       fn(err, (json.WebHookDeleteResult.Hash == hashId));
    });
-}
+}

lib/wufoo.js

@@ -19,7 +19,7 @@ module.exports = Wufoo;
 function Wufoo(account, apiKey) {
    this.account = account;
    this.url = "https://"+account+".wufoo.com/api/v3/";
-   this.apiKey = apiKey;   
+   this.apiKey = apiKey;
 }
 
 // build the arguments params, fn
@@ -118,16 +118,6 @@ Wufoo.prototype.get = function (uri, params, fn) {
 //    uri: full uri
 //     fn: callback function.
 Wufoo.prototype.request = function(method, uri, params, fn) {
-
-
-   if (fn!=undefined && params !=undefined && method.toUpperCase()=='GET') {
-      params = Object.keys(params).map(function(k) {
-          //return encodeURIComponent(k) + '=' + encodeURIComponent(params[k])
-          return (k) + '=' + (params[k])
-      }).join('&')
-      uri+='?'+params;
-      params = {};
-   }
 
    var options = {
       uri: uri,
@@ -136,11 +126,11 @@ Wufoo.prototype.request = function(method, uri, params, fn) {
          "Authorization" : "Basic " + new Buffer(this.apiKey + ":footastic").toString("base64")
       }
    }
-   
-   if (fn!=undefined && params !=undefined) options["form"] = params; // params for form post was passed in.
+
+   if (fn!=undefined && params !=undefined) options["body"] = require('querystring').stringify(params); // params for form post was passed in.
    if (fn == undefined && params != undefined) fn = params; // no params was passed in. In which case it is fn callback.
-   
-   request(options, function(err, res, body) { 
+
+   request(options, function(err, res, body) {
       if (err){console.error(err);}
       fn(err, JSON.parse(body));
    });
@@ -174,7 +164,7 @@ function Form(wufoo) {
 }
 
 Form.prototype.addWebhook = function(opt, fn) {
-   this.wufoo.webhook().add(this.hash, opt, fn);      
+   this.wufoo.webhook().add(this.hash, opt, fn);
 }
 
 Form.prototype.deleteWebhook = function(hookid, fn) {
@@ -191,8 +181,3 @@ Report.prototype.getWidgets = function() {
    var args = this.buildArgs.apply(null, arguments);
    this._cacheOrFetch(this.linkWidgets, "Widgets", args.params, args.fn);
 }
-
-
-
-
-

test/form.js

@@ -3,37 +3,37 @@ var helper = require("./helper.js");
 
 describe("Form", function() {
    var $form;
-   
+
    before(function(done) {
       helper.wufoo.getForms(function(err, forms){
          $form = forms[0];
          done(err);
       });
    })
-   
+
    describe("#getEntries", function() {
       it("Should return array of entries", function(done){
          $form.getEntries({system:'true'}, function(err, entries){
             (entries.constructor == Array).should.be.true;
             helper.isEntry(entries[0]);
             done(err);
-         }); 
+         });
       })
-      
+
    });
-   
+
    describe("#getFields", function() {
       it("Should return array of fields", function(done){
          $form.getFields({system:'true'}, function(err, fields){
             (fields.constructor == Array).should.be.true;
             helper.isField(fields[0]);
             done(err);
-         }); 
+         });
       })
-      
-      
+
+
    });
-   
+
    describe("#getEntriesCount", function() {
       it("Should return a number", function(done) {
          $form.getEntriesCount(function(err, count) {
@@ -42,7 +42,7 @@ describe("Form", function() {
          });
       });
    });
-   
+
    describe("#addWebhook and #deleteWebhook", function() {
       it("Should add a webhoook successfully", function(done) {
          $form.addWebhook("http://localhost:3000/bin", function(err, hashid) {
@@ -53,9 +53,9 @@ describe("Form", function() {
                done(err);
             });
          });
-         
+
       });
    })
-   
-   
-})
+
+
+})

test/mocha.opts

@@ -0,0 +1 @@
+--timeout 7000