refactored PR #30 - Add request method and request data to the base64encode() method

@@ -125,9 +125,9 @@
          * @param  String  data    The data to send, optional
          * @param  String  data    The data to send, optional
          * @return string          Base64 encoded result
          * @return string          Base64 encoded result
          */
          */
-        base64encode: function(url,method,data) {
-            return this.evaluate(function(url,method,data) {
-                return __utils__.getBase64(url,method,data);
+        base64encode: function(url, method, data) {
+            return this.evaluate(function(url, method, data) {
+                return __utils__.getBase64(url, method, data);
             }, { url: url, method: method, data: data });
             }, { url: url, method: method, data: data });
         },
         },
 
 

@@ -223,13 +223,13 @@
          * Downloads a resource behind an url and returns its base64-encoded
          * Downloads a resource behind an url and returns its base64-encoded
          * contents.
          * contents.
          *
          *
-         * @param  String  url  The resource url
-         * @param  String  method The request method, optional
-         * @param  Object  data The request data, optional
-         * @return String       Base64 contents string
+         * @param  String  url     The resource url
+         * @param  String  method  The request method, optional (default: GET)
+         * @param  Object  data    The request data, optional
+         * @return String          Base64 contents string
          */
          */
-        this.getBase64 = function(url,method,data) {
-            return this.encode(this.getBinary(url,method,data));
+        this.getBase64 = function(url, method, data) {
+            return this.encode(this.getBinary(url, method, data));
         };
         };
 
 
         /**
         /**
@@ -237,44 +237,39 @@
          * fails but log errors.
          * fails but log errors.
          *
          *
          * @param  String  url
          * @param  String  url
-         * @param  String  method 
+         * @param  String  method
          * @param  Object  data
          * @param  Object  data
          * @return string
          * @return string
          */
          */
         this.getBinary = function(url, method, data) {
         this.getBinary = function(url, method, data) {
             try {
             try {
-                var xhr = new XMLHttpRequest();
-                if (method === undefined || ["GET","get","POST","post"].indexOf(method) == -1) {
+                var xhr = new XMLHttpRequest(), dataString = "";
+                if (typeof method !== "string" || ["GET", "POST"].indexOf(method.toUpperCase()) === -1) {
                     method = "GET";
                     method = "GET";
                 } else {
                 } else {
                     method = method.toUpperCase();
                     method = method.toUpperCase();
                 }
                 }
-
                 xhr.open(method, url, false);
                 xhr.open(method, url, false);
-               	this.log("using HTTP method: '" + method + "'", "debug");
+                this.log("getBinary(): Using HTTP method: '" + method + "'", "debug");
                 xhr.overrideMimeType("text/plain; charset=x-user-defined");
                 xhr.overrideMimeType("text/plain; charset=x-user-defined");
-                if (method == "POST") {
-                    if(data === undefined) {
-                        data_str = "";
-                    } else {
-                        data_str = "";
-                        for (k in data) {
-                            if (typeof(k) == "string" && typeof(data[k]) == "string") {
-                                data_str += "&" + escape(k) + "=" + escape(data[k]);
-                            }
+                if (method === "POST") {
+                    if (typeof data === "object") {
+                        var dataList = [];
+                        for (var k in data) {
+                            dataList.push(escape(k) + "=" + escape(data[k].toString()));
                         }
                         }
-                        data_str = data_str.substring(1);
+                        dataString = dataList.join('&');
+                        this.log("getBinary(): Using request data: '" + dataString + "'", "debug");
                     }
                     }
                     xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                     xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                 }
                 }
-                this.log("using request data: '" + data_str + "'", "debug");
-                xhr.send(method == "POST" ? data_str : null);
+                xhr.send(method === "POST" ? dataString : null);
                 return xhr.responseText;
                 return xhr.responseText;
             } catch (e) {
             } catch (e) {
                 if (e.name === "NETWORK_ERR" && e.code === 101) {
                 if (e.name === "NETWORK_ERR" && e.code === 101) {
-                    this.log("unfortunately, casperjs cannot make cross domain ajax requests", "warning");
+                    this.log("getBinary(): Unfortunately, casperjs cannot make cross domain ajax requests", "warning");
                 }
                 }
-                this.log("error while fetching " + url + ": " + e, "error");
+                this.log("getBinary(): Error while fetching " + url + ": " + e, "error");
                 return "";
                 return "";
             }
             }
         };
         };