Merge pull request #48 from rosette-api/develop

1.1.4
rosette-api · Jun 1, 2016 · 83ad913 · 83ad913
2 parents 4593246 + fac2d38
commit 83ad913
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/examples/language.js b/examples/language.js
@@ -12,6 +12,10 @@ parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
 var args = parser.parseArgs();
 var api = new Api(args.key, args.url);
 var endpoint = "language";
+var appHeader = [];
+appHeader[0] = "X-RosetteAPI-App"
+appHeader[1] = "app";
+api.parameters.customHeaders = [appHeader];
 
 var content = "Por favor Señorita, says the man.";
 

diff --git a/lib/parameters.js b/lib/parameters.js
@@ -73,6 +73,9 @@ function parameters() {
     //morphology
     this.morphology = null;
 
+    //custom headers
+    this.customHeaders = null;
+
 }
 
 /**
@@ -103,11 +106,12 @@ parameters.prototype.loadParams = function() {
         "short-string": this.shortString,
         "morphology": this.morphology,
         "_maxRetries": this.maxRetries,
-        "_msInterval": this.msInterval
+        "_msInterval": this.msInterval,
+        "customHeaders": this.customHeaders
     };
 
     for (var key in paramJSON) {
-        if (key.substring(0, 1) !== '_' && paramJSON[key] != null) {
+        if (key.substring(0, 1) !== '_' && paramJSON[key] != null && key != "customHeaders") {
             tempJSON[key] = paramJSON[key];
         }
     }

diff --git a/lib/rosetteRequest.js b/lib/rosetteRequest.js
@@ -75,6 +75,13 @@ rosetteRequest.prototype.makeRequest = function(requestType, userKey, urlParts,
         headers["X-RosetteAPI-Key"] = userKey;
     }
 
+    if(parameters.customHeaders != null){
+        parameters.customHeaders.forEach( function(element, index) {
+            headers[element[0]] = element[1];
+        });
+
+    }
+
     var options = {
         hostname: urlParts.hostname,
         path: urlParts.path,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rosette-api",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Rosette API Node.js client SDK",
   "main": "index",
   "directories": {