Merge pull request #235 from chughts/versionupdate

URL based Services Check

Author: chughts

README.md

@@ -7,6 +7,10 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.4.33
+- Personality Insights node updated to latest December 15, 2016 GloVe profiles.
+- Conversation, Alchemy Feature Extract and Date Extraction nodes updated to use url based services utility to detect bound service.
+
 ### New in version 0.4.32
 - Added diarization support to STT Node via the parameter speaker_labels
 - STT and TTS node use url based services utility to detect bound service.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.32",
+  "version": "0.4.33",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",

services/alchemy_date_extraction/v1.js

@@ -15,11 +15,12 @@
  **/
 
 module.exports = function (RED) {
-
-  var cfenv = require('cfenv');
-  var watson = require('watson-developer-cloud');
-
-  var payloadutils = require('../../utilities/payload-utils');
+  const SERVICE_IDENTIFIER = 'gateway-a.watsonplatform.net';
+  var watson = require('watson-developer-cloud'),
+    payloadutils = require('../../utilities/payload-utils'),
+    serviceutils = require('../../utilities/service-utils'),
+    apikey, s_apikey,
+    service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
 
   // Require the Cloud Foundry Module to pull credentials from bound service
   // If they are found then the api key is stored in the variable s_apikey.
@@ -30,14 +31,6 @@ module.exports = function (RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  // Taking this line out as codacy was complaining about it.
-  // var services = cfenv.getAppEnv().services;
-  var service;
-
-  var apikey, s_apikey;
-
-  var service = cfenv.getAppEnv().getServiceCreds(/alchemy/i);
-
   if (service) {
     s_apikey = service.apikey;
   }

services/alchemy_language/v1.js

@@ -33,11 +33,15 @@ var FEATURES = {
 };
 
 module.exports = function (RED) {
+  const SERVICE_IDENTIFIER = 'gateway-a.watsonplatform.net';
 
-  var cfenv = require('cfenv');
   var watson = require('watson-developer-cloud');
 
-  var payloadutils = require('../../utilities/payload-utils');
+  var payloadutils = require('../../utilities/payload-utils'),
+    serviceutils = require('../../utilities/service-utils'),
+    apikey, s_apikey,
+    service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
+
 
   // Require the Cloud Foundry Module to pull credentials from bound service
   // If they are found then the api key is stored in the variable s_apikey.
@@ -48,14 +52,6 @@ module.exports = function (RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  // Taking this line out as codacy was complaining about it.
-  // var services = cfenv.getAppEnv().services;
-  var service;
-
-  var apikey, s_apikey;
-
-  var service = cfenv.getAppEnv().getServiceCreds(/alchemy/i);
-
   if (service) {
     s_apikey = service.apikey;
   }

services/conversation/v1.js

@@ -15,11 +15,12 @@
  **/
 
 module.exports = function (RED) {
-  var cfenv = require('cfenv'),
-    ConversationV1 = require('watson-developer-cloud/conversation/v1'),
+  const SERVICE_IDENTIFIER = 'conversation';
+  var ConversationV1 = require('watson-developer-cloud/conversation/v1'),
+    serviceutils = require('../../utilities/service-utils'),
     service = null, sUsername = null, sPassword = null;
 
-  service = cfenv.getAppEnv().getServiceCreds(/conversation/i);
+  service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   if (service) {
     sUsername = service.username;
@@ -131,7 +132,7 @@ module.exports = function (RED) {
     node.service = new ConversationV1({
       username: userName,
       password: passWord,
-      version_date: '2016-07-11'
+      version_date: '2016-09-20'
     });
     return true;
   }

services/language_translator_identify/v2.html

@@ -35,7 +35,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
-    <p>Packaged in with release 0.4.32 of node-red-node-watson</p>
+    <p>Packaged in with release 0.4.33 of node-red-node-watson</p>
     <p>The Watson Language Translator service can be used to identify languages used in a text input. <p>
     <p>Node input : </p>
     <ul>

services/personality_insights/v3.js

@@ -15,10 +15,11 @@
  **/
 
 module.exports = function (RED) {
+  const SERVICE_IDENTIFIER = 'personality-insights';
   var PersonalityInsightsV3 = require('watson-developer-cloud/personality-insights/v3'),
-    cfenv = require('cfenv'),
     payloadutils = require('../../utilities/payload-utils'),
-    service = cfenv.getAppEnv().getServiceCreds(/personality insights/i),
+    serviceutils = require('../../utilities/service-utils'),
+    service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     username = null,
     password = null,
     sUsername = null,
@@ -118,7 +119,7 @@ module.exports = function (RED) {
           personality_insights = new PersonalityInsightsV3({
             username: username,
             password: password,
-            version_date: '2016-10-20'
+            version_date: '2016-12-15'
           });
 
         node.status({fill:'blue', shape:'dot', text:'requesting'});

utilities/service-utils.js

@@ -22,9 +22,13 @@ ServiceUtils.prototype = {
   // name may fail because of duplicate usage. This function verifies
   // that the url associated with the service, contains the matched
   // input value, hence reducing the chances of a false match.
-  checkCFForService: function(serviceName, returnBoolean) {
-    var regex = new RegExp('(http|https)(://)([^\/]+)(/)('+serviceName+').*');
+  checkCFForService: function(serviceName, returnBoolean, alchemyRegex) {
+    var regex = alchemyRegex ?
+                RegExp('(http|https)(://)('+serviceName+').*') :
+                RegExp('(http|https)(://)([^\/]+)(/)('+serviceName+').*');
+
     var services = appEnv.getServices();
+
     for (var service in services) {
       if (services[service].hasOwnProperty('credentials')) {
         if(services[service].credentials.hasOwnProperty('url')){
@@ -39,13 +43,17 @@ ServiceUtils.prototype = {
 
   // Check for service return a boolean to indicate if it is bound in
   checkServiceBound: function(serviceName) {
-    return ServiceUtils.prototype.checkCFForService(serviceName, true);
+    return ServiceUtils.prototype.checkCFForService(serviceName, true, false);
   },
 
   // Check for and return bound servie
   getServiceCreds: function(serviceName) {
-    return ServiceUtils.prototype.checkCFForService(serviceName, false);
-  }
+    return ServiceUtils.prototype.checkCFForService(serviceName, false, false);
+  },
+
+  getServiceCredsAlchemy: function(serviceName) {
+    return ServiceUtils.prototype.checkCFForService(serviceName, false, true);
+  },
 
 };