RubyGems - mirador - Versions diffs - 0.1.0 → 0.1.1 - Mend

mirador 0.1.0 → 0.1.1

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGZmMTU1ODJkZDdiZjM3MmQ1NzA1MjJkNjkxMjUxMzM1MmMyOTQ1Yg==
+    ZWEzZDk2NDYzYTdmMWVlZDVkMjQwNDliMDhkNDVjMjk1NzQ5ODAwZA==
   data.tar.gz: !binary |-
-    OWYyNjc4N2EzMWU1Mjc4YWUxMWJmOGU4NjNhMmFkZjRiZWUzYWYwMA==
+    ZjJhZjAzNWVjYWM5ODE0NWZiNDk3OTc4ZmZjMjA2MzFlNzdhMWIxNw==
 SHA512:
   metadata.gz: !binary |-
-    Mjk2MWU1MDM2ZmNiZDUyYTMwMTRlNzIyMTMyZWY5ZDg5ZDdmNGZhM2FhNDlk
-    MDk5MmQ4Nzg3MTI1MjE2ODM1MDY4MjU5YzEzNjAyZmRhYTEwYThmMjI2MTVj
-    Mjk1N2IxMGIyNzdhMmQxY2IyN2U3ZGQxZGQxOGRlZmI2ZDAyNDU=
+    OTk3ZmI2YjliNDU0NzJjNGU5M2JjMjQ3NTRhMzdlMTY3MDg4ODQ5NWQxMmJl
+    MzI0NGQ3NGNjNzgzZGI3NmJiNjY4MzUyYTM2NTVjYWIyZWRjZDJhMTg2YmVh
+    MTViNzhmNWViNzg1NWQ0NTkwMzJkNWUzYTAwMDZmYzMxMTBlOTE=
   data.tar.gz: !binary |-
-    Yzg0NDBiNTgwODg2MjRlMGVmZTUzNzQ1ZDQ1NTE0ZDhlZTE5MzYxMjhjNTQ0
-    MDVkNzFhZGIwNjU5NGQyMmY1MTBhN2RiZmM1MjU0MTJkYTYwNTNmY2EyZjE0
-    MmZkNGJmMmY0YzhkZTkwZjgzMjY4ZmFmNjdlNzYzMjdmNDBiNmU=
+    YTQ5OGViY2VjMTk4NWM5MDEwMjVkZGMzN2Y5MDBhNzkwNmYzNWEwZmY4YTVh
+    MjdlYTQxZmEzMzVjZTU3OWNjMDdlOTMyYzQ0ZDc4N2YxODhiMmQ5MDJlMTFk
+    OWEyNzZhZjljZTJjMWQ5NDE3MTNmOTUzMDQ0ZGE2ODAzYmJhNjI=

