Update version to 0.10.4

Merge branch 'master' of
https://github.com/watson-developer-cloud/nodejs-wrapper

Conflicts:
	package.json

Author: Dolev Dotan

.gitignore

@@ -1,4 +1,9 @@
 node_modules/*
 npm-debug.log
 coverage
-.DS_Store
+.DS_Store
+test/resources/auth.js
+test/resources/mobydick.txt
+test/test.all-services.js
+test/resources/tts-output.ogg
+test/resources/face.jpg

.jshintignore

@@ -15,8 +15,7 @@
   },
 
   "node" : true,
-  "es5" : true,
-  "browser" : true,
+  "browser" : false,
 
   "boss" : false,
   "curly": false,
@@ -26,7 +25,6 @@
   "evil": true,
   "forin": false,
   "immed": true,
-  "maxlen": 100,
   "indent": 2,
   "quotmark": "single",
   "laxbreak": false,
@@ -43,4 +41,4 @@
   "strict": true,
   "white": true,
   "unused": true
-}
+}

.jshintrc

@@ -1,7 +1,10 @@
 language: node_js
+sudo: false # causes tests to be run in Travis CI's newer, faster build infrastructure
 node_js:
   - "0.10"
+  - "0.12"
+  - "stable"
 script:
   - npm test
 after_success:
-  - npm run coveralls
+  - npm run coveralls

.travis.yml

@@ -25,6 +25,7 @@ APIs and SDKs that use cognitive computing to solve complex problems.
       * [Concept Expansion](#concept-expansion)
       * [Concept Insights](#concept-insights)
       * [Dialog](#dialog)
+      * [Document Conversion](#document-conversion)
       * [Language Translation](#language-translation)
       * [Message Resonance](#message-resonance)
       * [Natural Language Classifier](#natural-language-classifier)
@@ -191,14 +192,11 @@ var watson = require('watson-developer-cloud');
 var concept_insights = watson.concept_insights({
   username: '<username>',
   password: '<password>',
-  version: 'v1'
+  version: 'v2'
 });
 
-/*** Annotate Text ***/
-
 var params = {
-  user: 'wikipedia',
-  graph: 'en-20120601',
+  graph: '/graphs/wikipedia/en20120601',
   text: 'IBM Watson won the Jeopardy television show hosted by Alex Trebek'
 };
 
@@ -207,32 +205,9 @@ concept_insights.annotateText(params, function(err, res) {
   if (err)
     console.log(err);
   else {
-    console.log("\n*** Annotate Text ***\n");
     console.log(JSON.stringify(res, null, 2));
   }
 });
-
-/*** Semantic Search ***/
-
-var payload = {
-  func: 'semanticSearch',
-  ids: [
-    '/graph/wikipedia/en-20120601/Software_development_process',
-    '/graph/wikipedia/en-20120601/Programming_tool'
-  ],
-  corpus: 'ibmresearcher',
-  user: 'public',
-  limit: 5
-};
-
-concept_insights.semanticSearch(payload, function(error, results) {
-  if (error)
-    console.log(error);
-  else {
-    console.log("\n*** Semantic Search ***\n");
-    console.log(JSON.stringify(results, null, 2));
-  }
-});
 ```
 
 ### Dialog
@@ -247,12 +222,37 @@ var dialog = watson.dialog({
   version: 'v1'
 });
 
-
 dialog.getDialogs({}, function (err, dialogs) {
-    if (err)
-      console.log('error:', err);
-    else
-      console.log(JSON.stringify(dialogs, null, 2));
+  if (err)
+    console.log('error:', err);
+  else
+    console.log(JSON.stringify(dialogs, null, 2));
+});
+```
+
+### Document Conversion
+
+```javascript
+var watson = require('watson-developer-cloud');
+var fs = require('fs');
+
+var document_conversion = watson.document_conversion({
+  username: '<username>',
+  password: '<password>',
+  version: 'v1-experimental'
+});
+
+// convert a single document
+document_conversion.convert({
+  // (JSON) ANSWER_UNITS, NORMALIZED_HTML, or NORMALIZED_TEXT
+  file: fs.createReadStream('sample-docx.docx'),
+  conversion_target: document_conversion.conversion_target.ANSWER_UNITS
+}, function (err, response) {
+  if (err) {
+    console.error(err);
+  } else {
+    console.log(JSON.stringify(response, null, 2));
+  }
 });
 ```
 
@@ -278,7 +278,7 @@ language_translation.translate({
       console.log(JSON.stringify(translation, null, 2));
 });
 
-language_identification.identify({
+language_translation.identify({
   text: 'The language translation service takes text input and identifies the language used.' },
   function (err, language) {
     if (err)
@@ -327,7 +327,7 @@ var natural_language_classifier = watson.natural_language_classifier({
 
 natural_language_classifier.classify({
   text: 'Is it sunny?',
-  classifier: '<classifier-id>' },
+  classifier_id: '<classifier-id>' },
   function(err, response) {
     if (err)
       console.log('error:', err);

README.md

@@ -0,0 +1,17 @@
+# Release process
+
+Standard practice with node.js modules is to commit all of the changes for a release except updating the package.json version, and then run the following:
+
+```
+npm version major|minor|patch
+git push --tags
+git push origin master
+npm publish
+```
+
+`npm version *` will update the package.json version field appropriately and create a git commit and tag for the version.  
+`git push --tags` will publish the tag to github., and then immediately.  
+`git push origin master` will publish the changes to package.json.  
+`npm publish` will publish the npm package.
+
+The reason for this is that it allows someone to easily view the source code (and readme) for whatever version they happen to have downloaded from npm. This is particularly helpful when github is ahead of npm.

RELEASE.md

@@ -0,0 +1,24 @@
+'use strict';
+
+var watson = require('watson-developer-cloud');
+
+var concept_insights = watson.concept_insights({
+  username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
+  password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
+  version: 'v2'
+});
+
+var params = {
+  graph: '/graphs/wikipedia/en20120601',
+  text: 'IBM Watson won the Jeopardy television show hosted by Alex Trebek'
+};
+
+// Retrieve the concepts for input text
+concept_insights.annotateText(params, function(err, res) {
+  if (err)
+    console.log(err);
+  else {
+    console.log('Annotated Text');
+    console.log(JSON.stringify(res, null, 2));
+  }
+});

examples/concept_insights.v2.js

@@ -0,0 +1,23 @@
+'use strict';
+
+var watson = require('watson-developer-cloud');
+var fs = require('fs');
+
+var document_conversion = watson.document_conversion({
+  username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
+  password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
+  version: 'v1-experimental'
+});
+
+// convert a single document
+document_conversion.convert({
+  // (JSON) ANSWER_UNITS, NORMALIZED_HTML, or NORMALIZED_TEXT
+  file: fs.createReadStream(__dirname + '/resources/document_conversion/sample-docx.docx'),
+  conversion_target: document_conversion.conversion_target.ANSWER_UNITS
+}, function (err, response) {
+  if (err) {
+    console.error(err);
+  } else {
+    console.log(JSON.stringify(response, null, 2));
+  }
+});

examples/document_conversion.v1-experimental.js

@@ -29,7 +29,7 @@ natural_language_classifier.create(params, function(err, response) {
 // Using a classifier
 natural_language_classifier.classify({
   text: 'Is it sunny?',
-  classifier: '<classifier-id>' }, // from the previous command
+  classifier_id: '<classifier-id>' }, // from the previous command
   function(err, response) {
     if (err)
       console.log('error:', err);