nsi-lapesi 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/nsi-lapesi/fake_server.rb

@@ -2,14 +2,27 @@ require "xmlrpc/server"
 
 module NSILapesi
   class FakeServer
-    def addImage(contract, image)
-      100
+    class FakeIndexer
+      def addImage(contract, image)
+        100 #success
+      end
+
+      def delImage(id)
+        100 #success
+      end
+    end
+
+    class FakeSearcher
+      def searchImage(image, limit)
+        '<results items="1" code="100"> <item id="1223" score="1.0" duplicated="false" /> </results>'
+      end
     end
 
     def self.start
       @thread = Thread.new do
         server = XMLRPC::Server.new(8080)
-        server.add_handler("ImageIndexer", NSILapesi::FakeServer.new)
+        server.add_handler("ImageIndexer", NSILapesi::FakeServer::FakeIndexer.new)
+        server.add_handler("ImageSearcher", NSILapesi::FakeServer::FakeSearcher.new)
         server.serve
       end
     end

data/lib/nsi-lapesi/indexer.rb

@@ -1,5 +1,6 @@
 require 'builder'
 require 'xmlrpc/client'
+require 'base64'
 
 require File.dirname(__FILE__) + '/configuration'
 require File.dirname(__FILE__) + '/errors'
@@ -24,10 +25,11 @@ module NSILapesi
       raise Errors::ImageFormatNotSupported if not MIMETYPES.include? params[:format]
 
       begin
-        image_content = (image.class == String)? image : image.read
+        image_content = (image.class == String)? Base64.decode64(image) : image.read
         status_code = @server.call("ImageIndexer.addImage", XMLRPC::Base64.new(contract),
                                    XMLRPC::Base64.new(image_content))
-      rescue Exception
+      rescue Exception => e
+        puts e.message
         status_code = 111
       end
     end
@@ -35,7 +37,8 @@ module NSILapesi
     def del_image(id)
       begin
         status_code = @server.call("ImageIndexer.delImage", id)
-      rescue Exception
+      rescue Exception => e
+        puts e.message
         status_code = 111
       end
     end

data/lib/nsi-lapesi/searcher.rb

@@ -1,4 +1,5 @@
 require 'xmlsimple'
+require 'base64'
 
 require File.dirname(__FILE__) + '/configuration'
 require File.dirname(__FILE__) + '/errors'
@@ -11,16 +12,12 @@ module NSILapesi
     end
 
     def search_image(image, limit = 5)
-      image_content = image.read
+      image_content = (image.class == String)? Base64.decode64(image) : image.read
 
       results_xml = @server.call("ImageSearcher.searchImage", XMLRPC::Base64.new(image_content), limit)
       results = XmlSimple.xml_in results_xml
 
-      if results['code'] == '100'
-        results['item']
-      else
-        []
-      end
+      (results['code'] == '100')? results['item'] : []
     end
   end
 end

data/nsi-lapesi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsi-lapesi"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pedro Henrique Linhares"]
-  s.date = "2012-10-19"
+  s.date = "2012-10-29"
   s.description = "Gem de acesso ao servico Lapesi"
   s.email = "pedrolmota@gmail.com"
   s.extra_rdoc_files = [
@@ -35,12 +35,13 @@ Gem::Specification.new do |s|
     "spec/configuration_spec.rb",
     "spec/indexer_spec.rb",
     "spec/resources/debian.jpg",
+    "spec/searcher_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/pedrolinhares/nsi-lapesi"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.15"
   s.summary = "Gem de acesso ao servico Lapesi"
 
   if s.respond_to? :specification_version then

data/spec/indexer_spec.rb

@@ -26,6 +26,13 @@ describe "NsiLapesi::Indexer" do
     code.should == 100
   end
 
+  it 'can remove an image from lapesi' do
+    img  = File.open('spec/resources/debian.jpg').read
+    @indexer.add_image image: img, id: '2'
+    code = @indexer.del_image '2'
+    code.should == 100
+  end
+
   it 'should create xml contract' do
     hoje = Time.now.strftime("%d/%m/%Y")
     expected_contract = %[<?xml version="1.0" encoding="iso-8859-1"?>\n<document>\n  <id>1</id>\n  <author>Foo</author>\n  <title>BarFoo</title>\n  <publication-date>#{hoje}</publication-date>\n  <format>jpg</format>\n  <type>Artigo</type>\n  <keywords>teste</keywords>\n</document>\n]

data/spec/searcher_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "NSILapesi::Searcher" do
+  before(:each) do
+    NSILapesi::Configuration.configure do |conf|
+      conf.host 'localhost'
+      conf.port 8080
+      conf.path '/'
+    end
+
+    @searcher = NSILapesi::Searcher.new
+    NSILapesi::FakeServer.start
+    sleep(1)
+  end
+
+  after(:all) do
+    NSILapesi::FakeServer.stop
+  end
+
+  it 'searchs for a image' do
+    img = File.open('spec/resources/debian.jpg')
+    results = @searcher.search_image img, 5
+    results.should == [{"id" => "1223", "score" => "1.0", "duplicated" => "false" }]
+  end
+
+  it 'also searches for a base64 image' do
+    img = File.open('spec/resources/debian.jpg')
+    img_base64 = Base64.encode64(img.read)
+    results = @searcher.search_image img_base64, 5
+    results.should == [{"id" => "1223", "score" => "1.0", "duplicated" => "false" }]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsi-lapesi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78763800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78763800
 - !ruby/object:Gem::Dependency
   name: libxml-xmlrpc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78763280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78763280
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78762810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78762810
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78762250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *78762250
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78761890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *78761890
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78761610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+  version_requirements: *78761610
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78761100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *78761100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78760820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78760820
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78760390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78760390
 description: Gem de acesso ao servico Lapesi
 email: pedrolmota@gmail.com
 executables: []
@@ -181,6 +136,7 @@ files:
 - spec/configuration_spec.rb
 - spec/indexer_spec.rb
 - spec/resources/debian.jpg
+- spec/searcher_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/pedrolinhares/nsi-lapesi
 licenses:
@@ -197,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1326426549261268832
+      hash: 1065858545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Gem de acesso ao servico Lapesi