mirador 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGFjNTRlZWI2MjFkYjI0YTk2MWFjYjNlMTM5ZmMzMmMxM2RmMjJmMg==
+    MjUwNGI0MWY1NGIxYzZlYmVjNzQyZGFhN2E0ZmQ4NTQxOGQyZmZlNw==
   data.tar.gz: !binary |-
-    NmM2YTU2ZTM1ZmZkNTc4OThlNTM1MzU1OGQzOWI1OGE2MzZhMThhZg==
+    ZDkyNmUyMmM4MDUxOWZjYTJmMjhkMWVlMGY5Yjk1NWNhNDc3MjBmOQ==
 SHA512:
   metadata.gz: !binary |-
-    OTM5OTE3YjdhMjc2ZGIyY2YxNzVkOGRjODA1Mzc0Y2M0OGEzYzNjZWRlNGUw
-    NzkxMWZhMjk0MzQ0ZWU0NGE5NmQxZGZkMWQ1NTE5NDZjMjY2ZGU3NjY2NTZm
-    YzA4ZDk5OWIzODU1Mzk4OTQ5ODYwMTUwOGNkMGEyOTQxYzRkMGE=
+    Yzg1OThhODBlN2VlODQyNDY0NDczNDUxYWEwNDJmMjA5YzdhZDllOTZiNjYx
+    MTNiMTAyNWRhYjkwZTAzYzA3NzZlYTYwNGRjMmYyZTE5ZGI5ODUyNmZjMTNh
+    Mjg1NzU2Yzk1MWUxNWY5YTkyZTk2MWU1YWI5YmJiYTQxOTllZmY=
   data.tar.gz: !binary |-
-    YmNkZDU1YzkyNzQwOWQwZjNlNTQzMTQ5MzhhMjdjZDE0YjI5OGQxMmZiNzRk
-    NjhhYTAzOWRkYzQ4ZjVjYTQzYTUxM2YwODE0ZDI3ODZlM2JjYzYwYmI5MzNk
-    ZmI4Y2Y0N2IwZGY3ZmNlN2Y1MGU5ZDIzMTI3ZjQzNTc5ZjRkYTg=
+    ZGIwNWU1NTA1YTUxMTAxOWJiYWU1NjY4NzM5NjU4M2Q5ZGY4YjZjM2EyNWNk
+    YzRiNDdjYjI5YTRhNzFkMjlhY2I4YjUwZjkyMGU0NjVkYjI4NmEzMjRmMWZl
+    ZTEwYTZjN2IyMDAzMTE1Y2FkZDI4MDI5Mzg4ZjY5NWMyMGUwY2U=

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/lib/mirador.rb

@@ -37,6 +37,9 @@ module Mirador
   class Client
     include HTTParty
     base_uri 'api.mirador.im'
+    default_timeout 10
+
+    MAX_LEN = 8
 
     def initialize(api_key)
       @options = { api_key: api_key }
@@ -44,10 +47,20 @@ module Mirador
 
     def classify_urls urls
 
