Merge pull request #136 from chughts/master

Sort Sequence

Author: chughts

package.json

@@ -25,26 +25,26 @@
   ],
   "node-red": {
     "nodes": {
-      "alchemy_language-v1": "services/alchemy_language/v1.js",
-      "alchemy-vision-v1": "services/alchemy_vision/v1.js",
-      "alchemy-news-v1": "services/alchemy_data_news/v1.js",
-      "watson-natural-language-classifier-v1": "services/natural_language_classifier/v1.js",
       "watson-concept-insights-v2": "services/concept_insights/v2.js",
-      "watson-dialog-v1": "services/dialog/v1.js",
+      "watson-conversation-v1-experimental":"services/conversation/v1-exp.js",
       "watson-document-conversion-v1": "services/document_conversion/v1.js",
+      "watson-dialog-v1": "services/dialog/v1.js",
+      "alchemy_language-v1": "services/alchemy_language/v1.js",
       "watson-language-identification-v1": "/services/language_identification/v1.js",
       "watson-language-translate-v1": "services/language_translation/v2.js",
+      "watson-natural-language-classifier-v1": "services/natural_language_classifier/v1.js",
+      "alchemy-news-v1": "services/alchemy_data_news/v1.js",
       "watson-personality-insights-v1": "services/personality_insights/v1.js",
       "watson-relationship-extraction-v1": "services/relationship_extraction/v1.js",
       "watson-retrieve-and-rank-v1": "services/retrieve_and_rank/v1.js",
       "watson-speech-to-text-v1": "services/speech_to_text/v1.js",
       "watson-text-to-speech-v1": "services/text_to_speech/v1.js",
+      "watson-tone-analyzer-v3": "services/tone_analyzer/v3.js",
       "watson-tradeoff-analytics-v1": "services/tradeoff_analytics/v1.js",
       "watson-tone-analyzer-v3-beta": "services/tone_analyzer/v3-beta.js",
       "watson-visual-recognition-v1": "services/visual_recognition/v1.js",
       "watson-visual-recognition-v3": "services/visual_recognition/v3.js",
-      "watson-tone-analyzer-v3": "services/tone_analyzer/v3.js",
-      "watson-conversation-v1-experimental":"services/conversation/v1-exp.js"
+      "alchemy-vision-v1": "services/alchemy_vision/v1.js"
     }
   }
 }

services/conversation/v1-exp.html

@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="conversation-v1-experimental">
+<script type="text/x-red" data-template-name="watson-conversation-v1-experimental">
     <div id="credentials-check" class="form-row">
         <div class="form-tips">
             <i class="fa fa-question-circle"></i><b> Please wait: </b> Checking for bound service credentials...
@@ -27,7 +27,7 @@
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
-    </div>  
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
@@ -40,10 +40,10 @@
 </script>
 
 
-<script type="text/x-red" data-help-name="conversation-v1-experimental">
+<script type="text/x-red" data-help-name="watson-conversation-v1-experimental">
 	<p>With the IBM Watson™ Conversation service you can create cognitive agents – virtual agents that combine machine learning, natural language understanding, and integrated dialog scripting tools to provide outstanding customer engagements.</p>
-    
-    
+
+
     <p><b>Usage</b></p>
     <p>This node should be provided in input : </p>
     <ul>
@@ -62,14 +62,14 @@
 
     <p>For full details, please see the <a href="https://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/conversation/overview.shtml">Watson Conversation API documentation</a></p>
     <p>See also the <a href="https://watson-api-explorer.mybluemix.net/">API Explorer</a> and the <a href="https://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/conversation/tutorial_basic.shtml">Tutorial</a>.</p>
-    
+
     <p>Check the sample Flow for this node on  <a href="https://github.com/watson-developer-cloud/node-red-bluemix-starter">Watson Node-RED Starter</a></p>
 </script>
 
 
 <script type="text/javascript">
     (function() {
-        RED.nodes.registerType('conversation-v1-experimental', {
+        RED.nodes.registerType('watson-conversation-v1-experimental', {
             category: 'IBM Watson',
             defaults: {
               name: {value: ""},

services/conversation/v1-exp.js

@@ -17,7 +17,7 @@
 module.exports = function (RED) {
   var cfenv = require('cfenv'), watson = require('watson-developer-cloud'), service = null,
     sUsername = null, sPassword = null;
-  
+
   service = cfenv.getAppEnv().getServiceCreds(/conversation/i);
 
   if (service) {
@@ -28,19 +28,19 @@ module.exports = function (RED) {
   RED.httpAdmin.get('/watson-conversation/vcap', function (req, res) {
     res.json(service ? {bound_service: true} : null);
   });
- 
-  
+
+
   function verifyPayload(node, msg) {
     if (!msg.payload) {
-      this.status({fill:'red', shape:'ring', text:'missing payload'}); 
+      this.status({fill:'red', shape:'ring', text:'missing payload'});
       node.error('Missing property: msg.payload', msg);
       return false;
     }
     return true;
   }
 
   function verifyInputs(node, msg, config) {
-    // workspaceid can be either configured in the node, 
+    // workspaceid can be either configured in the node,
     // or sent into msg.params.workspace_id
     if (!config.workspaceid || config.workspaceid !== '') {
       node.workspaceid = config.workspaceid;
@@ -54,13 +54,13 @@ module.exports = function (RED) {
   }
 
   function verifyServiceCredentials(node, msg) {
-    // If it is present the newly provided user entered key 
-    // takes precedence over the existing one. 
+    // If it is present the newly provided user entered key
+    // takes precedence over the existing one.
     var userName = sUsername || node.credentials.username,
       passWord = sPassword || node.credentials.password;
-    
+
     if (!userName || !passWord) {
-      node.status({fill:'red', shape:'ring', text:'missing credentials'});          
+      node.status({fill:'red', shape:'ring', text:'missing credentials'});
       node.error('Missing Watson Conversation API service credentials', msg);
       return false;
     }
@@ -75,23 +75,23 @@ module.exports = function (RED) {
 
   function processResponse(err, body, node, msg) {
     if (err != null && body == null) {
-      node.status({fill:'red', shape:'ring', 
-        text:'call to watson conversation service failed'}); 
+      node.status({fill:'red', shape:'ring',
+        text:'call to watson conversation service failed'});
       msg.result = {};
       if (err.code == null) {
         msg.result['error'] = err;
       } else {
         msg.result['error_code'] = err.code;
         if (!err.error) {
           msg.result['error'] = err.error;
-        }        
+        }
       }
       node.error(err);
       return;
     }
     msg.result = body;
     msg.payload = 'see msg.result';
-    node.send(msg); 
+    node.send(msg);
     node.status({});
   }
 
@@ -111,7 +111,7 @@ module.exports = function (RED) {
 
     RED.nodes.createNode(this, config);
 
-    node.on('input', function (msg) {    
+    node.on('input', function (msg) {
       var params = {};
 
       node.status({});
@@ -131,8 +131,8 @@ module.exports = function (RED) {
       execute(params,node,msg);
     });
   }
-  
-  RED.nodes.registerType('conversation-v1-experimental', WatsonConversationV1ExpNode, {
+
+  RED.nodes.registerType('watson-conversation-v1-experimental', WatsonConversationV1ExpNode, {
     credentials: {
       username: {type:'text'},
       password: {type:'password'}