* Fix unused variables and imports thanks to codacity.

Now our code is “A”. which is good.

Author: germanattanasio

examples/search_lifecycle.v1.js

@@ -44,7 +44,7 @@ async.series([
 
   function deleteCluster(done) {
     console.log('Deleting Solr cluster ' + clusterId);
-    search.deleteCluster({clusterId: clusterId}, function(err, res) {
+    search.deleteCluster({clusterId: clusterId}, function(err) {
       printResponse(err, 'Error deleting Solr cluster: ', 'Deleted Solr cluster ' + clusterId, done);
     });
   }
@@ -57,7 +57,7 @@ function waitForCluster(clusterId, callback) {
     }
 
     console.log('Waiting for Solr cluster ' + clusterId + ' to be ready...');
-    if (res.solr_cluster_status == 'READY') {
+    if (res.solr_cluster_status === 'READY') {
       console.log('Solr cluster ' + clusterId + ' is ready.');
       callback();
     } else {

examples/search_solr.v1.js

@@ -1,9 +1,7 @@
 'use strict';
 
 var watson = require('watson-developer-cloud');
-var fs     = require('fs');
 var async  = require('async');
-var solr   = require('solr-client');
 
 var username = 'INSERT YOUR USERNAME FOR THE SERVICE HERE';
 var password = 'INSERT YOUR PASSWORD FOR THE SERVICE HERE';
@@ -30,10 +28,15 @@ var solrClient = search.createSolrClient({
 async.series([
   function uploadConfig(done) {
     console.log('Uploading Solr config ' +  configName);
-    search.uploadConfig({clusterId: clusterId, configName: configName, configZipPath: configZipPath},
-      function(err, res) {
-      printResponse(err, 'Error uploading Solr config: ', 'Uploaded Solr config ' + configName, done);
-    });
+    search.uploadConfig({
+        clusterId: clusterId,
+        configName: configName,
+        configZipPath: configZipPath
+      },
+      function(err) {
+        printResponse(err, 'Error uploading Solr config: ', 'Uploaded Solr config ' + configName, done);
+      });
+
   },
 
   function listConfigs(done) {
@@ -45,20 +48,29 @@ async.series([
 
   function getConfig(done) {
     console.log('Getting Solr config ' + configName);
-    search.getConfig({clusterId: clusterId, configName: configName}, function(err, res) {
+    search.getConfig({
+      clusterId: clusterId,
+      configName: configName
+    }, function(err) {
       if (err) {
         console.log('Error getting config: ' + JSON.stringify(err, null, 2));
       } else {
         // Save response to a local file here
       }
       done();
     });
+
   },
 
   function createCollection(done) {
-    search.createCollection({clusterId: clusterId, collectionName: collectionName, configName: configName}, function(err, res) {
+    search.createCollection({
+      clusterId: clusterId,
+      collectionName: collectionName,
+      configName: configName
+    }, function(err, res) {
       printResponse(err, 'Error creating Solr collection: ', res, done);
     });
+
   },
 
   function listCollections(done) {
@@ -70,13 +82,13 @@ async.series([
   function indexAndCommit(done) {
     console.log('Indexing a document...');
     var doc = { id : 1234, title_t : 'Hello', text: 'some text' };
-    solrClient.add(doc, function(err, addResponse) {
+    solrClient.add(doc, function(err) {
       if(err) {
         console.log('Error indexing document: ' + err);
         done();
       } else {
         console.log('Indexed a document.');
-        solrClient.commit(function(err, commitResponse) {
+        solrClient.commit(function(err) {
           if(err) {
             console.log('Error committing change: ' + err);
           } else {
@@ -88,7 +100,7 @@ async.series([
     });
   },
 
-  function search(done) {
+  function _search(done) {
     console.log('Searching all documents.');
     var query = solrClient.createQuery();
     query.q({ '*' : '*' });
@@ -105,16 +117,24 @@ async.series([
 
   function deleteCollection(done) {
     console.log('Deleting Solr collection ' + collectionName);
-    search.deleteCollection({clusterId: clusterId, collectionName: collectionName}, function(err, res) {
+    search.deleteCollection({
+      clusterId: clusterId,
+      collectionName: collectionName
+    }, function(err) {
       printResponse(err, 'Error deleting collection: ', 'Deleted Solr collection ' + collectionName, done);
     });
+
   },
 
   function deleteConfig(done) {
     console.log('Deleting Solr config ' + configName);
-    search.deleteConfig({clusterId: clusterId, configName: configName}, function(err, res) {
+    search.deleteConfig({
+      clusterId: clusterId,
+      configName: configName
+    }, function(err) {
       printResponse(err, 'Error deleting config: ', 'Deleted Solr config ' + configName, done);
     });
+
   },
 ]);
 

lib/alchemy_endpoints.json

@@ -85,7 +85,8 @@
   },
 
   "image": {
-    "url"  : "/url/URLGetImage"
+    "url"  : "/url/URLGetImage",
+    "html" : "/html/HTMLGetImage"
   },
 
   "image_keywords": {

lib/index.js

@@ -113,7 +113,8 @@ var watson = {};
   'user_modeling',
 
   // alchemy
-  'alchemy_language'
+  'alchemy_language',
+  'alchemy_vision'
 
 ].forEach(function(api) {
   watson[api] = createServiceAPI(api);

services/alchemy_vision/v1.js

@@ -0,0 +1,116 @@
+/**
+ * Copyright 2015 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+var extend         = require('extend');
+var requestFactory = require('../../lib/requestwrapper');
+var endpoints      = require('../../lib/alchemy_endpoints.json');
+var helper         = require('../../lib/helper');
+var pick           = require('object.pick');
+var omit           = require('object.omit');
+var fs             = require('fs');
+
+var errorFormatter = function(cb) {
+  return function(err, result, response) {
+    if (err) {
+      cb(err, result);
+    }
+    else {
+      if (result.status === 'OK')
+        cb(err,result);
+      else
+        cb({
+          error: result.statusInfo || response['headers']['x-alchemyapi-error-msg'],
+          code: 400
+        }, null);
+    }
+  };
+};
+
+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 imageOptions = {};
+
+    if (typeof(_params.image) !== 'string') {
+      params.imagePostMode = 'raw';
+      imageOptions.formData = { attachments: [_params.image] };
+    } else {
+      imageOptions.form = pick(params,['image']);
+    }
+
+    var parameters = extend({
+      options: {
+        url: endpoints[method][format],
+        method: 'POST',
+        json: true,
+        qs: extend({outputMode: 'json'}, omit(params,['image'])) // change default output to json
+      },
+      defaultOptions: this._options
+    }, imageOptions);
+
+    return requestFactory(parameters, errorFormatter(callback));
+  };
+}
+
+function AlchemyVision(options) {
+  // Default URL
+  var serviceDefaults = {
+    url: 'https://access.alchemyapi.com/calls'
+  };
+  // Replace default options with user provided
+  this._options = extend(serviceDefaults, options);
+}
+
+/**
+ * Extracts images from a URL.
+ */
+AlchemyVision.prototype.imageLinks = createRequest('image');
+
+/**
+ * Tags image with keywords
+ */
+AlchemyVision.prototype.imageTags = function(_params, callback) {
+  var params = _params || {};
+
+
+  return createRequest('image_keywords').call(this, params, callback);
+};
+
+/**
+ * Face detection and Recognition
+ */
+AlchemyVision.prototype.imageFaces = function(_params, callback) {
+  var params = _params || {};
+
+  if (typeof(params.image) !== 'string')
+    params.imagePostMode = 'raw';
+
+  return createRequest('image_face_tag').call(this, params, callback);
+};
+
+module.exports = AlchemyVision;