-      res = self.class.get(
+      if urls.length > MAX_LEN
+        out = []
+        urls.each_slice(MAX_LEN) do |s|
+          out << self.classify_urls(s)
+        end
+
+        return out.flatten
+      end
+
+      res = self.class.post(
         "/v1/classify",
         {
-          query: @options.merge({url: urls})
+          body: @options.merge({url: urls}),
+          headers: {"User-Agent" => "Mirador Client v1.0/Ruby"}
         }
       )
 
@@ -61,24 +74,51 @@ module Mirador
     end
 
     def classify_files files
+      if files.length > MAX_LEN
+        out = []
+        files.each_slice(MAX_LEN) do |s|
+          out << self.classify_files(s)
+        end
+
+        return out.flatten
+      end
+
       processed = files.map do |f| self.process_file(f) end
-      return self.classify_encoded processed
+      return self.classify_encoded files, processed
     end
 
 
     def classify_raw_images imgs
-      processed = imgs.map { |i| Base64.encode(i).gsub("\n", '') }
-      return self.classify_encoded processed
+
+      if imgs.length > MAX_LEN
+        out = []
+        imgs.each_slice(MAX_LEN) do |s|
+          out << self.classify_raw_images(Hash[s])
+        end
+
+        return out.flatten
+      end
+
+      # expects a hash
+      # id => image
+      images, names = [], []
+      imgs.each_pair do |k, v|
+        images << v
+        names << k
+      end
+
+      processed = images.map { |i| Base64.encode64(i).gsub("\n", '') }
+      return self.classify_encoded names, processed
     end
 
-    private
+    protected
 
     def process_file file
       data = File.read(file)
       Base64.encode64(data).gsub("\n", '')
     end
 
-    def classify_encoded encoded
+    def classify_encoded files, encoded
       res = self.class.post(
         "/v1/classify",
         {

data/lib/mirador/version.rb

@@ -1,3 +1,3 @@
 module Mirador
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mirador.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["nick@mirador.im"]
   gem.description   = %q{Interface to the Mirador Image Moderation API}
   gem.summary       = %q{Simple interface to mirador API }
-  gem.homepage      = "http://github.com/mirador-cv/mirador-rb"
+  gem.homepage      = "http://mirador-cv.github.io/mirador-rb"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)

data/test/test_mirador.rb

@@ -0,0 +1,118 @@
+require 'test/unit'
+require 'mirador'
+
+class MiradorTest < Test::Unit::TestCase
+
+  dirname = File.dirname(__FILE__)
+
+  NSFW_IM = File.join(dirname, 'images/nsfw.jpg')
+  SFW_IM = File.join(dirname, 'images/sfw.jpg')
+
+  SFW_URL = "http://demo.mirador.im/test/sfw.jpg"
+  NSFW_URL = "http://demo.mirador.im/test/nsfw.jpg"
+
+  MM = Mirador::Client.new('')
+
+  def test_classify_files
+
+    res = MM.classify_files([NSFW_IM, SFW_IM])
+
+    assert_equal res.length, 2
+
+    nsfw, sfw = res
+
+    assert_operator nsfw.value, :>=, 0.50
+    assert_operator sfw.value, :<, 0.50
+
+    assert nsfw.name.eql?(NSFW_IM), "nsfw name does not match"
+    assert sfw.name.eql?(SFW_IM), "sfw name does not match"
+
+    assert sfw.safe
+    assert (not nsfw.safe)
+
+  end
+
+  def test_chunked_files
+    nsfw_files = [NSFW_IM]*10
+    sfw_files = [SFW_IM]*10
+
+    nres = MM.classify_files(nsfw_files)
+    assert_equal nres.length, 10
+
+    nres.each do |r|
+      assert_operator r.value, :>=, 0.50
+      assert r.name.eql?(NSFW_IM)
+      assert (not r.safe)
+    end
+
+    sres = MM.classify_files(sfw_files)
+    assert_equal sres.length, 10
+
+    sres.each do |r|
+      assert_operator r.value, :<, 0.50
+      assert r.name.eql?(SFW_IM)
+      assert r.safe
+    end
+  end
+
+  def test_chunked_urls
+    nsfw_urls = [NSFW_URL]*10
+    sfw_urls = [SFW_URL]*10
+
+    nres = MM.classify_urls(nsfw_urls)
+    assert_equal nres.length, 10
+
+    nres.each do |r|
+      assert_not_nil r
+      assert_operator r.value, :>=, 0.50
+      assert r.name.eql?(NSFW_URL)
+      assert (not r.safe)
+    end
+
+    sres = MM.classify_urls(sfw_urls)
+    assert_equal sres.length, 10
+
+    sres.each do |r|
+      assert_not_nil r
+      assert_not_nil r.value
+      assert_operator r.value, :<, 0.50
+      assert r.name.eql?(SFW_URL)
+      assert r.safe
+    end
+
+  end
+
+  def test_classify_urls
+    res = MM.classify_urls([NSFW_URL, SFW_URL])
+
+    assert_equal res.length, 2
+    nsfw, sfw = res
+
+    assert nsfw.name.eql?(NSFW_URL)
+    assert sfw.name.eql?(SFW_URL)
+
+    assert_operator nsfw.value, :>=, 0.50
+    assert_operator sfw.value, :<, 0.50
+
+    assert sfw.safe
+    assert (not nsfw.safe)
+  end
+
+  def test_classify_raw
+    nsfw_d, sfw_d = [NSFW_IM, SFW_IM].map { |f| File.read(f) }
+    res = MM.classify_raw_images({ "nsfw" => nsfw_d, "sfw" => sfw_d })
+
+    assert_equal res.length, 2
+    nsfw, sfw = res
+
+    assert nsfw.name.eql?('nsfw'), "invalid name: #{ nsfw.name }"
+    assert sfw.name.eql?('sfw')
+
+    assert_operator nsfw.value, :>=, 0.50
+    assert_operator sfw.value, :<, 0.50
+
+    assert sfw.safe
+    assert (not nsfw.safe)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mirador
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -47,7 +47,10 @@ files:
 - lib/mirador.rb
 - lib/mirador/version.rb
 - mirador.gemspec
-homepage: http://github.com/mirador-cv/mirador-rb
+- test/images/nsfw.jpg
+- test/images/sfw.jpg
+- test/test_mirador.rb
+homepage: http://mirador-cv.github.io/mirador-rb
 licenses:
 - MIT
 metadata: {}
@@ -71,5 +74,8 @@ rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Simple interface to mirador API
-test_files: []
+test_files:
+- test/images/nsfw.jpg
+- test/images/sfw.jpg
+- test/test_mirador.rb
 has_rdoc: