Merge branch 'dev'

Author: germanattanasio

.gitignore

@@ -5,3 +5,4 @@ coverage
 test/resources/auth.js
 test/integration/
 test/resources/tts-output.ogg
+.idea

.travis.yml

@@ -9,5 +9,4 @@ script:
 after_success:
 - npm run coveralls
 before_install:
-- openssl aes-256-cbc -K $encrypted_d4f181ef7c79_key -iv $encrypted_d4f181ef7c79_iv
-  -in auth.js.enc -out test/resources/auth.js -d
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_cb4d3d070e32_key -iv $encrypted_cb4d3d070e32_iv -in auth.js.enc -out test/resources/auth.js -d || true'

CONTRIBUTING.md

@@ -28,8 +28,8 @@ If you want to contribute to the repository, follow these steps:
 
 1. Fork the repo.
 1. Develop and test your code changes: `npm install -d && npm test`. Make sure you work in the `dev` branch. PLEASE don't do your work in `master`.
-1. In order to run the tests locally you should comment out `test.integration-all-services.js` because the integration tests require you to have service credentials for all the services.
-Travis will run the integration tests for all services once the changes are merged in.
+1. Travis-CI will run the integration tests for all services once your changes are merged.
+If you wish to run integration tests locally you must provide service credentials for all the services. See `test/test.integration-all-services.js`.
 1. Add a test for your changes. Only refactoring and documentation changes require no new tests.
 1. Make the test pass.
 1. Commit your changes.

README.md

@@ -294,16 +294,26 @@ var watson = require('watson-developer-cloud');
 var fs = require('fs');
 
 var document_conversion = watson.document_conversion({
-  username: '<username>',
-  password: '<password>',
-  version: 'v1-experimental'
+  username:     '<username>',
+  password:     '<password>',
+  version:      'v1-experimental',
+  version_date: '2015-12-01'
 });
 
 // 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
+  conversion_target: document_conversion.conversion_target.ANSWER_UNITS,
+  // Add custom configuration properties or omit for defaults
+  word: {
+    heading: {
+      fonts: [
+        { level: 1, min_size: 24 },
+        { level: 2, min_size: 16, max_size: 24 }
+      ]
+    }
+  }
 }, function (err, response) {
   if (err) {
     console.error(err);

auth.js.enc

@@ -8,7 +8,7 @@ var visual_recognition = watson.visual_recognition({
   username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
   password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
   version: 'v2-beta',
-  version_date: '2015-11-24'
+  version_date: '2015-12-02'
 });
 
 var params = {

examples/visual_recognition.v2-beta.js

@@ -22,9 +22,19 @@ var isStream       = require('isstream');
 var omit           = require('object.omit');
 
 function DocumentConversion(options) {
+  // Warn if not specifying version date
+  var version_date = "2015-12-01"
+  if(options && options.version_date) {
+    version_date = options.version_date
+  } else {
+    console.warn("[DocumentConversion] WARNING: No version_date specified. Using a (possibly old) default. " +
+                 "e.g. watson.document_conversion({ version_date: '2015-12-01' })")
+  }
+
   // Default URL
   var serviceDefaults = {
-    url: 'https://gateway.watsonplatform.net/document-conversion-experimental/api'
+    url: 'https://gateway.watsonplatform.net/document-conversion-experimental/api',
+    qs: { version: version_date }
   };
 
   // Replace default options with user provided

services/document_conversion/v1-experimental.js

@@ -41,7 +41,7 @@ function verifyStream(value, name) {
 function VisualRecognition(options) {
   // Check if 'version_date' was provided
   if (typeof options.version_date === 'undefined') {
-    throw new Error('Argument error: version_date was not specified, use 2015-11-24');
+    throw new Error('Argument error: version_date was not specified, use 2015-12-02');
   }
 
   // Default URL

services/visual_recognition/v2-beta.js

@@ -2,6 +2,7 @@
 
 var assert  = require('assert');
 var pick    = require('object.pick');
+var extend  = require('extend');
 var watson  = require('../lib/index');
 var nock    = require('nock');
 var fs      = require('fs');
@@ -11,7 +12,7 @@ describe('document_conversion', function() {
   var noop = function() {};
 
   // Test params
-  var service = {
+  var service_options = {
     username: 'batman',
     password: 'bruce-wayne',
     url: 'http://ibm.com:80',
@@ -21,6 +22,14 @@ describe('document_conversion', function() {
 
   var payload = {
     conversion_target: 'ANSWER_UNITS',
+    word: {
+      heading: {
+        fonts: [
+          { level: 1, min_size: 24 },
+          { level: 2, min_size: 16, max_size: 24 }
+        ]
+      }
+    },
     file: fs.createReadStream(__dirname + '/resources/sampleWORD.docx'),
   };
 
@@ -32,7 +41,7 @@ describe('document_conversion', function() {
     nock.cleanAll();
   });
 
-  var servInstance = watson.document_conversion(service);
+  var servInstance = watson.document_conversion(service_options);
 
   var missingParameter = function(err) {
     assert.ok((err instanceof Error) && /required parameters/.test(err));
@@ -64,9 +73,28 @@ describe('document_conversion', function() {
 
     it('should generate a valid payload', function() {
       var req = servInstance.convert(payload, noop);
-      assert.equal(req.uri.href, service.url + convertPath);
+      var url = service_options.url + convertPath;
+      assert.equal(req.uri.href.slice(0, url.length), url);
       assert.equal(req.method, 'POST');
       assert(req.formData);
     });
+
+    it('should send extra config params', function() {
+      var req = servInstance.convert(payload, noop);
+      var config = JSON.parse(req.formData.config.value);
+      assert(config.word.heading.fonts);
+    });
+
+    it('should send the version query param', function() {
+      var req = servInstance.convert(payload, noop);
+      assert(req.uri.query);
+      assert(req.uri.query.indexOf("version=") > -1)
+    });
+
+    it('should allow the version query param to be overridden', function() {
+      var custServInstance = watson.document_conversion(extend(service_options, { version_date: "2015-11-30"}));
+      var req = custServInstance.convert(payload, noop);
+      assert(req.uri.query.indexOf("version=2015-11-30" > -1));
+    });
   });
 });

test/test.document_conversion.v1-experimental.js

@@ -1,21 +1,23 @@
 'use strict';
 
+var fs = require('fs');
+
+if (fs.existsSync(__dirname + '/resources/auth.js')) {
+
 var nock = require('nock');
 var watson = require('../lib/index');
 var auth = require('./resources/auth');
-var fs = require('fs');
 var assert = require('assert');
 
 var mobydick = fs.readFileSync(__dirname + '/resources/mobydick.txt', 'utf8');
 
 var concat = require('concat-stream');
 var TWENTY_SECONDS = 20000;
+var THIRTY_SECONDS = 30000;
 var TEN_SECONDS = 10000;
 var FIVE_SECONDS = 5000;
 var TWO_SECONDS = 2000;
 
-if (fs.existsSync(__dirname + '/resources/auth.js')) {
-
 describe('integration-all-services', function() {
 
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
@@ -313,7 +315,7 @@ describe('integration-all-services', function() {
     });
 
   describe('functional_dialog', function() {
-    this.timeout(TWENTY_SECONDS);
+    this.timeout(THIRTY_SECONDS);
     var dialog = watson.dialog(auth.dialog);
     var dialog_id = auth.dialog.dialog_id;
     var client_id = 31;
@@ -558,7 +560,7 @@ describe('integration-all-services', function() {
 
     it('getImageLinks() with html', function(done) {
       alchemy_vision.getImageLinks({
-        html: '<div><img src="http://visual-recognition-demo.mybluemix.net/images/horses.jpg" /></div>'
+        html: '<div><img src="https://visual-recognition-demo.mybluemix.net/images/samples/6.jpg" /></div>'
       }, failIfError.bind(failIfError, done));
     });
 
@@ -590,7 +592,15 @@ describe('integration-all-services', function() {
     it('convertFile()', function(done) {
       document_conversion.convert({
         file: fs.createReadStream(__dirname + '/resources/sampleWORD.docx'),
-        conversion_target: 'ANSWER_UNITS'
+        conversion_target: 'ANSWER_UNITS',
+        word: {
+          heading: {
+            fonts: [
+              { level: 1, min_size: 24 },
+              { level: 2, min_size: 16, max_size: 24 }
+            ]
+          }
+        }
       }, failIfError.bind(failIfError, done));
     });
   });