rtesseract 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00b784a8ad22b0a84816a7c814e587726567972
-  data.tar.gz: a7b1da64782e6d5d5a8bdaf098e6412cd53ca626
+  metadata.gz: 2184c2ed467331288d1f86523677d1dd108cd988
+  data.tar.gz: 63f39ebbdb2ba9e945ac8f503bd542a7b4fce46c
 SHA512:
-  metadata.gz: ccc32c5ce1b558407f3331ada80aa20c1df91409b95b60b4b7c8a534e6e920e643a214744c848acdd2fafcba615edeae22b7612f5c04257e98c7ea8d9a0b31af
-  data.tar.gz: 87430d4c193b95960d28e55002e838d862fd25fe7d3dee1f9be59aa080a3b3dad857957150cc64a8eb6d0a3838ac1dccd0878084f91ff21da3a3a17a6d16012a
+  metadata.gz: b247ec0bbd34adbf345ac57034244c51550dbb7e5d733e566bfe8a70e60cb8f2afb395890c520d251d03bc51d0a11308ea9995bcd42c76cb42e17a9c9c7af598
+  data.tar.gz: 553ef6e51ec48ca563d96539efadeffed32938e58e034e036d52c93492946e072b66001039803bf3324ae65ee04c5ee61edd00eb6cf6f314fb53eea5f0547ac7

data/README.rdoc

@@ -3,6 +3,7 @@
 {<img src="https://travis-ci.org/dannnylo/rtesseract.png?branch=master" alt="Build Status" />}[https://travis-ci.org/dannnylo/rtesseract]
 {<img src="https://coveralls.io/repos/dannnylo/rtesseract/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/dannnylo/rtesseract?branch=master]
 {<img src="https://codeclimate.com/github/dannnylo/rtesseract.png" />}[https://codeclimate.com/github/dannnylo/rtesseract]
+{<img src="http://badgr.co/gittip/dannnylo.png" />}[https://www.gittip.com/dannnylo/]
 
 Ruby library for working with the Tesseract OCR.
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/processors/quick_magick.rb

@@ -14,11 +14,15 @@ module QuickMagickProcessor
     cat = source.is_a?(Pathname) ? read_with_processor(source.to_s) : source
     cat.compress = 'None'
     cat.format = 'tif'
-    cat.crop("#{w}x#{h}+#{x}+#{y}") unless [x, y, w, h].compact == []
+    cat.crop("#{w}x#{h}+#{x}+#{y}") if need_crop?( x, y, w, h)
     cat.write tmp_file.path.to_s
     tmp_file
   end
 
+  def self.need_crop?(x = nil, y = nil, w = nil, h = nil)
+    x.to_f + y.to_f + w.to_f + h.to_f > 0
+  end
+
   def self.read_with_processor(path)
     QuickMagick::Image.read(path.to_s).first
   end

data/lib/rtesseract.rb

@@ -29,7 +29,7 @@ class RTesseract
   def initialize(src = '', options = {})
     @options = command_line_options(options)
     @value, @x, @y, @w, @h = ['']
-    choose_processor!
+    @processor = RTesseract.choose_processor!(@processor)
     @source = @processor.image?(src) ? src : Pathname.new(src)
   end
 
@@ -59,12 +59,9 @@ class RTesseract
 
   def self.read(src = nil, options = {}, &block)
     fail RTesseract::ImageNotSelectedError if src.nil?
-    processor = options.delete(:processor) || options.delete('processor')
-    if processor == 'mini_magick'
-      image = MiniMagickProcessor.read_with_processor(src.to_s)
-    else
-      image = RMagickProcessor.read_with_processor(src.to_s)
-    end
+    processor = RTesseract.choose_processor!(options.delete(:processor) || options.delete('processor'))
+    image = processor.read_with_processor(src.to_s)
+
     yield image
     object = RTesseract.new('', options)
     object.from_blob(image.to_blob)
@@ -123,7 +120,7 @@ class RTesseract
 
   # Page Segment Mode
   def psm
-    @psm.nil? ? '' : " -psm #{@psm} "
+    (@psm.nil? ? '' : " -psm #{@psm} ")
   rescue
     ''
   end
@@ -193,17 +190,16 @@ class RTesseract
     to_s.gsub(' ', '').gsub("\n", '').gsub("\r", '')
   end
 
-  private
-
-  def choose_processor!
-    @processor =  if MiniMagickProcessor.a_name?(@processor.to_s)
+  def self.choose_processor!(processor)
+    processor =  if MiniMagickProcessor.a_name?(processor.to_s)
                     MiniMagickProcessor
-                  elsif QuickMagickProcessor.a_name?(@processor.to_s)
+                  elsif QuickMagickProcessor.a_name?(processor.to_s)
                     QuickMagickProcessor
                   else
                     RMagickProcessor
                   end
-    @processor.setup
+    processor.setup
+    processor
   end
 end
 

data/rtesseract.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rtesseract 1.2.0 ruby lib
+# stub: rtesseract 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rtesseract"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Danilo Jeremias da Silva"]
-  s.date = "2014-02-21"
+  s.date = "2014-02-26"
   s.description = "Ruby library for working with the Tesseract OCR."
   s.email = "dannnylo@gmail.com"
   s.extra_rdoc_files = [

data/spec/rtesseract_spec.rb

@@ -1,6 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 # encoding: UTF-8
 require 'pathname'
+class MakeStringError
+  def to_s
+    raise "error"
+  end
+end
 
 describe "Rtesseract" do
   before do
@@ -64,6 +69,9 @@ describe "Rtesseract" do
     RTesseract.new(@image_tiff,{:lang=>"por"}).to_s_without_spaces.should eql("43ZZ")
 
     RTesseract.new(@image_tiff,{:lang=>"eng"}).lang.should eql(" -l eng ")
+
+    #Inválid lang object
+    RTesseract.new(@image_tiff,{:lang=>MakeStringError.new}).lang.should eql("")
   end
 
   it " be configurable" do
@@ -102,6 +110,10 @@ describe "Rtesseract" do
     MiniMagickProcessor.a_name?('teste').should == false
     MiniMagickProcessor.a_name?('mini_magick').should == true
     MiniMagickProcessor.a_name?('MiniMagickProcessor').should == true
+
+    QuickMagickProcessor.a_name?('teste').should == false
+    QuickMagickProcessor.a_name?('quick_magick').should == true
+    QuickMagickProcessor.a_name?('QuickMagickProcessor').should == true
   end
 
   it " change image in a block" do
@@ -116,8 +128,6 @@ describe "Rtesseract" do
     end
     test.to_s_without_spaces.should eql("3R8Z")
 
-    require 'mini_magick'
-
     test = RTesseract.read(@path.join("images","test.jpg").to_s,{:lang=>'en', :processor => 'mini_magick'}) do |image|
       #image.white_threshold(245)
       image.gravity "south"
@@ -128,6 +138,9 @@ describe "Rtesseract" do
   it " get a error" do
     expect{ RTesseract.new(@path.join("images","test.jpg").to_s, {:command => "tesseract_error"}).to_s }.to raise_error(RTesseract::ConversionError)
     expect{ RTesseract.new(@path.join("images","test_not_exists.png").to_s).to_s }.to raise_error(RTesseract::ImageNotSelectedError)
+
+    #Inválid psm object
+    RTesseract.new(@image_tiff,{:psm=>MakeStringError.new}).psm.should eql("")
   end
 
   it "remove a file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtesseract
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec