tesseract-ocr 0.0.1.3 → 0.0.1.4

data/lib/tesseract/api.rb

@@ -22,7 +22,6 @@
 # or implied, of meh.
 #++
 
-require 'namedic'
 require 'iso-639'
 require 'tesseract/c'
 
@@ -42,6 +41,16 @@ class API
 		else
 			raise ArgumentError, 'invalid image'
 		end.tap {|image|
+			class << image
+				def width
+					C::pix_get_width(self)
+				end
+
+				def height
+					C::pix_get_height(self)
+				end
+			end
+
 			ObjectSpace.define_finalizer image, image_finalizer(image)
 		}
 	end
@@ -139,8 +148,6 @@ class API
 		C::set_image(to_ffi, pix)
 	end
 
-	namedic :left, :top, :width, :height,
-		:alias => { :l => :left, :t => :top, :w => :width, :h => :height }
 	def set_rectangle (left, top, width, height)
 		C::set_rectangle(to_ffi, left, top, width, height)
 	end

data/lib/tesseract/engine.rb

@@ -93,17 +93,17 @@ class Engine
 
 	def blacklist (what = nil)
 		if what
-			set 'tessedit_char_blacklist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s
+			set('tessedit_char_blacklist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s)
 		else
-			get 'tessedit_char_blacklist'.chars.to_a
+			get('tessedit_char_blacklist').chars.to_a
 		end
 	end
 
 	def whitelist (what = nil)
 		if what
-			set 'tessedit_char_whitelist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s
+			set('tessedit_char_whitelist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s)
 		else
-			get 'tessedit_char_whitelist'.chars.to_a
+			get('tessedit_char_whitelist').chars.to_a
 		end
 	end
 
@@ -132,8 +132,12 @@ class Engine
 
 		x      ||= 0
 		y      ||= 0
-		width  ||= C::pix_get_width(image)
-		height ||= C::pix_get_height(image)
+		width  ||= image.width
+		height ||= image.height
+
+		if (x + width) > image.width || (y + height) > image.height
+			raise IndexError, 'image access out of boundaries'
+		end
 
 		@api.set_image(image)
 		@api.set_rectangle(x, y, width, height)
@@ -175,8 +179,12 @@ class Engine
 		page   ||= 0
 		x      ||= 0
 		y      ||= 0
-		width  ||= C::pix_get_width(image)
-		height ||= C::pix_get_height(image)
+		width  ||= image.width
+		height ||= image.height
+
+		if (x + width) > image.width || (y + height) > image.height
+			raise IndexError, 'image access out of boundaries'
+		end
 
 		@api.set_image(image)
 		@api.set_rectangle(x, y, width, height)
@@ -189,7 +197,7 @@ class Engine
 				@y      = y.to_i
 				@width  = width.to_i
 				@height = height.to_i
-				@page   = page.to_i + 1
+				@page   = page.to_i
 
 				class << self
 					attr_reader :x, :y, :width, :height, :page

data/lib/tesseract/version.rb

@@ -24,6 +24,6 @@
 
 module Tesseract
 	def self.version
-		'0.0.1.3'
+		'0.0.1.4'
 	end
 end

data/test/tesseract_spec.rb

@@ -15,6 +15,12 @@ describe Tesseract::Engine do
 		it 'can read the second test image' do
 			engine.text_for('second.png').strip.should == "|'m 12 and what is this.\nINSTALL GENTOO\nOH HAI 1234"
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.text_for('second.png', 0, 0, 1000, 1000)
+			}.should raise_error
+		end
 	end
 
 	describe '#text_at' do
@@ -27,6 +33,13 @@ describe Tesseract::Engine do
 			engine.image = 'second.png'
 			engine.text_at(242, 191, 129, 31).strip.should == 'OH HAI 1234'
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.image = 'second.png'
+				engine.text_at(10, 20, 1000, 1000)
+			}.should raise_error
+		end
 	end
 
 	describe '#words_for' do
@@ -37,6 +50,12 @@ describe Tesseract::Engine do
 		it 'can read the second test image' do
 			engine.words_for('second.png').should == %w(|'m 12 and what is this. INSTALL GENTOO OH HAI 1234)
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.words_for('second.png', 0, 0, 1000, 1000)
+			}.should raise_error
+		end
 	end
 
 	describe '#words_at' do
@@ -49,6 +68,13 @@ describe Tesseract::Engine do
 			engine.image = 'second.png'
 			engine.words_at(242, 191, 129, 31).should == %w(OH HAI 1234)
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.image = 'second.png'
+				engine.words_at(10, 20, 1000, 1000)
+			}.should raise_error
+		end
 	end
 
 	describe '#chars_for' do
@@ -59,6 +85,12 @@ describe Tesseract::Engine do
 		it 'can read the second test image' do
 			engine.chars_for('second.png').should == "|'m 12 and what is this.\nINSTALL GENTOO\nOH HAI 1234".gsub(/\s+/, '').split('')
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.chars_for('second.png', 0, 0, 1000, 1000)
+			}.should raise_error
+		end
 	end
 
 	describe '#chars_at' do
@@ -75,6 +107,13 @@ describe Tesseract::Engine do
 			engine.image = 'second.png'
 			engine.chars_at(242, 191, 129, 31).should == 'OH HAI 1234'.gsub(/\s+/, '').split('')
 		end
+
+		it 'raises when going out of the image boundaries' do
+			expect {
+				engine.image = 'second.png'
+				engine.words_at(10, 20, 1000, 1000)
+			}.should raise_error
+		end
 	end
 	
 	describe '#blacklist' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tesseract-ocr
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namedic
-  requirement: &11606280 !ruby/object:Gem::Requirement
+  requirement: &14007960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11606280
+  version_requirements: *14007960
 - !ruby/object:Gem::Dependency
   name: iso-639
-  requirement: &11605700 !ruby/object:Gem::Requirement
+  requirement: &14007440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11605700
+  version_requirements: *14007440
 - !ruby/object:Gem::Dependency
   name: ffi-extra
-  requirement: &11605040 !ruby/object:Gem::Requirement
+  requirement: &14006760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11605040
+  version_requirements: *14006760
 - !ruby/object:Gem::Dependency
   name: ffi-inliner
-  requirement: &11604120 !ruby/object:Gem::Requirement
+  requirement: &14005940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11604120
+  version_requirements: *14005940
 description: 
 email: meh@paranoici.org
 executables: