[tradeoff-analytics] Add support for "generate_visualization"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "watson-developer-cloud",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Client library to use the IBM Watson Services and AlchemyAPI",
   "main": "./lib/index",
   "repository": {

services/tradeoff_analytics/v1.js

@@ -46,7 +46,9 @@ function TradeoffAnalytics(options) {
  * @param  {String} params.options A list of options. Typically, the rows in a
  *                                 table representation of your data
  * @param  {String} params.metadataHeader Value of the x-watson-metadata header to be forwarded
- * 								   for analytics purposes
+ * 								                        for analytics purposes
+ * @param  {String} params.generate_visualization Boolean (default = true). if false, the algorithm 
+ *                                                will not create the "map" visualization, and will typically run much faster 
  */
 TradeoffAnalytics.prototype.dilemmas = function(params, callback) {
   params = params || {};
@@ -55,10 +57,11 @@ TradeoffAnalytics.prototype.dilemmas = function(params, callback) {
     options: {
       method: 'POST',
       url: '/v1/dilemmas',
-      body: omit(params,['metadata_header']),
+      body: omit(params,['metadata_header','generate_visualization']),
       headers: {
         'x-watson-metadata' : params.metadata_header
       },
+      qs: params.generate_visualization === false ? {'generate_visualization': false} : undefined,
       json: true
     },
     requiredParams: ['columns', 'subject', 'options'],

test/test.tradeoff_analytics.v1.js

@@ -15,6 +15,7 @@ describe('tradeoff_analytics', function() {
   var service_response = {};
 
   var service_path = '/v1/dilemmas';
+  var service_path_no_viz = '/v1/dilemmas?generate_visualization=false';
   var events_path = '/v1/events';
 
   var service = {
@@ -30,6 +31,10 @@ describe('tradeoff_analytics', function() {
       .persist()
       .post(service_path, service_request)
       .reply(200, service_response);
+    nock(service.url)
+      .persist()
+      .post(service_path_no_viz, service_request)
+      .reply(200, service_response);
    nock(service.url)
       .persist()
       .post(events_path, events_request)
@@ -68,17 +73,43 @@ describe('tradeoff_analytics', function() {
       assert.equal(req.headers['x-watson-metadata'], params.metadata_header);
       assert.equal(req.method, 'POST');
   });
+
+  it('should append generate_visualization=false query param to url if (and only if) needed', function() {
+    // check with generate_visualization = false
+    var params = extend({}, service_request);
+    params.generate_visualization = false;
+    var req = tradeoff_analytics.dilemmas(params, noop);
+    assert.equal(req.uri.href, service.url + service_path_no_viz);
+
+    // check with generate_visualization = true
+    params = extend({}, service_request);
+    params.generate_visualization = true;
+    req = tradeoff_analytics.dilemmas(params, noop);
+    assert.equal(req.uri.href, service.url + service_path);
+
+    // check with generate_visualization = 'sdfsd' - should be same as 'true'
+    params = extend({}, service_request);
+    params.generate_visualization = 'sdfsd';
+    req = tradeoff_analytics.dilemmas(params, noop);
+    assert.equal(req.uri.href, service.url + service_path);
+
+    // check without generate_visualization- should be same as 'true'
+    params = extend({}, service_request);
+    req = tradeoff_analytics.dilemmas(params, noop);
+    assert.equal(req.uri.href, service.url + service_path);
+  });
 
+
   it('should forward the events correctly', function() {
-	  var params = extend({}, events_request);
-	  params.metadata_header = 'test_header_content';
-      var req = tradeoff_analytics.events(params, noop);
-      var body = new Buffer(req.body).toString('ascii');
-      assert.equal(req.uri.href, service.url + events_path);
-      assert.equal(body, JSON.stringify(events_request));
-      assert.notEqual(body, JSON.stringify(params));
-      assert.equal(req.headers['x-watson-metadata'], params.metadata_header);
-      assert.equal(req.method, 'POST');
+    var params = extend({}, events_request);
+    params.metadata_header = 'test_header_content';
+    var req = tradeoff_analytics.events(params, noop);
+    var body = new Buffer(req.body).toString('ascii');
+    assert.equal(req.uri.href, service.url + events_path);
+    assert.equal(body, JSON.stringify(events_request));
+    assert.notEqual(body, JSON.stringify(params));
+    assert.equal(req.headers['x-watson-metadata'], params.metadata_header);
+    assert.equal(req.method, 'POST');
   });
 
   it('should format the response', function(done) {