rocrad 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rocrad/binary.rb

@@ -0,0 +1,20 @@
+class Rocrad
+  class Binary < Rocrad
+
+    def initialize(src="", filename="")
+      @filename=filename
+      super(src)
+    end
+
+    private
+
+    def build_source(src)
+      src_path = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@filename}")
+      src_file = File.new(src_path.to_s, File::CREAT|File::TRUNC|File::RDWR, 0644)
+      src_file.write(src)
+      src_file.close
+      Pathname.new(src_path)
+    end
+
+  end
+end

data/lib/rocrad/errors.rb

@@ -1,10 +1,6 @@
 class Rocrad
-  class ConversionError < StandardError;
-  end
   class ImageNotSelectedError < StandardError;
   end
-  class TempFilesNotRemovedError < StandardError;
-  end
   class UnsupportedFileTypeError < StandardError;
   end
 end

data/lib/rocrad/mixed.rb

@@ -24,15 +24,14 @@ class Rocrad
     private
 
     #Convert parts of image to string
-    def convert
+    def ocr!
       @txt = ""
       @areas.each do |area|
         image = Rocrad.new(@src.to_s)
         image.crop!(area[:x].to_i, area[:y].to_i, area[:w].to_i, area[:h].to_i)
         @txt << image.to_s
       end
-    rescue
-      raise Rocrad::ConversionError
+      @txt
     end
 
   end

data/lib/rocrad.rb

@@ -6,6 +6,7 @@ require "RMagick"
 
 require "rocrad/errors"
 require "rocrad/mixed"
+require "rocrad/binary"
 
 class Rocrad
 
@@ -14,33 +15,31 @@ class Rocrad
 
   def initialize(src="")
     @uid = UUID.new
-    @src = get_source src
+    @src = build_source src
     @txt = ""
     @tmp = nil
   end
 
   def src=(value="")
     @txt = ""
-    @src = get_source value
+    @src = build_source value
   end
 
-  #Output value
-  def to_s
-    return @txt if @txt != ""
+  def ocr!
     if @src.instance_of? Pathname and @src.file?
-      convert
+      ocr_via_path
       @txt
     elsif @src.instance_of? URI::HTTP
-      convert_via_http
+      ocr_via_http
       @txt
     else
       raise ImageNotSelectedError
     end
   end
 
-  #Remove spaces and break-lines
-  def to_s_without_spaces
-    to_s.gsub(" ", "").gsub("\n", "").gsub("\r", "")
+  #Output value
+  def to_s
+    @txt != "" ? @txt : ocr!
   end
 
 #Crop image to convert
@@ -55,23 +54,24 @@ class Rocrad
 
   private
 
+  #Linux console clear
   def cco
-    "2>/dev/null" if File.exist?("/dev/null") #Linux console clear
+    File.exist?("/dev/null") ? "2>/dev/null" : ""
   end
 
-  def convert_via_http
+  def ocr_via_http
     tmp_path = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{Pathname.new(@src.request_uri).basename}")
     tmp_file = File.new(tmp_path.to_s, File::CREAT|File::TRUNC|File::RDWR, 0644)
     tmp_file.write(Net::HTTP.get(@src))
     tmp_file.close
     uri  = @src
     @src = tmp_path
-    convert
+    ocr_via_path
     @src = uri
     remove_file([tmp_path])
   end
 
-  def get_source(src)
+  def build_source(src)
     case (uri = URI.parse(src)).class.to_s
       when "URI::HTTP" then
         uri
@@ -91,9 +91,6 @@ class Rocrad
         system "rm -f #{file} #{cco}"
       end
     end
-    true
-  rescue
-    raise TempFilesNotRemovedError
   end
 
   #Convert image to pnm
@@ -116,18 +113,14 @@ class Rocrad
   end
 
   #Convert image to string
