Merge pull request #43 from SamHausmann/RCB-396

Rcb 396

Author: lauren12292

index.js

@@ -2,8 +2,6 @@ module.exports = require('./lib/Api');
 
 module.exports.categories = require('./lib/categories');
 
-module.exports.checkVersion = require('./lib/checkVersion');
-
 module.exports.entities = require("./lib/entities");
 
 module.exports.info = require("./lib/info");

lib/Api.js

@@ -29,7 +29,6 @@ var sentences = require("./sentences");
 var language = require("./language");
 var ping = require("./ping");
 var info = require("./info");
-var checkVersion = require("./checkVersion");
 
 /**
  * Compatible server version.
@@ -78,8 +77,6 @@ function Api(userKey, serviceURL) {
         this.serviceURL = "https://api.rosette.com/rest/v1/";
     }
 
-    this.versionChecked = false;
-
 };
 
 /**
@@ -92,26 +89,13 @@ Api.prototype.rosette = function(endpoint, callback) {
     var api = this;
     endpoint = require("./" + endpoint);
     var e = new endpoint();
-    var c = new checkVersion();
 
-    // check if server and client API versions match
-    c.check(api.parameters, this.userKey, this.serviceURL, function(err, res) {
+            // send parameters to the specified endpoint
+    e.getResults(api.parameters, api.userKey, api.serviceURL, function(err, res) {
         if (err) {
             return callback(err);
-        } else if (!res.versionChecked) {
-            return callback(new RosetteException("incompatibleVersion", "The server version is not compatible with binding version " + BINDING_VERSION, res.Version));
         } else {
-            // mark api binding version as checked
-            api.versionChecked = true;
-
-            // send parameters to the specified endpoint
-            e.getResults(api.parameters, api.userKey, api.serviceURL, function(err, res) {
-                if (err) {
-                    return callback(err);
-                } else {
-                    return callback(null, res);
-                }
-            });
+            return callback(null, res);
         }
     });
 };

lib/checkVersion.js

@@ -155,7 +155,9 @@ parameters.prototype.loadFile = function(filePath, loadedParameters, userKey, se
             "accept": 'application/json',
             "accept-encoding": "gzip",
             "content-type": 'multipart/mixed',
-            "user-agent": "rosetteapinode/" + BINDING_VERSION
+            "user-agent": "rosetteapinode/" + BINDING_VERSION, 
+            "X-RosetteAPI-Binding": "nodejs",
+            "X-RosetteAPI-Binding-Version": BINDING_VERSION
         }
         headers["X-RosetteAPI-Key"] = userKey;
 

lib/parameters.js

@@ -67,7 +67,9 @@ rosetteRequest.prototype.makeRequest = function(requestType, userKey, urlParts,
         "accept": "application/json",
         "accept-encoding": "gzip",
         "content-type": "application/json",
-        "user-agent": "rosetteapinode/" + BINDING_VERSION
+        "user-agent": "rosetteapinode/" + BINDING_VERSION,
+        "X-RosetteAPI-Binding": "nodejs",
+        "X-RosetteAPI-Binding-Version": BINDING_VERSION
     }
     if (userKey != null) {
         headers["X-RosetteAPI-Key"] = userKey;

lib/rosetteRequest.js

@@ -1,6 +1,6 @@
 {
   "name": "rosette-api",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Rosette API Node.js client SDK",
   "main": "index",
   "directories": {

package.json

@@ -16,73 +16,11 @@ var entities = require("../lib/entities");
 var morphology = require("../lib/morphology");
 var tokens = require("../lib/tokens");
 var sentences = require("../lib/sentences");
-var checkVersion = require("../lib/checkVersion");
 var info = require("../lib/info");
 var ping = require("../lib/ping");
 var paramObj = require("../lib/parameters");
 var rosetteException = require("../lib/rosetteExceptions");
 
-describe("Check Version", function() {
-
-    afterEach(function(done) {
-        nock.cleanAll();
-        done();
-    });
-
-    it("passes the check version", function(done) {
-        var mockResponse = JSON.stringify({'name':'Rosette API', 'versionChecked':true});
-
-        nock('https://api.rosette.com', {"encodedQueryParams": true })
-           .post('/rest/v1/info')
-           .query({"clientVersion":"1.1"})
-           .reply(200, JSON.parse(mockResponse));
-        
-        var params = new paramObj();
-        var c = new checkVersion();
-        c.check(params, '1234567890', 'https://api.rosette.com/rest/v1/', function(err, res) {
-            chai.expect(res).to.have.property('name');
-            chai.expect(res.name).to.equal('Rosette API');
-            done();
-        });
-
-    });
-    
-    it("fails the version check", function(done) {
-        var mockResponse = JSON.stringify({'name':'Rosette API', 'versionChecked':false});
-
-        nock('https://api.rosette.com', {"encodedQueryParams": true })
-           .post('/rest/v1/info')
-           .query({"clientVersion":"1.1"})
-           .reply(200, JSON.parse(mockResponse));
-
-        var c = new checkVersion();
-        var params = new paramObj();
-        c.check(params, '1234567890', 'https://api.rosette.com/rest/v1/', function(err, res) {
-            chai.expect(res).to.have.property('versionChecked');
-            chai.expect(res.versionChecked).to.be.false;
-            done();
-        });
-
-    });
-
-    it("fails the API version check", function(done) {
-        var mockResponse = JSON.stringify({'name':'Rosette API', 'versionChecked':false});
-
-        nock('https://api.rosette.com', {"encodedQueryParams": true })
-           .post('/rest/v1/info')
-           .query({"clientVersion":"1.1"})
-           .reply(200, JSON.parse(mockResponse));
-
-        var api = new Api('123456789', 'https://api.rosette.com/rest/v1');
-        api.rosette("info", function(err, res) {
-            chai.expect(err).to.not.be.null;
-            chai.expect(err.name).to.equal('RosetteException');
-            done();
-        });
-         
-    });
-});
-
 describe("Language Endpoint", function() {
     beforeEach(function(done) {
         var mockResponse = JSON.stringify({'name':'Rosette API', 'versionChecked':true});