tesseract-ocr 0.1.0 → 0.1.1

data/bin/tesseract-train.rb

@@ -7,12 +7,12 @@ require 'shellwords'
 options = {}
 
 OptionParser.new do |o|
-	o.on '-b', '--box FILE', 'the box file to use' do |value|
-		options[:box] = File.realpath(value)
+	o.on '-b', '--box FILE...', Array, 'the box files to use' do |value|
+		options[:box] = value.map { |path| File.realpath(path) }
 	end
 
-	o.on '-i', '--image FILE', 'the image file to use' do |value|
-		options[:image] = File.realpath(value)
+	o.on '-i', '--image FILE...', Array, 'the image files to use' do |value|
+		options[:image] = value.map { |path| File.realpath(path) }
 	end
 
 	o.on '-o', '--output FILE', 'the path where to output the traineddata' do |value|
@@ -25,24 +25,28 @@ if language = ARGV.shift
 	options[:image]  = File.realpath("#{language}.tif")
 	options[:output] = File.expand_path("#{language}.traineddata")
 else
-	language = options[:box][/^(.*?)\./, 1]
+	language = options[:output][/^(.*?)\./, 1]
 end
 
 Dir.chdir FileUtils.mkpath(File.join(Dir.tmpdir, rand.to_s)).first
 
 language = language.shellescape
 
