Merge pull request watson-developer-cloud#252 from watson-developer-cloud/visual-recognition

Visual recognition v3

Author: nfriedly

.travis.yml

@@ -10,9 +10,7 @@ script:
 after_success:
 - jsdoc/publish.sh
 before_install:
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_d4f181ef7c79_key
-  -iv $encrypted_d4f181ef7c79_iv -in auth.js.enc -out test/resources/auth.js -d ||
-  true'
+- '[ "${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'
 env:
   global:
     secure: I50FnfubwiZlol5Qs9tXPVACGbs+SG2dJLjpbzeio0Hl666d/hDuvf7IFwqqaRjQkmK2TdIjaGLMOgHxh/GGAoYf7LfZqjDID/tAhgoFOYiZwiPj66Z82F9P9cega2nkNW+125NzPuU3rhSCByG8+K/PMH/5JxPwPMoAYNLQjWc=

auth.js.enc

@@ -40,6 +40,7 @@ function createServiceAPI(serviceName) {
   return function(user_options) {
     var options = extend({}, user_options);
     var alchemy = (serviceName.indexOf('alchemy_') === 0);
+    var vrv3 = (serviceName === 'visual_recognition' && user_options.version === 'v3');
 
     // For Alchemy we use 'v1' by default,
     // and check if `apikey` was specified.
@@ -48,6 +49,9 @@ function createServiceAPI(serviceName) {
       options.alchemy = true;
       options.version = 'v1';
       options.api_key = options.apikey || options.api_key;
+    } else if (vrv3) {
+      // Visual Recognition v3 similarly uses an API key instead of username + password
+      options.api_key = options.apikey || options.api_key;
     } else {
       options.jar = request.jar();
     }
@@ -76,7 +80,7 @@ function createServiceAPI(serviceName) {
       // Check if 'api_key' or 'username' and 'password' were provided
       if (typeof api_key === 'undefined') {
         if (typeof user === 'undefined' || typeof pass === 'undefined') {
-          if (alchemy)
+          if (alchemy || vrv3)
             throw new Error('Argument error: api_key was not specified');
           else
             throw new Error('Argument error: api_key or username and password were not specified');
@@ -150,7 +154,7 @@ var watson = {
   /**
    * @function
    * @param {{}} options
-   * @returns  {VisualRecognitionV1Beta|VisualRecognitionV2Beta}
+   * @returns  {VisualRecognitionV1Beta|VisualRecognitionV2Beta|VisualRecognitionV3}
    */
   visual_recognition: createServiceAPI('visual_recognition'),
 
@@ -275,7 +279,7 @@ var watson = {
    * @returns  {AlchemyDataNews}
    */
   alchemy_data_news: createServiceAPI('alchemy_data_news'),
-  
+
   /**
    * @function
    * @param {{}} options

lib/index.js

@@ -76,6 +76,7 @@ function formatErrorIfExists(cb) {
  * 3. Encode path and query parameters
  * 4. Call the api
  * @private
+ * @return {ReadableStream|undefined}
  */
 function createRequest(parameters, callback) {
   var missingParams = null,