add remote image test

Author: tejitak

index.js

@@ -12,7 +12,7 @@ module.exports = {
   _client: null,
 
   init(options) {
-    __.defaults(options, {version: 'v1alpha1'})
+    this._options = __.defaults(options, {version: 'v1alpha1'})
     const Endpoint = require('./lib/clients/' + options.version)
     var ep = new Endpoint(options)
     ep.google = this

lib/clients/v1alpha1.js

@@ -10,6 +10,13 @@ class Client {
     this._options = options || {}
   }
 
+  /**
+   * annotate
+   *
+   * @desc Call cloud vision API
+   *
+   * @param  {array} requests - Parameters for request
+   */
   annotate(requests) {
     return new Promise((resolve, reject) => {
       this._buildRequests(requests).then((params) => {
@@ -19,18 +26,18 @@ class Client {
             method: 'POST'
           },
           params: {
-            requests: params
+            resource: {
+              requests: params
+            }
           },
           requiredParams: [],
           pathParams: [],
           context: this
         }
         createAPIRequest(parameters, (err, response) => {
           if (err) {
-            console.log(err)
             reject(err)
           } else {
-            console.log(response)
             resolve(response)
           }
         })

lib/models/Feature.js

@@ -1,16 +1,13 @@
 'use strict'
+const __ = require('underscore')
 
 class Feature {
 
-  // FACE_DETECTION
-  // LANDMARK_DETECTION
-  // LOGO_DETECTION
-  // LABEL_DETECTION
-  // TEXT_DETECTION
-  // SAFE_SEARCH_DETECTION
-
-  constructor(options) {
-    options = options || {}
+  constructor(type, maxResults) {
+    const options = __.isObject(type) ? type : {
+      type: type,
+      maxResults: maxResults
+    }
     this._type = options.type
     this._maxResults = options.maxResults || 10
   }

lib/models/Image.js

@@ -1,11 +1,14 @@
 'use strict'
 const fs = require('fs'),
-  request = require('request')
+  request = require('request'),
+  __ = require('underscore')
 
 class Image {
 
-  constructor(options) {
-    options = options || {}
+  constructor(path) {
+    const options = __.isObject(path) ? path : {
+      path: path
+    }
     this._path = options.path
     this._url = options.url
   }
@@ -28,16 +31,12 @@ class Image {
 
   _loadRemote() {
     return new Promise((resolve, reject) => {
-      const url = unescape(this._url),
-        bl = new BufferList()
       request({
-        uri: url,
-        responseBodyStream: bl
+        url: this._url,
+        encoding: null
       }, (err, response, body) => {
         if (!err && response.statusCode == 200) {
-          var content = new Buffer(bl.toString(), 'binary').toString('base64')
-          console.log(content)
-          resolve(content)
+          resolve(new Buffer(body).toString('base64'))
         } else {
           reject(err)
         }
@@ -48,6 +47,7 @@ class Image {
   build() {
     return new Promise((resolve, reject) => {
       this.load().then((cotent) => {
+        console.log(content)
         resolve({content: content})
       })
     })

lib/models/Request.js

@@ -17,7 +17,7 @@ class Request {
     return new Promise((resolve, reject) => {
       this._image.load().then((content) => {
         resolve({
-          image: content,
+          image: {content: content},
           features: __.map(this._features, (f) => f.build())
         })
       }).catch((e) => {

test_annotate.js

@@ -2,17 +2,21 @@
 const vision = require('./index')
 
 // init with auth
-vision.init({auth: 'YOUR_SERVER_KEY'})
+vision.init({auth: 'AIzaSyDwWH4G8Nx2Z7WrdPvVRhqQqlriMv7pFWI'})
 
 // construct parameters
-const path = '/Users/tejitak/dev/temp/test1.jpg'
 const req = new vision.Request({
-  image: new vision.Image({path: path}),
-  features: [new vision.Feature({type: 'FACE_DETECTION'})]
+  image: new vision.Image('/Users/tejitak/temp/test1.jpg'),
+  features: [
+    new vision.Feature('FACE_DETECTION', 4),
+    new vision.Feature('LABEL_DETECTION', 10),
+  ]
 })
 
+// send single request
 vision.annotate(req).then((res) => {
-  console.log(JSON.stringify(res))
-}, (e) => {
+  // handling response
+  console.log(JSON.stringify(res.responses))
+}, (e) => { 
   console.log('Error: ', e)
 })

test_annotate_remote.js

@@ -0,0 +1,36 @@
+'use strict'
+const vision = require('./index')
+
+// init with auth
+vision.init({auth: 'AIzaSyDwWH4G8Nx2Z7WrdPvVRhqQqlriMv7pFWI'})
+
+// construct parameters
+// 1st image of request is load from local
+const req1 = new vision.Request({
+  image: new vision.Image({
+    path: '/Users/tejitak/temp/test1.jpg'
+  }),
+  features: [
+    new vision.Feature('FACE_DETECTION', 4),
+    new vision.Feature('LABEL_DETECTION', 10),
+  ]
+})
+
+// 2nd image of request is load from Web
+const req2 = new vision.Request({
+  image: new vision.Image({
+    url: 'https://scontent-nrt1-1.cdninstagram.com/hphotos-xap1/t51.2885-15/e35/12353236_1220803437936662_68557852_n.jpg'
+  }),
+  features: [
+    new vision.Feature('FACE_DETECTION', 1),
+    new vision.Feature('LABEL_DETECTION', 10),
+  ]
+})
+
+// send multi requests by one API call
+vision.annotate([req1, req2]).then((res) => {
+  // handling response for each request
+  console.log(JSON.stringify(res.responses))
+}, (e) => { 
+  console.log('Error: ', e)
+})