Merge pull request #12 from rosette-api/0.7.6

Merge 0.7.6 to master

Author: cp2boston

.travis.yml

@@ -9,3 +9,10 @@ before_install:
 before_script:
   - npm install grunt-cli -g
 script: grunt
+notifications:
+  slack:
+    rooms:
+      - secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=
+      - secure: D4VxkkZlj7uaaFbqEBITkJCusVeii436N8X6GijuosUSaee9lqGYUF5ZS9lV6VGMKs719IfSJsCc2v/N4nc9Y/8AKgXd7AWHUwaRR+MC6rLwv9xqH8ZlkTPUKHUXkUQe1f9042PcMxzYa9r0+uKniM9l915Yx0PLaawJrWe3ZVig/uBhn5FueLhtUACzLJcjNcri/BKEgmP2+EgUsupUhujd0MsQd8xN5YIIv6VM5oD0XWXZCnBqHoZK+Qq7LfwDnTmUk7juqTOAjefF6v8IJTDELvSdK9QW7f9x7h0ICabIrI+Gl4IbNLJYEnELBi+X7da2YJUTgUoQrlBB4z+T8KybD8myqV/pJc1n0xrk84g1MtYQ3ahZn7eD3DTjIvK+ML8qAAGwxibF8VsV+GSoo5FcB6e3vV+glHODlwszstVs11PpL1grurVdoa5HPhUbm1jtQixOwO7h8GgGpwO20PuMLfyOfTjfoMcJ3ISjGNHRmUwcCH9avcaHqMLPLHht0z+8inVlDZeTcN+Wi8tk1YXwuQYUkTW46iFmoZNGdygRjTu43h9hCqdG7vcoKrR8oDbMT8X/sfs+z/UaBbuYBr9dT8rrdKJoa9115PaYpCs529DLrw1iGmzr5CkAXDElc1y2F352nwVS+dX7/OIQz1/dbT1ozWQ9Blx6ez5XN84=
+      - secure: g/eOC2QCn7oUW234u/P1kmh9OASO9t5g6iC+DflNdnedHnpw8IEG9CsLAnNynOY0KvC/2/Q6BAIFpT/qO8BPdaC2eQnd9LDurOXExxvjKZgTujhqgzijJGzVPSL8//hafj0Ec2+iJZFo/DYMPqUpYDsiKxX53+SMz9/GN/PKVKsI7bzuaOm04xXktU0A76pVfaG0N/qFSVHI64SShACoUXRpTzyUbmksRgzk7FB162R+TH1soPsR3vPh8c2SSWC9msrDc4iljcBhSFTdjL68z+srjDPYMSoOcFXXFNP+dmL+Q0veL/E4e40e7CWIU1O3grOcEcCkaSoZVSpGduNnCst8h6MpgauPtrgwHk4zGMoSl+L6al+nFo/3h2dXeebrQ0tY/hRfZi4Q8xwqG9083TBqi71fTpoFZ7sNtrY4Kdtl5Oa2CFUo7lVn1JB9qQwSa0eai3Whv0RyRqqQe77aDUj0dfD2R3Q61rX5OF/f++W0XtNwHQubzmj8HD/cFneShIQsbl9KgYXoR6HiXcbBiNdmmZjSrzkPYh7vlsujYrz6Cg2msKybWJ/FfOz0tS1cjlCtiCMOTExN6tEF8YCp9l+s+5RLe61pgFPy4Snr9pEjuTS5DYliTyZMY2ZZC1clBQtgE8E2qCG1QSzqnqqiGxj2K4zmLPpB4y1XpW8e3yk=
+

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rosette-api/nodejs.svg?branch=master)](https://travis-ci.org/rosette-api/nodejs)
+
 # rosette-api
 
 Rosette API binding for node.js
@@ -13,4 +15,4 @@ var rosette-api = require('rosette-api');
 See [examples](examples).
 
 ## Additional Information
-See [Rosette API site](https://developer.rosette.com/)
+See [Rosette API site](https://developer.rosette.com/)

examples/base64_input.js

@@ -0,0 +1,33 @@
+/*
+ * Example code to call Rosette API to get entities from a piece of text.
+ */
+
+"use strict";
+
+var Api = require("rosette-api").Api;
+var ArgumentParser = require("argparse").ArgumentParser;
+var DocumentParameters = require("rosette-api").DocumentParameters;
+var rosetteConstants = require("rosette-api").rosetteConstants
+
+var parser = new ArgumentParser({
+  addHelp: true,
+  description: "Get the entities from a piece of text"
+});
+parser.addArgument(["--key"], {help: "Rosette API key", required: true});
+var args = parser.parseArgs();
+
+var docParams = new DocumentParameters();
+var content = new Buffer("Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS ").toString('base64');
+
+docParams.setItem("content", content);
+docParams.setItem("contentType", rosetteConstants.dataFormat.UNSPECIFIED);
+
+var api = new Api(args.key);
+api.entities(docParams, false, function(err, res) {
+  if (err) {
+    throw err;
+  }
+  else {
+    console.log(res);
+  }
+});

examples/categories.js

@@ -14,7 +14,7 @@ var parser = new ArgumentParser({
 });
 parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 parser.addArgument(["--url"], {help: "Optional URL for data",
-    defaultValue: "https://en.wikipedia.org/wiki/Basis_Technology_Corp."});
+    defaultValue: "http://www.onlocationvacations.com/2015/03/05/the-new-ghostbusters-movie-begins-filming-in-boston-in-june/"});
 var args = parser.parseArgs();
 
 var docParams = new DocumentParameters();

examples/entities.js

@@ -16,7 +16,7 @@ parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 var args = parser.parseArgs();
 
 var docParams = new DocumentParameters();
-var content = "President Obama urges the Congress and Speaker Boehner to pass the $50 billion spending bill based on Christian faith by July 1st or Washington will become totally dysfunctional, a terrible outcome for American people.";
+var content = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS ";
 
 docParams.setItem("content", content);
 

examples/entities_linked.js

@@ -16,7 +16,7 @@ parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 var args = parser.parseArgs();
 
 var docParams = new DocumentParameters();
-var content = "President Obama urges the Congress and Speaker Boehner to pass the $50 billion spending bill based on Christian faith by July 1st or Washington will become totally dysfunctional, a terrible outcome for American people.";
+var content = "Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon.";
 docParams.setItem("content", content);
 
 var api = new Api(args.key);

examples/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rosette-api-examples",
   "description": "Usage examples for Rosette API Node.JS client SDK",
-  "version": "0.7.1",
+  "version": "0.7.5",
   "homepage": "https://developer.rosette.com",
   "author": {
     "name": "Basis Technology Corp.",
@@ -22,7 +22,7 @@
   ],
   "main": "index",
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">= 0.12.0"
   },
   "scripts": {
     "test": "grunt nodeunit"

examples/relationships.js

@@ -16,7 +16,7 @@ parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 var args = parser.parseArgs();
 
 var relationshipsParams = new RelationshipsParameters();
-var content = "Yesterday in Guatemala, the Supreme Court approved the attorney general's request to impeach President Otto Pérez Molina.";
+var content = "Bill Murray is in the new Ghostbusters film!";
 
 relationshipsParams.setItem("content", content);
 

examples/sentiment.js

@@ -19,7 +19,7 @@ var args = parser.parseArgs();
 var docParams = new DocumentParameters();
 
 var file = new tmp.File();
-var fileContents = "<html><head><title>Performance Report</title></head><body><p>This article is clean, concise, and very easy to read.</p></body></html>";
+var fileContents = "<html><head><title>New Ghostbusters Film</title></head><body><p>Original Ghostbuster Dan Aykroyd, who also co-wrote the 1984 Ghostbusters film, couldn’t be more pleased with the new all-female Ghostbusters cast, telling The Hollywood Reporter, “The Aykroyd family is delighted by this inheritance of the Ghostbusters torch by these most magnificent women in comedy.”</p></body></html>";
 
 file.writeFileSync(fileContents);
 

lib/Api.js

@@ -57,10 +57,13 @@ function Api(userKey, serviceUrl) {
    * @desc URL of the API
    * @default
    */
-  this.serviceUrl = "https://api.rosette.com/rest/v1";
+  this.serviceUrl = "https://api.rosette.com/rest/v1/";
   if (serviceUrl) {
     this.serviceUrl = serviceUrl;
   }
+  if (this.serviceUrl.indexOf('/', this.serviceUrl.length - 1) === -1) {
+      this.serviceUrl = this.serviceUrl + '/';
+  }
   /**
    * @desc True if the version has already been checked.  Saves round trips.
    * @type {boolean}
@@ -126,6 +129,7 @@ Api.prototype.retryingRequest = function(err, callback, op, url, data, action, a
   if (err) {
     return callback(err);
   }
+
   if (!tryNum) {
     tryNum = 0;
   }
@@ -134,7 +138,7 @@ Api.prototype.retryingRequest = function(err, callback, op, url, data, action, a
   if (urlParts.protocol === "https:") {
     protocol = https;
   }
-  var headers = {"accept": "application/json", "accept-encoding": "gzip", "content-type": "application/json"};
+  var headers = {"accept": "application/json", "accept-encoding": "gzip", "content-type": "application/json", "user-agent": "rosetteapinode/" + BINDING_VERSION};
   if (this.userKey) {
     headers["user_key"] = this.userKey;
   }
@@ -242,7 +246,7 @@ Api.prototype.callEndpoint = function(callback, parameters, subUrl) {
     err = new RosetteException("incompatible", "Multipart requires contentType SIMPLE", parameters.contentType);
     return callback(err);
   }
-  var url = this.serviceUrl + "/" + subUrl;
+  var url = this.serviceUrl + subUrl;
 
   // Check that parameters follow their guidelines
   parameters.validate();
@@ -303,7 +307,7 @@ Api.prototype.finishResult = function(err, result, action, callback) {
   * @param {function} callback
   */
 Api.prototype.info = function(callback) {
-  var url = this.serviceUrl + "/info";
+  var url = this.serviceUrl + "info";
   this.retryingRequest(null, callback, "GET", url, null, "info", this);
 };
 
@@ -314,7 +318,7 @@ Api.prototype.info = function(callback) {
  * @param {function} callback
  */
 Api.prototype.ping = function(callback) {
-  var url = this.serviceUrl + "/ping";
+  var url = this.serviceUrl + "ping";
   this.retryingRequest(null, callback, "GET", url, null, "ping", this);
 };
 
@@ -325,7 +329,7 @@ Api.prototype.ping = function(callback) {
  * @param {function} callback
  */
 Api.prototype.compareBindingToServer = function(callback) {
-  var url = this.serviceUrl + "/info?clientVersion=" + BINDING_VERSION;
+  var url = this.serviceUrl + "info?clientVersion=" + BINDING_VERSION;
   this.retryingRequest(null, callback, "POST", url, null, "info", this);
 };
 
@@ -346,7 +350,7 @@ Api.prototype.language = function(parameters, callback) {
  * @throws RosetteException
  */
 Api.prototype.languageInfo = function(callback) {
-  var url = this.serviceUrl + "/language/info";
+  var url = this.serviceUrl + "language/info";
   this.retryingRequest(null, callback, "GET", url, null, "language-info", this);
 };