-  def convert
+  def ocr_via_path
     src = @tmp ? @tmp : @src
     txt = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{src.sub(src.extname, ".txt").basename}")
     pnm = image_to_pnm
-    begin
-      `ocrad #{pnm} -l -F utf8 -o #{txt} #{cco}`
-      @txt = File.read(txt)
-      @tmp ? remove_file([pnm, txt, @tmp]) : remove_file([pnm, txt])
-      @tmp = nil
-    rescue
-      raise ConversionError
-    end
+    `ocrad #{pnm} -l -F utf8 -o #{txt} #{cco}`
+    @txt = File.read(txt)
+    @tmp ? remove_file([pnm, txt, @tmp]) : remove_file([pnm, txt])
+    @tmp = nil
   end
 
 end

data/rocrad.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rocrad}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ludwig Bratke"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/rocrad.rb",
+    "lib/rocrad/binary.rb",
     "lib/rocrad/errors.rb",
     "lib/rocrad/mixed.rb",
     "rocrad.gemspec",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "test/images/test.png",
     "test/images/test.tif",
     "test/images/test1.tif",
+    "test/test_binary.rb",
     "test/test_mixed.rb",
     "test/test_rocrad.rb"
   ]

data/test/test_binary.rb

@@ -0,0 +1,21 @@
+begin
+  require "helper"
+rescue LoadError
+  require File.dirname(__FILE__) + '/helper'
+end
+
+class TestBinary < Test::Unit::TestCase
+
+  def setup
+    @path  = Pathname.new(__FILE__.gsub("test_binary.rb", "")).expand_path
+    @jpg   = @path.join("images", "test.jpg").to_s
+    f      = File.open(@jpg.to_s, "r")
+    @chars = f.chars.to_a
+    f.close
+    @txt_jpg = ["3", "R", "8", "Z".downcase].*""
+  end
+
+  def test_binary
+    assert_equal @txt_jpg, Rocrad::Binary.new(@chars, "foo.jpg").to_s.gsub(/[ \n\r]/,"")
+  end
+end

data/test/test_mixed.rb

@@ -1,5 +1,8 @@
-require 'helper'
-require 'pathname'
+begin
+  require "helper"
+rescue LoadError
+  require File.dirname(__FILE__) + '/helper'
+end
 
 class TestMixed < Test::Unit::TestCase
 
@@ -21,7 +24,7 @@ class TestMixed < Test::Unit::TestCase
       image.add_area(218, 22, 24, 28) # position of z
       image.add_area(248, 24, 22, 22) # position of z
     end
-    assert_equal @txt_tif, mix_block.to_s_without_spaces
+    assert_equal @txt_tif, mix_block.to_s.gsub(/[ \n\r]/, "")
 
     mix_block = Rocrad::Mixed.new(@tif, {:areas => [
         {:x => 28, :y=>19, :w=>25, :h=>25}, #position of 4
@@ -29,7 +32,7 @@ class TestMixed < Test::Unit::TestCase
         {:x => 218, :y=>22, :w=>24, :h=>28}, # position of z
         {:x => 248, :y=>24, :w=>22, :h=>22} # position of z
     ]})
-    assert_equal @txt_tif, mix_block.to_s_without_spaces
+    assert_equal @txt_tif, mix_block.to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_show_areas
@@ -76,15 +79,15 @@ class TestMixed < Test::Unit::TestCase
                        {:x=>218, :h=>28, :w=>24, :y=>22},
                        {:x=>248, :h=>22, :w=>22, :y=>24}]
     assert_equal(areas, mix_block.areas)
-    assert_equal @txt_tif[1..3], mix_block.to_s_without_spaces
+    assert_equal @txt_tif[1..3], mix_block.to_s.gsub(/[ \n\r]/, "")
 
     mix_block.areas = []
     assert_equal([], mix_block.areas)
-    assert_equal "", mix_block.to_s_without_spaces
+    assert_equal "", mix_block.to_s.gsub(/[ \n\r]/, "")
 
     mix_block.areas = nil
