Merge branch 'develop'

Author: Chris Park

.travis.yml

@@ -1,11 +1,8 @@
 language: node_js
 node_js:
-  - "0.11.16"
-  - "0.12.7"
-  - "1.0.4"
-  - "4.2.4"
-  - "4.4.7"
   - "6.3.0"
+  - "7.2.0"
+  - "8.0.0"
 before_install:
   - npm install -g npm
 before_script:

README.md

@@ -37,23 +37,24 @@ api.rosette(endpoint, function(err, res){
 ## API Parameters
 | Parameter                     | Endpoint                                            | Required
 | -------------                 |-------------                                        |-------------
-| content                    | categories, entities, language, morphology, relationships, sentences, sentiment, tokens            | Either content or contentUri required |
+| content                    | categories, entities, language, morphology, relationships, sentences, sentiment, tokens, transliteration            | Either content or contentUri required, transliteration requires content only |
 | contentUri                      | categories, entities, language, morphology, relationships, sentences, sentiment, tokens       | Either content or contentUri required |
 | language                          | categories, entities, language, morphology, relationships, sentences, sentiment, tokens, name similarity                    | No |
 | documentFile                      | categories, entities, language, morphology, relationships, sentences, sentiment, tokens                  | No |
 | name1                 | name similarity               | Yes |
 | name2               | name similarity| Yes |
 | name    | name translation     | Yes |
-| targetLanguage           | name translation           | Yes |
+| names   | name deduplication   | Yes |
+| targetLanguage           | name translation, transliteration (No)          | Yes |
 | entityType                 | name translation         | No |
 | sourceLanguageOfOrigin        | name translation | No |
 | sourceLanguageOfUse                         | name translation       | No |
-| sourceScript                     | name translation               | No |
-| targetScript                     | name translation                    | No |
+| sourceLanguage  | transliteration | No |
+| sourceScript                     | name translation, transliteration              | No |
+| targetScript                     | name translation, transliteration                    | No |
 | targetScheme                        | name translation          | No |
 | options              | relationships        | No |
 | accuracyMode              | relationships        | Yes |
-| linkEntities              | entities        | No |
 | explain              | sentiment        | No |
 | morphology             | morphology        | Yes |
 

examples/name_deduplication.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var Api = require("../lib/Api");
+var ArgumentParser = require("argparse").ArgumentParser;
+
+var parser = new ArgumentParser({
+  addHelp: true,
+  description: "Deduplicate a list of names"
+});
+parser.addArgument(["--key"], {help: "Rosette API key", required: true});
+parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
+var args = parser.parseArgs();
+var api = new Api(args.key, args.url);
+var endpoint = "nameDeduplication";
+
+var name_dedupe_data = "John Smith,Johnathon Smith,Fred Jones";
+
+api.parameters.names = name_dedupe_data.split(",").map(function(name) {
+	return {"text": name, "language": "eng", "entityType": "PERSON"}
+});
+api.parameters.threshold = 0.75;
+
+api.rosette(endpoint, function(err, res){
+	if(err){
+		console.log(err);
+	} else {
+		console.log(JSON.stringify(res, null, 2));
+	}
+});

examples/syntax_dependencies.js

@@ -16,7 +16,6 @@ var endpoint = "syntax_dependencies";
 var syntax_dependencies_data = "Yoshinori Ohsumi, a Japanese cell biologist, was awarded the Nobel Prize in Physiology or Medicine on Monday.";
 
 api.parameters.content = syntax_dependencies_data;
-api.parameters.genre = "social-media";
 api.rosette(endpoint, function(err, res){
 	if(err){
 		console.log(err);

examples/transliteration.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var Api = require("../lib/Api");
+var ArgumentParser = require("argparse").ArgumentParser;
+
+var parser = new ArgumentParser({
+    addHelp: true,
+    description: "Get the transliteration from a piece of text"
+});
+parser.addArgument(["--key"], {help: "Rosette API key", required: true});
+parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
+var args = parser.parseArgs();
+
+var api = new Api(args.key, args.url);
+var endpoint = "transliteration";
+
+var transliteration_data = "Bill Gates, Microsoft's former CEO, is a philanthropist.";
+
+api.parameters.content = transliteration_data;
+
+api.rosette(endpoint, function(err, res) {
+    if (err) {
+        console.log(err);
+    } else {
+        console.log(JSON.stringify(res, null, 2));
+    }
+});

lib/Api.js

@@ -1,7 +1,7 @@
 /**
  * Rosette API.
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -26,6 +26,7 @@ var entities = require("./entities");
 var info = require("./info");
 var language = require("./language");
 var matchedName = require("./nameSimilarity");
+var nameDeduplication = require("./nameDeduplication");
 var morphology = require("./morphology");
 var ping = require("./ping");
 var relationships = require("./relationships");
@@ -35,6 +36,7 @@ var textEmbedding = require("./textEmbedding");
 var translatedName = require("./nameTranslation");
 var tokens = require("./tokens");
 var syntax_dependencies = require("./syntax_dependencies");
+var transliteration = require("./transliteration");
 
 /**
  * @class
@@ -44,7 +46,7 @@ var syntax_dependencies = require("./syntax_dependencies");
  * Api server endpoints.
  *
  * @example var api = new API(userKey, serviceUrl);
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
 function Api(userKey, serviceURL) {

lib/categories.js

@@ -1,7 +1,7 @@
 /**
  * Rosette API.
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@ var rosetteRequest = require("./rosetteRequest");
 /**
  * @class
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
 function categories() {

lib/entities.js

@@ -1,7 +1,7 @@
 /**
  * Rosette API.
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@ var rosetteRequest = require("./rosetteRequest");
 /**
  * @class
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
 function entities() {
@@ -50,10 +50,10 @@ entities.prototype.getResults = function(parameters, userKey, protocol, serviceU
         } else {
             // configure URL
             var urlParts = URL.parse(serviceURL + "entities");
-            
+
             var req = new rosetteRequest();
             req.makeRequest('POST', userKey, protocol, urlParts, parameters, callback);
-            
+
         }
     }
 

lib/info.js

@@ -1,7 +1,7 @@
 /**
  * Rosette API.
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@ var rosetteRequest = require("./rosetteRequest");
 /**
  * @class
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
 function info() {

lib/language.js

@@ -1,7 +1,7 @@
 /**
  * Rosette API.
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@ var rosetteRequest = require("./rosetteRequest");
 /**
  * @class
  *
- * @copyright 2014-2015 Basis Technology Corporation.
+ * @copyright 2016-2017 Basis Technology Corporation.
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
 function language() {