Merge pull request #44 from cp2boston/RCB-399_options

RCB-399 options

Author: lauren12292

examples/relationships.js

@@ -4,8 +4,8 @@ var Api = require("../lib/Api");
 var ArgumentParser = require("argparse").ArgumentParser;
 
 var parser = new ArgumentParser({
-  addHelp: true,
-  description: "Get the relationships from a piece of text"
+    addHelp: true,
+    description: "Get the relationships from a piece of text"
 });
 parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
@@ -18,12 +18,12 @@ var relationships_text_data = "The Ghostbusters movie was filmed in Boston.";
 var content = relationships_text_data;
 
 api.parameters.content = content;
-api.parameters.accuracyMode = "precision";
+api.parameters.options = { "accuracyMode": "PRECISION" };
 
-api.rosette(endpoint, function(err, res){
-	if(err){
-		console.log(err);
-	} else {
-		console.log(JSON.stringify(res, null, 2));
-	}
-});
+api.rosette(endpoint, function(err, res) {
+    if (err) {
+        console.log(err);
+    } else {
+        console.log(JSON.stringify(res, null, 2));
+    }
+});

lib/parameters.js

@@ -98,7 +98,6 @@ parameters.prototype.loadParams = function() {
         "targetScript": this.targetScript,
         "targetScheme": this.targetScheme,
         "options": this.options,
-        "accuracyMode": this.accuracyMode,
         "linked": this.linked,
         "explain": this.explain,
         "short-string": this.shortString,

lib/relationships.js

@@ -43,10 +43,10 @@ relationships.prototype.getResults = function(parameters, userKey, serviceURL, c
     } else {
 
         // validate parameters
-        if (parameters.loadParams().accuracyMode != undefined) {
-            if (parameters.loadParams().accuracyMode.toUpperCase() != "PRECISION" && parameters.loadParams().accuracyMode.toUpperCase() != "RECALL") {
-                return callback(new RosetteException("badArgument", "Accuracy mode parameter must be set to either PRECISION or RECALL"));
-            }
+        if (parameters.loadParams().content == null && parameters.loadParams().contentUri == null) {
+            return callback(new RosetteException("badArgument", "Must supply one of Content or ContentUri", "bad arguments"));
+        } else if (parameters.loadParams().content != null && parameters.loadParams().contentUri != null) {
+            return callback(new RosetteException("badArgument", "Cannot supply both Content and ContentUri", "bad arguments"));
         }
 
         // configure URL

tests/unittests.js

@@ -116,12 +116,12 @@ describe("Relationships Endpoint", function() {
     it("detects correct accuracy mode", function(done) {
         var api = new Api('123456789', 'https://api.rosette.com/rest/v1');
         api.parameters.content = "Sample Content";
-        api.parameters.accuracyMode = "BOGUS";
+        var option = { accuracyMode: "PRECISION" };
+        api.parameters.options = JSON.stringify(option);
 
         api.rosette("relationships", function(err, res) {
-            chai.expect(err).to.not.be.null;
-            chai.expect(err.name).to.equal('RosetteException');
-            chai.expect(err.message).to.contain('badArgument');
+            chai.expect(err).to.be.null;
+            chai.expect(res.name).to.equal('Rosette API');
             done();
         });
     });