-    #assert_equal([], mix_block.areas)
-    assert_equal "", mix_block.to_s_without_spaces
+    assert_equal([], mix_block.areas)
+    assert_equal "", mix_block.to_s.gsub(/[ \n\r]/, "")
   end
 
 end

data/test/test_rocrad.rb

@@ -12,20 +12,20 @@ class TestRocrad < Test::Unit::TestCase
     f      = File.open(@jpg.to_s, "r")
     @chars = f.chars.to_a
     f.close
-    @txt_jpg = ["3", "R", "8", "Z".downcase].to_s
+    @txt_jpg = ["3", "R", "8", "Z".downcase].*""
     @txt_tif = "43ZZ".downcase
-    @txt_png = ["H", "W", "9", "W".downcase].to_s
-    @txt_bmp = ["Z".downcase, "L", "A", "6"].to_s
+    @txt_png = ["H", "W", "9", "W".downcase].*""
+    @txt_bmp = ["Z".downcase, "L", "A", "6"].*""
   end
 
   def test_convert_via_http
     Net::HTTP.expects(:get).returns(@chars)
-    assert_equal @txt_jpg, Rocrad.new("http://localhost:3000/uploads/picture/data/4dd21bfd828bf81bdd00000d/nzp_img_17_4_2011_8_55_29.jpg").to_s_without_spaces
+    assert_equal @txt_jpg, Rocrad.new("http://localhost:3000/uploads/picture/data/4dd21bfd828bf81bdd00000d/nzp_img_17_4_2011_8_55_29.jpg").to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_convert_via_http_raise_exception
     assert_raise Errno::ECONNREFUSED do
-      Rocrad.new("http://localhost:3000/uploads/picture/data/4dd21bfd828bf81bdd00000d/nzp_img_17_4_2011_8_55_29.jpg").to_s_without_spaces
+      Rocrad.new("http://localhost:3000/uploads/picture/data/4dd21bfd828bf81bdd00000d/nzp_img_17_4_2011_8_55_29.jpg").to_s.gsub(/[ \n\r]/, "")
     end
   end
 
@@ -36,40 +36,40 @@ class TestRocrad < Test::Unit::TestCase
   end
 
   def test_translate_image_to_text
-    assert_equal @txt_jpg, Rocrad.new(@jpg).to_s_without_spaces
-    assert_equal @txt_tif, Rocrad.new(@path.join("images", "test.tif").to_s).to_s_without_spaces
+    assert_equal @txt_jpg, Rocrad.new(@jpg).to_s.gsub(/[ \n\r]/, "")
+    assert_equal @txt_tif, Rocrad.new(@path.join("images", "test.tif").to_s).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_unsupported_file_type_error
     assert_raise Rocrad::UnsupportedFileTypeError do
-      Rocrad.new(@path.join("images", "test.foo").to_s).to_s_without_spaces
+      Rocrad.new(@path.join("images", "test.foo").to_s).to_s.gsub(/[ \n\r]/, "")
     end
   end
 
   def test_image_not_selected_error
     assert_raise Rocrad::ImageNotSelectedError do
-      Rocrad.new(@path.join("images", "test.noo").to_s).to_s_without_spaces
+      Rocrad.new(@path.join("images", "test.noo").to_s).to_s.gsub(/[ \n\r]/, "")
     end
   end
 
   def test_translate_images_png_jpg
