Merge branch 'dev'

Author: agrandiere

README.MD

@@ -33,14 +33,14 @@ Several moderation engines are available for you to choose from (nudity detectio
 
 ```javascript
 // Detect nudity in an image
-sightengine.check(['nudity']).image('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg').then(function(result) {
+sightengine.check(['nudity']).set_url('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg').then(function(result) {
   // The result of the API
 }).catch(function(err) {
   // Error
 });
 
 // Detect nudity, weapons, alcohol, drugs and faces in an image, along with image properties and type
-sightengine.check(['nudity', 'type', 'properties','wad','face']).image('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg').then(function(result) {
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_url('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg').then(function(result) {
   // The result of the API
 }).catch(function(err) {
   // Error
@@ -50,14 +50,31 @@ sightengine.check(['nudity', 'type', 'properties','wad','face']).image('http://i
 ## Moderate a local image:
 ```javascript
 // Detect nudity in an image
-sightengine.check(['nudity']).image('/full/path/to/image.jpg').then(function(result) {
+sightengine.check(['nudity']).set_file('/full/path/to/image.jpg').then(function(result) {
   // The result of the API
 }).catch(function(err) {
   // Error
 });
 
 // Detect nudity, weapons, alcohol, drugs and faces in an image, along with image properties and type
-sightengine.check(['nudity', 'type', 'properties','wad','face']).image('/full/path/to/image.jpg').then(function(result) {
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_file('/full/path/to/image.jpg').then(function(result) {
+  // The result of the API
+}).catch(function(err) {
+  // Error
+});
+```
+
+## Moderate a binary image:
+```javascript
+// Detect nudity in an image
+sightengine.check(['nudity']).set_bytes(binary_image).then(function(result) {
+  // The result of the API
+}).catch(function(err) {
+  // Error
+});
+
+// Detect nudity, weapons, alcohol, drugs and faces in an image, along with image properties and type
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_bytes(binary_image).then(function(result) {
   // The result of the API
 }).catch(function(err) {
   // Error

example.js

@@ -10,12 +10,26 @@ sightengine.feedback('nudity', 'safe', 'https://sightengine.com/assets/img/examp
 
 // moderation image
 
-sightengine.check(['nudity', 'type', 'properties','wad','face']).image('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_url('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
   console.log(result)
 }).catch(function(error) {
   console.log(error)
 });
 
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_file('/assets/image.jpg').then(function(result) {
+  console.log(result)
+}).catch(function(error) {
+  console.log(error)
+});
+
+
+sightengine.check(['nudity', 'type', 'properties','wad','face']).set_bytes(imageBinary).then(function(result) {
+  console.log(result)
+}).catch(function(error) {
+  console.log(error)
+});
+
+
 // moderation video
 
 sightengine.check(['nudity', 'type', 'properties','wad','face']).video('http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', 'http://requestb.in/1d097l71').then(function(result) {

sightengine.js

@@ -15,32 +15,48 @@ function makeClient(api_user, api_secret) {
     return client;
   };
 
-  client.image = (image) => {
+  client.set_url = (imageUrl) => {
+    const data = { 'models': _models.join(), 'url': imageUrl, 'api_user': apiUser, 'api_secret': apiSecret };
+    const querystring = encodeQueryData(data);
     var url = endpoint + '1.0/check.json';
 
-    if (image.indexOf("http://") == 0 || image.indexOf("https://") == 0) {
-      const data = { 'models': _models.join(), 'url': image, 'api_user': apiUser, 'api_secret': apiSecret };
-      const querystring = encodeQueryData(data);
+    return fetch(url + '?' + querystring, { headers: { 'user-agent': 'SE-SDK-NODEJS' + version} }).then((res) => {
+      return res.json();
+    }).catch((error) => {
+      return error.json();
+    });
+  };
 
-      return fetch(url + '?' + querystring, { headers: { 'user-agent': 'SE-SDK-NODEJS' + version} }).then((res) => {
-        return res.json();
-      }).catch((error) => {
-        return error.json();
-      });
-    } else {
-      var form = new FormData();
+  client.set_file = (file) => {
+    var form = new FormData();
+    var url = endpoint + '1.0/check.json';
 
-      form.append('api_user', apiUser);
-      form.append('api_secret', apiSecret);
-      form.append('models', _models.join());
-      form.append('media', fs.createReadStream(image));
+    form.append('api_user', apiUser);
+    form.append('api_secret', apiSecret);
+    form.append('models', _models.join());
+    form.append('media', fs.createReadStream(file));
 
-      return fetch(url, { method: 'POST', body: form, headers: { 'user-agent': 'SE-SDK-NODEJS' + version}}).then(function(res) {
-        return res.json();
-      }).catch((error) => {
-        return error.json();
-      });
-    }
+    return fetch(url, { method: 'POST', body: form, headers: { 'user-agent': 'SE-SDK-NODEJS' + version}}).then(function(res) {
+      return res.json();
+    }).catch((error) => {
+      return error.json();
+    });
+  };
+
+  client.set_bytes = (binaryImage) => {
+    const form = new FormData();
+    var url = endpoint + '1.0/check.json';
+
+    form.append('api_user', apiUser);
+    form.append('api_secret', apiSecret);
+    form.append('models', _models.join());
+    form.append('media', binaryImage);
+
+    return fetch(url, { method: 'POST', body: form, headers: { 'user-agent': 'SE-SDK-NODEJS' + version}}).then(function(res) {
+      return res.json();
+    }).catch((error) => {
+      return error.json();
+    });
   };
 
   client.video = (video, callback) => {

tests.js

@@ -1,5 +1,6 @@
 var sightengine = require('./sightengine')('1234','test');
 var assert = require('assert');
+var fs = require('fs');
 
 describe('test feedback', function() {
   it('should return success', function() {
@@ -18,31 +19,47 @@ describe('test feedback', function() {
 
 describe('test image moderation', function() {
   it('should return success', function() {
-    sightengine.check(['nudity', 'type', 'properties','wad','face', 'celebrities']).image('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
+    sightengine.check(['nudity', 'type', 'properties','wad','face', 'celebrities']).set_url('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
       assert.equal('success', result.status);
     })
   });
 
   it('should return success', function() {
-    sightengine.check(['nudity']).image('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
+    sightengine.check(['nudity']).set_url('https://sightengine.com/assets/img/examples/example5.jpg').then(function(result) {
       assert.equal('success', result.status);
     })
   });
 
   it('should return success', function() {
-    sightengine.check(['nudity', 'type', 'properties','wad','face', 'celebrities']).image('/assets/image.jpg').then(function(result) {
+    sightengine.check(['nudity', 'type', 'properties','wad','face', 'celebrities']).set_file('/assets/image.jpg').then(function(result) {
       assert.equal('success', result.status);
     })
   });
 
   it('should return success', function() {
-    sightengine.check(['nudity']).image('/assets/image.jpg').then(function(result) {
+    sightengine.check(['nudity']).set_file('/assets/image.jpg').then(function(result) {
+      assert.equal('success', result.status);
+    })
+  });
+
+  it('should return success', function() {
+    var binaryImage = fs.createReadStream('/assets/image.jpg');
+
+    sightengine.check(['nudity']).set_bytes(binaryImage).then(function(result) {
+      assert.equal('success', result.status);
+    })
+  });
+
+  it('should return success', function() {
+    var binaryImage = fs.createReadStream('/assets/image.jpg');
+
+    sightengine.check(['nudity', 'type', 'properties','wad','face', 'celebrities']).set_bytes(binaryImage).then(function(result) {
       assert.equal('success', result.status);
     })
   });
 
   it('should return error', function() {
-    sightengine.check(['nudity', 'type', 'properties','wad','face']).image('https://sightengine.com/assets/img/examples/example99999.jpg').then(function(result) {
+    sightengine.check(['nudity', 'type', 'properties','wad','face']).set_url('https://sightengine.com/assets/img/examples/example99999.jpg').then(function(result) {
       assert.equal('failure', result.status);
       assert.equal('media_error', result.error.type);
     })