Merge branch 'RCB-418' of git://github.com/SamHausmann/nodejs into SamHausmann-RCB-418

Conflicts:
	lib/parameters.js
	package.json

Author: Chris Park

examples/language.js

@@ -20,6 +20,10 @@ api.parameters.customHeaders = [appHeader];
 var content = "Por favor Señorita, says the man.";
 
 api.parameters.content = content;
+var appHeader = [];
+appHeader[0] = "X-RosetteAPI-App"
+appHeader[1] = "app";
+api.parameters.customHeaders = [appHeader];
 
 api.rosette(endpoint, function(err, res){
 	if(err){

lib/.Rhistory

@@ -70,7 +70,7 @@ function parameters() {
     //morphology
     this.morphology = null;
 
-    //custom headers
+    //headers
     this.customHeaders = null;
 
 }
@@ -103,7 +103,7 @@ parameters.prototype.loadParams = function() {
         "morphology": this.morphology,
         "_maxRetries": this.maxRetries,
         "_msInterval": this.msInterval,
-        "customHeaders": this.customHeaders
+        "_customHeaders": this.customHeaders
     };
 
     for (var key in paramJSON) {

lib/parameters.js

@@ -71,6 +71,14 @@ rosetteRequest.prototype.makeRequest = function(requestType, userKey, urlParts,
         "X-RosetteAPI-Binding": "nodejs",
         "X-RosetteAPI-Binding-Version": BINDING_VERSION
     }
+
+    if(parameters.loadParams()._customHeaders !== null){
+        parameters.loadParams()._customHeaders.forEach( function(element, index) {
+            headers[element[0]] = element[1];
+        });
+
+    }
+
     if (userKey != null) {
         headers["X-RosetteAPI-Key"] = userKey;
     }