-%x{
-	cp #{options[:box].shellescape} #{language}.box
-	cp #{options[:image].shellescape} #{language}#{File.extname(options[:image])}
+options[:box].each_with_index {|box, index|
+	%x{
+		cp #{box.shellescape} #{language}.#{index}.box
+		cp #{options[:image][index].shellescape} #{language}.#{index}#{File.extname(options[:image][index]}
+
+		tesseract #{language}#{File.extname(options[:image])} #{language} nobatch box.train.stderr
 
-	tesseract #{language}#{File.extname(options[:image])} #{language} nobatch box.train.stderr
+		unicharset_extractor #{language}.box
 
-	unicharset_extractor #{language}.box
+		echo #{language}.#{index} 0 0 0 0 0 >> font_properties
+		mftraining -F font_properties -U unicharset -O #{language}.unicharset #{language}.tr
+	}
+}
 
-	echo #{language} 0 0 0 0 0 > font_properties
-	mftraining -F font_properties -U unicharset #{language}.tr
-	mftraining -F font_properties -U unicharset -O #{language}.unicharset #{language}.tr
+%x{
 	cntraining #{language}.tr
 
 	mv Microfeat #{language}.Microfeat

data/examples/nerdz-captcha-breaker/break.rb

@@ -18,6 +18,14 @@ def near (x, y)
 	]
 end
 
+class Magick::Pixel
+	def =~ (other)
+		other = Magick::Pixel.from_color(other) if other.is_a?(String)
+
+		red == other.red && green == other.green && blue == other.blue
+	end
+end
+
 ENV['TESSDATA_PREFIX'] = './'
 
 Tesseract::Engine.new {|engine|
@@ -33,20 +41,20 @@ Tesseract::Engine.new {|engine|
 			pixels[p] += 1
 		}
 
-		pixels.delete(Magick::Pixel.from_color('black'))
+		pixels.reject! { |p| p =~ 'black' }
 
 		text_color, count = pixels.max { |a, b| a.last <=> b.last }
 
 		image.each_pixel {|p, x, y|
-			next unless p == text_color or p.to_color == 'black'
+			next unless p =~ text_color or p =~ 'black'
 
-			image.pixel_color x, y, p == text_color ? 'black' : 'white'
+			image.pixel_color x, y, p =~ text_color ? 'black' : 'white'
 		}
 
 		image.each_pixel {|p, x, y|
-			next if p.to_color == 'black' || p.to_color == 'white'
+			next if p =~ 'black' || p =~ 'white'
 
-			if near(x, y).map { |(x, y)| image.pixel_color x, y }.any? { |p| p.to_color == 'black' }
+			if near(x, y).map { |(x, y)| image.pixel_color x, y }.any? { |p| p =~ 'black' }
 				image.pixel_color x, y, 'gray'
 			else
 				image.pixel_color x, y, 'white'
@@ -54,7 +62,7 @@ Tesseract::Engine.new {|engine|
 		}
 
 		image.each_pixel {|p, x, y|
-			next unless p.to_color == 'gray'
+			next unless p =~ 'gray'
 
 			image.pixel_color x, y, 'black'
 		}

data/lib/tesseract.rb

@@ -22,5 +22,4 @@
 # or implied, of meh.
 #++
 
-require 'tesseract/api'
-require 'tesseract/engine'
+require 'tesseract-ocr'

data/lib/tesseract/engine.rb

@@ -31,7 +31,7 @@ module Tesseract
 class Engine
 	attr_reader :config
 
-	namedic :path, :language, :mode, :variables,
+	named :path, :language, :mode, :variables,
 		:optional => { :path => '.', :language => :eng, :mode => :DEFAULT, :variables => {}, :config => [] },
 		:alias    => { :data => :path, :lang => :language }
 	def initialize (path = '.', language = :eng, mode = :DEFAULT, variables = {}, config = [], &block) # :yields: self
@@ -135,14 +135,14 @@ class Engine
 		@image = image
 	end
 
-	namedic :x, :y, :width, :height,
+	named :x, :y, :width, :height,
 		:optional => 0 .. -1,
 		:alias    => { :w => :width, :h => :height }
 	def select (x = nil, y = nil, width = nil, height = nil)
 		@rectangle = [x, y, width, height]
 	end
 
-	namedic :image, :x, :y, :width, :height,
+	named :image, :x, :y, :width, :height,
 		:optional => 0 .. -1,
 		:alias    => { :w => :width, :h => :height }
 	def text_for (image = nil, x = nil, y = nil, width = nil, height = nil)
@@ -160,7 +160,7 @@ class Engine
 		}
 	end
 
-	namedic :x, :y, :width, :height,
+	named :x, :y, :width, :height,
 		:optional => 0 .. -1,
 		:alias    => { :w => :width, :h => :height }
 	def text_at (x = nil, y = nil, width = nil, height = nil)
@@ -178,7 +178,7 @@ class Engine
 			_iterator.__send__ "each_#{level}", &block
 		end
 
-		namedic :image, :x, :y, :width, :height,
+		named :image, :x, :y, :width, :height,
 			:optional => 0 .. -1,
 			:alias    => { :w => :width, :h => :height }
 		define_method "each_#{level}_for" do |image = nil, x = nil, y = nil, width = nil, height = nil, &block|
@@ -188,7 +188,7 @@ class Engine
 			__send__ "each_#{level}", &block
 		end
 
-		namedic :x, :y, :width, :height,
+		named :x, :y, :width, :height,
 			:optional => 0 .. -1,
 			:alias    => { :w => :width, :h => :height }
 		define_method "each_#{level}_at" do |x = nil, y = nil, width = nil, height = nil, &block|
@@ -199,7 +199,7 @@ class Engine
 			_iterator.__send__ "#{level}s"
 		end
 
-		namedic :image, :x, :y, :width, :height,
+		named :image, :x, :y, :width, :height,
 			:optional => 0 .. -1,
 			:alias    => { :w => :width, :h => :height }
 		define_method "#{level}s_for" do |image = nil, x = nil, y = nil, width = nil, height = nil|
@@ -209,7 +209,7 @@ class Engine
 			__send__ "#{level}s"
 		end
 
-		namedic :x, :y, :width, :height,
+		named :x, :y, :width, :height,
 			:optional => 0 .. -1,
 			:alias    => { :w => :width, :h => :height }
 		define_method "#{level}s_at" do |x = nil, y = nil, width = nil, height = nil|

data/lib/tesseract/engine/iterator.rb

@@ -143,7 +143,7 @@ class Iterator
 		define_method "#{level}s" do
 			__send__("each_#{level}").map {|e|
 				e.methods.each {|name|
-					if e.respond_to? "__memoized_#{name}"
+					if e.is_memoized?(name)
 						e.__send__ name
 					end
 				}

data/lib/tesseract/extensions.rb

@@ -22,6 +22,6 @@
 # or implied, of meh.
 #++
 
-require 'namedic'
-require 'memoized'
+require 'call-me/named'
+require 'call-me/memoize'
 require 'iso-639'

data/lib/tesseract/version.rb

@@ -24,6 +24,6 @@
 
 module Tesseract
 	def self.version
-		'0.1.0'
+		'0.1.1'
 	end
 end

data/tesseract-ocr.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new {|s|
 	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths = ['lib']
 
-	s.add_dependency 'namedic'
-	s.add_dependency 'memoized'
+	s.add_dependency 'call-me'
 	s.add_dependency 'iso-639'
 
 	s.add_dependency 'ffi-extra'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tesseract-ocr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000 Z
+date: 2011-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: namedic
-  requirement: &20715740 !ruby/object:Gem::Requirement
+  name: call-me
+  requirement: &15076460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20715740
-- !ruby/object:Gem::Dependency
-  name: memoized
-  requirement: &20730960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *20730960
+  version_requirements: *15076460
 - !ruby/object:Gem::Dependency
   name: iso-639
-  requirement: &20729480 !ruby/object:Gem::Requirement
+  requirement: &15075360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20729480
+  version_requirements: *15075360
 - !ruby/object:Gem::Dependency
   name: ffi-extra
-  requirement: &20727420 !ruby/object:Gem::Requirement
+  requirement: &15074140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20727420
+  version_requirements: *15074140
 - !ruby/object:Gem::Dependency
   name: ffi-inliner
-  requirement: &20726120 !ruby/object:Gem::Requirement
+  requirement: &15072700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20726120
+  version_requirements: *15072700
 description: 
 email: meh@paranoici.org
 executables: