Merge pull request #144 from watson-developer-cloud/master

Rebasing

Author: chughts

README.md

@@ -7,6 +7,10 @@ Node-RED Watson Nodes for IBM Cloud
 
 <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.6.10
+- Needed to stringify json before addDocument in Discovery node.
+- Using Node.js v 6 features, so will not run on Node.js v 4 anymore
+
 ### New in version 0.6.9
 - Implemented classify collection on Natural Language Classifier node. The collection can be
 in the form of multiple sentences, an array of strings, or an array of objects.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",
@@ -55,6 +55,6 @@
     }
   },
   "engines": {
-    "node": ">=4.5.0"
+    "node": ">=6.12.0"
   }
 }

services/discovery/discovery-utils.js

@@ -58,6 +58,7 @@ DiscoveryUtils.prototype = {
       params.file = this.isJsonObject(msg.payload) ?
         JSON.stringify(msg.payload) :
         msg.payload;
+      params.file_content_type = 'application/json';
     }
     return params;
   },
@@ -313,7 +314,8 @@ DiscoveryUtils.prototype = {
   },
 
   isJsonObject: function(str) {
-    if (str instanceof Array || str instanceof Object) {
+    if (str instanceof Array || str instanceof Object ||
+          'object' === typeof str || Array.isArray(str)) {
       return true;
     }
     return false;

services/discovery/v1-document-loader.js

@@ -141,12 +141,13 @@ module.exports = function (RED) {
       }
 
       discovery = new DiscoveryV1(serviceSettings);
-      // addJsonDocument is deprecated
-      //if ('.json' === suffix) {
-      //  method = 'addJsonDocument';
+      // modify as getting addJsonDocument will be deprecated messages
+      if ('.json' === suffix) {
+        //method = 'addJsonDocument';
+        params.file = JSON.stringify(params.file);
       //} else {
-      //  method = 'addDocument';
-      //}
+        //method = 'addDocument';
+      }
       method = 'addDocument';
 
       discovery[method](params, function (err, response) {