Merge branch 'master' into dev

Author: Dolev Dotan

services/tradeoff_analytics/v1.js

@@ -18,6 +18,8 @@
 
 var extend         = require('extend');
 var requestFactory = require('../../lib/requestwrapper');
+var omit = require('object.omit');
+var pick = require('object.pick');
 
 function TradeoffAnalytics(options) {
   // Default URL
@@ -39,19 +41,53 @@ function TradeoffAnalytics(options) {
  * @param  {String} params.subject Name of the decision problem
  * @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
  */
 TradeoffAnalytics.prototype.dilemmas = function(params, callback) {
+  params = params || {};
   var parameters = {
     options: {
       method: 'POST',
       url: '/v1/dilemmas',
-      body: params,
-      json: true,
+      body: omit(params,['metadataHeader']),
+      headers: {
+    	'x-watson-metadata' : pick(params,['metadataHeader'])
+      },
+      json: true
     },
     requiredParams: ['columns', 'subject', 'options'],
     defaultOptions: this._options
   };
   return requestFactory(parameters, callback);
 };
 
+/**
+ *
+ */
+	
+ /**
+ * Forward events from the Tradeoff Analytics widget to the service
+ *
+ * @param  {String} params - the array of events to forward to the service
+ * @param  {String} params.metadataHeader Value of the x-watson-metadata header to be forwarded
+ * 								   for analytics purposes
+ */
+TradeoffAnalytics.prototype.events = function(params, callback) {
+  params = params || {};
+  var parameters = {
+    options: {
+      method: 'POST',
+      url: '/v1/events',
+      body: omit(params,['metadataHeader']),
+      headers: {
+    	'x-watson-metadata' : pick(params,['metadataHeader'])
+      },
+      json: true
+    },
+    defaultOptions: this._options
+  };
+  return requestFactory(parameters, callback);
+};
+
 module.exports = TradeoffAnalytics;