added category to alchemy language and updated alchemy vision

Author: germanattanasio

lib/alchemy_endpoints.json

@@ -46,6 +46,16 @@
     "html" : "/html/HTMLGetText"
   },
 
+  "category": {
+    "url"  : "/url/URLGetCategory",
+    "text" : "/text/TextGetCategory"
+  },
+
+  "publication_date": {
+    "url"  : "/url/URLGetPubDate",
+    "html" : "/html/HTMLGetPubDate"
+  },
+
   "text_raw": {
     "url"  : "/url/URLGetRawText",
     "html" : "/html/HTMLGetRawText"
@@ -80,7 +90,7 @@
 
   "image_link": {
     "url"  : "/url/URLGetImage",
-    "html" : "/html/HTMLGetImage"
+    "html" : "/url/HTMLGetImage"
   },
 
   "image_keywords": {

services/alchemy_data_news/v1.js

@@ -18,8 +18,6 @@
 
 var extend         = require('extend');
 var requestFactory = require('../../lib/requestwrapper');
-var endpoints      = require('../../lib/alchemy_endpoints.json');
-var helper         = require('../../lib/helper');
 
 function errorFormatter(cb) {
   return function(err, result, response) {
@@ -38,32 +36,6 @@ function errorFormatter(cb) {
   };
 }
 
-function createRequest(method) {
-  return function(_params, callback ) {
-    var params = _params || {};
-    var accepted_formats = Object.keys(endpoints[method]);
-    var format = helper.getFormat(params, accepted_formats);
-
-    if (format === null) {
-      callback(new Error('Missing required parameters: ' +
-        accepted_formats.join(', ') +
-        ' needs to be specified'));
-      return;
-    }
-
-    var parameters = {
-      options: {
-        url: endpoints[method][format],
-        method: 'POST',
-        json: true,
-        form: extend({outputMode: 'json'}, params) // change default output to json
-      },
-      defaultOptions: this._options
-    };
-    return requestFactory(parameters, errorFormatter(callback));
-  };
-}
-
 function AlchemyDataNews(options) {
   // Default URL
   var serviceDefaults = {

services/alchemy_language/v1.js

@@ -130,10 +130,15 @@ AlchemyLanguage.prototype.relations = createRequest('relations');
  */
 AlchemyLanguage.prototype.category = createRequest('category');
 
+/**
+ * Categorizes the text for text, a URL or HTML.
+ */
+AlchemyLanguage.prototype.publicationDate = createRequest('publication_date');
+
 /**
  * Detects the RSS/ATOM feeds for a URL or HTML.
  */
-AlchemyLanguage.prototype.feeds = createRequest('category');
+AlchemyLanguage.prototype.feeds = createRequest('feeds');
 
 /**
  * Parses the microformats for a URL or HTML.

services/alchemy_vision/v1.js

@@ -81,14 +81,13 @@ function AlchemyVision(options) {
 /**
  * Extracts images from a URL or html
  */
-AlchemyVision.prototype.imageLinks = function(_params, callback ) {
+AlchemyVision.prototype.getImageLinks = function(_params, callback ) {
   var params = _params || {};
   var accepted_formats = Object.keys(endpoints['image_link']);
   var format = helper.getFormat(params, accepted_formats);
 
   if (format === null) {
-    callback(new Error('Missing required parameters: ' +
-      accepted_formats.join(', ') + ' needs to be specified'));
+    callback(new Error('Missing required parameters: ' + accepted_formats.join(', ') + ' needs to be specified'));
     return;
   }
 
@@ -97,7 +96,7 @@ AlchemyVision.prototype.imageLinks = function(_params, callback ) {
       url: endpoints['image_link'][format],
       method: 'POST',
       json: true,
-      qs: extend({outputMode: 'json'}, params) // change default output to json
+      qs: extend({}, params,{outputMode: 'json'}) // change default output to json
     },
     defaultOptions: this._options
   };
@@ -109,44 +108,46 @@ AlchemyVision.prototype.imageLinks = function(_params, callback ) {
  * Tags image with keywords
  */
 AlchemyVision.prototype.getImageKeywords = function(_params, callback) {
-  var params = _params || {};
+  var params = extend({}, _params);
   var accepted_formats = Object.keys(endpoints['image_keywords']);
   var format = helper.getFormat(params, accepted_formats);
-  var image = null;
+
   if (format === null) {
-    callback(new Error('Missing required parameters: ' +
-      accepted_formats.join(', ') + ' needs to be specified'));
+    callback(new Error('Missing required parameters: ' + accepted_formats.join(', ') + ' needs to be specified'));
     return;
   }
 
+  var parameters = {
+    options: {
+      url: endpoints['image_keywords'][format],
+      method: 'POST',
+      json: true,
+      qs: {outputMode: 'json'} // change default output to json
+    },
+    defaultOptions: this._options
+  };
 
   if (typeof(params.image) !== 'undefined') {
+
     // check if image is stream or string
-    if (typeof(params.image) !== 'string' && !isStream(params.image)) {
+    if ((typeof(params.image) !== 'string') && !isStream(params.image)) {
       callback(new Error('Invalid arguments: image needs to be a stream or base64'));
       return;
     }
 
     if (isStream(params.image)) {
       params.imagePostMode = 'raw';
-      image = params.image;
-      delete params.image;
+      // handle raw images
+      parameters.options.body = params.image;
+
     } else {
       params.imagePostMode = 'not-raw';
+      parameters.options.formData = params;
     }
+  } else {
+    parameters.options.formData = params;
   }
 
-  var parameters = {
-    options: {
-      url: endpoints['image_links'][format],
-      method: 'POST',
-      json: true,
-      body: image,
-      qs: extend({outputMode: 'json'}, params) // change default output to json
-    },
-    defaultOptions: this._options
-  };
-
   return requestFactory(parameters, errorFormatter(callback));
 };
 
@@ -156,7 +157,7 @@ AlchemyVision.prototype.getImageKeywords = function(_params, callback) {
 AlchemyVision.prototype.recognizeFaces = function(_params, callback) {
   var params = _params || {};
 
-  if (typeof(params.image) !== 'string')
+  if (params.image && typeof(params.image) !== 'string')
     params.imagePostMode = 'raw';
 
   return createRequest('image_recognition').call(this, params, callback);