added classifier_id and fallback to classifier to fix #85

Author: germanattanasio

README.md

@@ -301,7 +301,7 @@ var natural_language_classifier = watson.natural_language_classifier({
 
 natural_language_classifier.classify({
   text: 'Is it sunny?',
-  classifier: '<classifier-id>' },
+  classifier_id: '<classifier-id>' },
   function(err, response) {
     if (err)
       console.log('error:', err);

examples/natural_language_classifier.v1.js

@@ -29,7 +29,7 @@ natural_language_classifier.create(params, function(err, response) {
 // Using a classifier
 natural_language_classifier.classify({
   text: 'Is it sunny?',
-  classifier: '<classifier-id>' }, // from the previous command
+  classifier_id: '<classifier-id>' }, // from the previous command
   function(err, response) {
     if (err)
       console.log('error:', err);

services/natural_language_classifier/v1.js

@@ -82,15 +82,19 @@ NaturalLanguageClassifier.prototype.create = function(params, callback) {
 NaturalLanguageClassifier.prototype.classify = function(params, callback) {
   params = params || {};
 
+  // #84: use classifier_id not classifier.
+  if (!params.classifier_id)
+    params.classifier_id = params.classifier;
+
   var parameters = {
     options: {
-      url: '/v1/classifiers/{classifier}/classify',
+      url: '/v1/classifiers/{classifier_id}/classify',
       method: 'POST',
       json: true,
-      path: pick(params, ['classifier']),
+      path: pick(params, ['classifier_id']),
       body: pick(params, ['text'])
     },
-    requiredParams: ['classifier', 'text'],
+    requiredParams: ['classifier_id', 'text'],
     defaultOptions: this._options
   };
 
@@ -103,14 +107,18 @@ NaturalLanguageClassifier.prototype.classify = function(params, callback) {
 NaturalLanguageClassifier.prototype.status = function(params, callback) {
   params = params || {};
 
+  // #84: use classifier_id not classifier.
+  if (!params.classifier_id)
+    params.classifier_id = params.classifier;
+
   var parameters = {
     options: {
-      url: '/v1/classifiers/{classifier}',
+      url: '/v1/classifiers/{classifier_id}',
       method: 'GET',
       json: true,
       path: params
     },
-    requiredParams: ['classifier'],
+    requiredParams: ['classifier_id'],
     defaultOptions: this._options
   };
 
@@ -139,14 +147,18 @@ NaturalLanguageClassifier.prototype.list = function(params, callback) {
 NaturalLanguageClassifier.prototype.remove = function(params, callback) {
   params = params || {};
 
+  // #84: use classifier_id not classifier.
+  if (!params.classifier_id)
+    params.classifier_id = params.classifier;
+
   var parameters = {
     options: {
-      url: '/v1/classifiers/{classifier}',
+      url: '/v1/classifiers/{classifier_id}',
       method: 'DELETE',
       path: params,
       json: true
     },
-    requiredParams: ['classifier'],
+    requiredParams: ['classifier_id'],
     defaultOptions: this._options
   };
 

test/test.natural_language_classifier.v1.js

@@ -48,6 +48,7 @@ var emptyData = { text: '' },
   emptyDataClassifier = { text: '', classifer: '' },
   nullDataClassifier = { text: null, classifer: null },
   goodData = { text: 'good', classifier: 'good' },
+  goodDataWithClassifierId = { text: 'good', classifier_id: 'good' },
   noTrainingData = {language:'en', name:'foo'};
 
   // training requests
@@ -127,6 +128,8 @@ describe('natural_language_classifer', function() {
     natural_language_classifier.status(goodData, goodRequest);
     natural_language_classifier.remove(goodData, goodRequest);
 
+    natural_language_classifier.status(goodDataWithClassifierId, goodRequest);
+    natural_language_classifier.remove(goodDataWithClassifierId, goodRequest);
     //list doesn't need params
     natural_language_classifier.list({}, goodRequest);
     natural_language_classifier.list(null, goodRequest);