fix the json encoding of classifier ids

Author: germanattanasio

services/visual_recognition/v2-beta.js

@@ -18,6 +18,7 @@
 
 var extend = require('extend');
 var pick = require('object.pick');
+var util = require('util');
 var omit = require('object.omit');
 var isStream = require('isstream');
 var requestFactory = require('../../lib/requestwrapper');
@@ -158,21 +159,25 @@ VisualRecognition.prototype.listClassifiers = function(params, callback) {
  *                                     all classifiers.
  */
 VisualRecognition.prototype.classify = function(params, callback) {
-  params = params || {};
+  var formData = extend(true, {}, params);
 
   try {
-    verifyStream(params.images_file, 'images_file');
+    verifyStream(formData.images_file, 'images_file');
   } catch (e) {
     callback(e);
     return;
   }
 
+  // if is an array we wrap it in a `classifier_ids` element
+  if (formData.classifier_ids && util.isArray(formData.classifier_ids))
+    formData.classifier_ids = JSON.stringify(pick(formData,['classifier_ids']));
+
   var parameters = {
     options: {
       url: '/v2/classify',
       method: 'POST',
       json: true,
-      formData: pick(params, ['images_file', 'classifier_ids'])
+      formData: pick(formData, ['images_file', 'classifier_ids'])
     },
     defaultOptions: this._options
   };

test/test.integration-all-services.js

@@ -111,6 +111,7 @@ describe('integration-all-services', function() {
       it('classify()', function(done) {
         var params = {
           images_file: fs.createReadStream(__dirname + '/resources/car.png'),
+          classifier_ids: ['Red','Car']
         };
         visual_recognition.listClassifiers(params, failIfError.bind(failIfError, done));
       });

test/test.visual_recognition.v2-beta.js

@@ -24,7 +24,9 @@ describe('visual_recognition', function() {
   var fake_file = fs.createReadStream(__dirname + '/resources/car.png');
   var service_request = {
     images_file: fake_file,
-    classifier_ids: ['foo', 'bar']
+    classifier_ids: {
+      classifier_ids: ['foo', 'bar']
+    }
   };
 
   var classify_path = '/v2/classify?' + version_qs;
@@ -117,11 +119,16 @@ describe('visual_recognition', function() {
     });
 
     it('should generate a valid payload', function() {
-      var req = visual_recognition.classify(service_request, noop);
+      var params = {
+        images_file: fake_file,
+        classifier_ids: ['foo','bar']
+      };
+
+      var req = visual_recognition.classify(params, noop);
       assert.equal(req.uri.href, service.url + classify_path);
       assert.equal(req.method, 'POST');
-      assert.equal(req.formData.images_file.path, __dirname + '/resources/car.png');
-      assert.deepEqual(req.formData.classifier_ids, service_request.classifier_ids);
+      assert.equal(req.formData.images_file.path, fake_file.path);
+      assert.equal(req.formData.classifier_ids, JSON.stringify(service_request.classifier_ids));
     });
   });
 
@@ -143,12 +150,11 @@ describe('visual_recognition', function() {
     });
 
     it('should generate a valid payload with streams', function() {
-      var fake_file = fs.createReadStream(__dirname + '/resources/car.png'),
-        params = {
-          positive_examples: fake_file,
-          negative_examples: fake_file,
-          name: 'test-c'
-        };
+      var params = {
+        positive_examples: fake_file,
+        negative_examples: fake_file,
+        name: 'test-c'
+      };
 
       var req = visual_recognition.createClassifier(params, noop);
       assert.equal(req.uri.href, service.url + classifiers_path);