data/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# Mirador
+# Mirador [![Build Status](https://drone.io/github.com/mirador-cv/mirador-rb/status.png)](https://drone.io/github.com/mirador-cv/mirador-rb/latest)
 A simple Ruby client for the [mirador](http://mirador.im) Image moderation API.

data/bin/mirador-client CHANGED Viewed

@@ -33,14 +33,14 @@ end
 # mirador client
 client = Mirador::Client.new(api_key)
+out = Mirador::ResultList.new
-out = []
 if urls and urls.length > 0
-  out += client.classify_urls(urls)
+  out.update(client.classify_urls(urls).to_h)
 end
 if files and files.length > 0
-  out += client.classify_files(files)
+  out.update(client.classify_files(files).to_h)
 end

data/examples/sinatra-example.rb ADDED Viewed

@@ -0,0 +1,67 @@
+require 'sinatra'
+require 'mirador'
+mirador_client = Mirador::Client.new ENV['MIRADOR_API_KEY']
+post '/proxy/mirador/url' do
+  content_type :json
+  mirador_client.classify_url(request['url']).to_json
+end
+post '/proxy/mirador/datauri' do
+  content_type :json
+  mirador_client.classify_data_uri(request['id'] => request['data']).to_json
+end
+get '/' do
+  <<-eot
+<!doctype html>
+<style> #display.safe { border: 5px solid #0e0; } #display.unsafe { border: 5px solid #e00; }</style>
+<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+<input type='url' id='url'/>
+<input type='file' id='file'/>
+<img src='' width=400 id='display'/>
+<span id='res-safe'></span>
+<script>
+var $doc = $(document),
+    $display = $('#display'),
+    $safe = $('#res-safe');
+function onresult(res) {
+  var safetxt = res.safe ? 'safe' : 'unsafe';
+  $safe.text(safetxt + ': ' + res.value.toString().substr(0, 4));
+  $display.attr('class', safetxt);
+}
+$doc.on('change', '#url', function (e) {
+  $.post('/proxy/mirador/url', { url: this.value }).done(onresult);
+  $display.attr('src', this.value);
+});
+$doc.on('change', '#file', function (e) {
+  var file = this.files[0];
+  if (!file) return;
+  var reader = new FileReader();
+  reader.onload = function (e) {
+    $display.attr('src', e.target.result);
+    $.post(
+      '/proxy/mirador/datauri',
+      { id: file.name, data: e.target.result }
+    ).done(onresult);
+  };
+  reader.readAsDataURL(file);
+});
+</script>
+eot
+end

data/lib/mirador/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Mirador
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mirador.rb CHANGED Viewed

@@ -126,28 +126,66 @@ module Mirador
     include HTTParty
     base_uri 'api.mirador.im'
-    default_timeout 10
+    default_timeout 20
-    MAX_LEN = 5
+    MAX_LEN = 4
     MAX_ID_LEN = 256
     DATA_URI_PRE = ';base64,'
     DATA_URI_PRELEN = 8
     def initialize(api_key)
       @options = { api_key: api_key }
+      if block_given?
+        @parser = Proc.new
+      else
+        @parser = nil
+      end
     end
     # metaprogramming extreme
     [:url, :file, :buffer, :encoded_string, :data_uri].each do |datatype|
-      define_method("classify_#{datatype.to_s}s") do |args, params={}|
-        flexible_request args, params do |item|
+      define_method("classify_#{datatype.to_s}s") do |args, params={}, &block|
+        if block != nil
+          old_parser = @parser
+          @parser = block
+        end
+        res = flexible_request args, params do |item|
           fmt_items(datatype, item)
         end
+        if block != nil
+          @parser = old_parser
+        end
+        res
       end
-      define_method("classify_#{datatype.to_s}") do |args, params={}|
+      define_method("classify_#{datatype.to_s}") do |args, params={}, &block|
+        if block != nil
+          old_parser = @parser
+          @parser = block
+        end
         res = self.send("classify_#{datatype.to_s}s", args, params)
-        res[0]
+        if @parser
+          out = if res != nil then res.values()[0] else nil end
+        else
+          out = if res != nil then res[0] else nil end
+        end
+        if block != nil
+          @parser = old_parser
+        end
+        out
       end
     end
@@ -238,7 +276,13 @@ module Mirador
     # call the block X number of times
     # where X is request.length / MAX_LEN
     def chunked_request req, &mthd
-      output = ResultList.new
+      if @parser != nil
+        output = {}
+      else
+        output = ResultList.new
+      end
       req.each_slice(MAX_LEN).each do |slice|
         output.update(mthd.call(slice))
       end
@@ -339,7 +383,12 @@ module Mirador
         raise ApiError, "no response: #{ res.code }"
       end
-      return ResultList.parse_results res[k]
+      if @parser != nil
+        return @parser.call(res[k])
+      else
+        return ResultList.parse_results res[k]
+      end
     end
   end

data/test/test_mirador.rb CHANGED Viewed

@@ -159,6 +159,41 @@ class MiradorTest < Test::Unit::TestCase
   end
+  def test_switch_parser
+    res = MM.classify_url 'http://static.mirador.im/test/nsfw.jpg' do |results|
+      r = Hash[results.map do |x|
+        [x['id'], x['result']]
+      end]
+      r
+    end
+    assert res.is_a?(Hash)
+    res_norm = MM.classify_url 'http://static.mirador.im/test/sfw.jpg'
+    assert (not res_norm.is_a?(Hash))
+  end
+  def test_multiple_custom_parse
+    res = MM.classify_urls('http://static.mirador.im/test/nsfw.jpg', 'http://static.mirador.im/test/sfw.jpg') do |results|
+      r = Hash[results.map do |x|
+        [x['id'], x['result']]
+      end]
+      r
+    end
+    assert res.is_a?(Hash)
+    assert res.has_key?('http://static.mirador.im/test/nsfw.jpg')
+  end
   def test_item_error
     res = MM.classify_urls([{ id: :nsfw, data: 'invalid-url'}, { id: :sfw, data: SFW_URL }])
@@ -170,4 +205,33 @@ class MiradorTest < Test::Unit::TestCase
   end
+  def test_custom_parser
+    mc = Mirador::Client.new ENV['MIRADOR_API_KEY'] do |results|
+      res = Hash[results.map do |x|
+        r = x['result']
+        [x['id'], {
+          id: x['id'],
+          breast: r['breast4'],
+          penis: r['penis4'],
+          vagina: r['vagina4'],
+          butt: r['butt4'],
+        }]
+      end]
+      res
+    end
+    res = mc.classify_url 'http://static.mirador.im/test/nsfw.jpg'
+    assert res.is_a?(Hash)
+    assert res[:breast]
+    assert res[:penis]
+  end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mirador
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -44,6 +44,7 @@ files:
 - README.md
 - Rakefile
 - bin/mirador-client
+- examples/sinatra-example.rb
 - lib/mirador.rb
 - lib/mirador/version.rb
 - mirador.gemspec