-    assert_equal @txt_png, Rocrad.new(@path.join("images", "test.png").to_s).to_s_without_spaces
-    assert_equal @txt_jpg, Rocrad.new(@path.join("images", "test.jpg").to_s).to_s_without_spaces
+    assert_equal @txt_png, Rocrad.new(@path.join("images", "test.png").to_s).to_s.gsub(/[ \n\r]/, "")
+    assert_equal @txt_jpg, Rocrad.new(@path.join("images", "test.jpg").to_s).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_translate_images_bmp
-    assert_equal @txt_bmp, Rocrad.new(@path.join("images", "test.bmp").to_s).to_s_without_spaces
+    assert_equal @txt_bmp, Rocrad.new(@path.join("images", "test.bmp").to_s).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_translate_test1_tif
-    assert_equal "V2V4".downcase, Rocrad.new(@path.join("images", "test1.tif").to_s).to_s_without_spaces
+    assert_equal "V2V4".downcase, Rocrad.new(@path.join("images", "test1.tif").to_s).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_change_the_image
     image = Rocrad.new(@jpg)
-    assert_equal @txt_jpg, image.to_s_without_spaces
+    assert_equal @txt_jpg, image.to_s.gsub(/[ \n\r]/, "")
     image.src = @path.join("images", "test.tif").to_s
-    assert_equal @txt_tif, image.to_s_without_spaces
+    assert_equal @txt_tif, image.to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_unique_uid
@@ -79,19 +79,19 @@ class TestRocrad < Test::Unit::TestCase
 
   def test_should_crop_image_tif
     tif = @path.join("images", "test.tif").to_s
-    assert_equal "4", Rocrad.new(tif).crop!(140, 10, 36, 40).to_s_without_spaces
-    assert_equal "3", Rocrad.new(tif).crop!(180, 10, 36, 40).to_s_without_spaces
-    assert_equal "Z".downcase, Rocrad.new(tif).crop!(200, 10, 36, 40).to_s_without_spaces
-    assert_equal "Z".downcase, Rocrad.new(tif).crop!(220, 10, 30, 40).to_s_without_spaces
+    assert_equal "4", Rocrad.new(tif).crop!(140, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "3", Rocrad.new(tif).crop!(180, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "Z".downcase, Rocrad.new(tif).crop!(200, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "Z".downcase, Rocrad.new(tif).crop!(220, 10, 30, 40).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_should_crop_image_tif_same_instance
     tif      = @path.join("images", "test.tif").to_s
     instance = Rocrad.new(tif)
-    assert_equal "4", instance.crop!(140, 10, 36, 40).to_s_without_spaces
-    assert_equal "3", instance.crop!(180, 10, 36, 40).to_s_without_spaces
-    assert_equal "Z".downcase, instance.crop!(200, 10, 36, 40).to_s_without_spaces
-    assert_equal "Z".downcase, instance.crop!(220, 10, 30, 40).to_s_without_spaces
+    assert_equal "4", instance.crop!(140, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "3", instance.crop!(180, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "Z".downcase, instance.crop!(200, 10, 36, 40).to_s.gsub(/[ \n\r]/, "")
+    assert_equal "Z".downcase, instance.crop!(220, 10, 30, 40).to_s.gsub(/[ \n\r]/, "")
   end
 
   def test_attr_reader_while_cropping
@@ -99,7 +99,7 @@ class TestRocrad < Test::Unit::TestCase
     rocrad = Rocrad.new(tif).crop!(140, 10, 36, 40)
     assert_equal "", rocrad.txt
     assert rocrad.tmp.instance_of? Pathname
-    assert_equal "4", rocrad.to_s_without_spaces
+    assert_equal "4", rocrad.to_s.gsub(/[ \n\r]/, "")
     assert rocrad.txt.include?("4")
     assert_nil rocrad.tmp
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rocrad
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ludwig Bratke
@@ -165,6 +165,7 @@ files:
 - Rakefile
 - VERSION
 - lib/rocrad.rb
+- lib/rocrad/binary.rb
 - lib/rocrad/errors.rb
 - lib/rocrad/mixed.rb
 - rocrad.gemspec
@@ -176,6 +177,7 @@ files:
 - test/images/test.png
 - test/images/test.tif
 - test/images/test1.tif
+- test/test_binary.rb
 - test/test_mixed.rb
 - test/test_rocrad.rb
 has_rdoc: true