rocrad 0.1.2 → 0.1.3

data/Gemfile

@@ -4,14 +4,15 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "uuid", "~> 2.3.2"
+gem "rmagick", "~> 2.13.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "mocha", "~> 0.9.0"
-  gem "rake", "~> 0.8.0"
-  gem "bundler", "~> 1.0.0"
+  gem "mocha", "~> 0.9.12"  
+  gem "rake", "~> 0.8.7"  
+  gem "bundler", "~> 1.0.14"  
   gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
-  gem "test-unit", "2.3.0"
+  gem "rcov", "~> 0.9.9"
+  gem "test-unit", "~> 2.3.0"
 end

data/Gemfile.lock

@@ -10,6 +10,7 @@ GEM
     mocha (0.9.12)
     rake (0.8.7)
     rcov (0.9.9)
+    rmagick (2.13.1)
     test-unit (2.3.0)
     uuid (2.3.2)
       macaddr (~> 1.0)
@@ -18,10 +19,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.0.14)
   jeweler (~> 1.6.0)
-  mocha (~> 0.9.0)
-  rake (~> 0.8.0)
-  rcov
-  test-unit (= 2.3.0)
+  mocha (~> 0.9.12)
+  rake (~> 0.8.7)
+  rcov (~> 0.9.9)
+  rmagick (~> 2.13.1)
+  test-unit (~> 2.3.0)
   uuid (~> 2.3.2)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rocrad/mixed.rb

@@ -0,0 +1,40 @@
+class Rocrad
+  class Mixed < Rocrad
+
+    attr_accessor :areas
+
+    def initialize(src="", options = {})
+      super(src)
+      @areas = options.delete(:areas) || []
+      yield self if block_given?
+    end
+
+    def add_area(x, y, w, h)
+      @txt = ""
+      @areas << {:x => x, :y => y, :w => w, :h => h}
+    end
+
+    def areas=(value)
+      @areas = value.instance_of?(Array) ? value : []
+      @areas.delete_if { |area| !area.is_a?(Hash) or !area.has_key?(:x) or !area.has_key?(:y) or
+          !area.has_key?(:w) or !area.has_key?(:h) }
+      @txt = ""
+    end
+
+    private
+
+    #Convert parts of image to string
+    def convert
+      @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
+    end
+
+  end
+end
+

data/lib/rocrad.rb

@@ -2,42 +2,37 @@ require "pathname"
 require "tempfile"
 require "uuid"
 require "net/http"
+require "RMagick"
 
 require "rocrad/errors"
+require "rocrad/mixed"
 
 class Rocrad
 
-  attr_accessor :options
+  attr_accessor :src
+  attr_reader :tmp, :txt
 
-
-  def initialize(src="", options={})
-    @uid                  = UUID.new
-    @source               = get_source src
-    @clear_console_output = options.delete(:clear_console_output)
-    @clear_console_output = true if @clear_console_output.nil?
-    @value = ""
+  def initialize(src="")
+    @uid = UUID.new
+    @src = get_source src
+    @txt = ""
+    @tmp = nil
   end
 
-  def source= src=""
-    @value  = ""
-    @source = get_source src
-  end
-
-  #TODO: Clear console for MacOS or Windows
-  def clear_console_output
-    return "" unless @clear_console_output
-    "2>/dev/null" if File.exist?("/dev/null") #Linux console clear
+  def src=(value="")
+    @txt = ""
+    @src = get_source value
   end
 
   #Output value
   def to_s
-    return @value if @value != ""
-    if @source.instance_of? Pathname and @source.file?
+    return @txt if @txt != ""
+    if @src.instance_of? Pathname and @src.file?
       convert
-      @value
-    elsif @source.instance_of? URI::HTTP
+      @txt
+    elsif @src.instance_of? URI::HTTP
       convert_via_http
-      @value
+      @txt
     else
       raise ImageNotSelectedError
     end
@@ -48,17 +43,31 @@ class Rocrad
     to_s.gsub(" ", "").gsub("\n", "").gsub("\r", "")
   end
 
+#Crop image to convert
+  def crop!(x, y, w, h)
+    @txt = ""
+    src  = Magick::Image.read(@src.to_s).first
+    src.crop!(x, y, w, h)
+    @tmp = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@src.sub(@src.extname, "-crop#{@src.extname}").basename}")
+    src.write @tmp.to_s
+    self
+  end
+
   private
 
+  def cco
+    "2>/dev/null" if File.exist?("/dev/null") #Linux console clear
+  end
+
   def convert_via_http
-    tmp_path = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{Pathname.new(@source.request_uri).basename}")
+    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(@source))
+    tmp_file.write(Net::HTTP.get(@src))
     tmp_file.close
-    uri     = @source
-    @source = tmp_path
+    uri  = @src
+    @src = tmp_path
     convert
-    @source = uri
+    @src = uri
     remove_file([tmp_path])
   end
 
@@ -79,41 +88,43 @@ class Rocrad
       begin
         File.unlink(file) if File.exist?(file)
       rescue
-        system "rm -f #{file}"
+        system "rm -f #{file} #{cco}"
       end
     end
     true
   rescue
-    raise Rocrad::TempFilesNotRemovedError
+    raise TempFilesNotRemovedError
   end
 
   #Convert image to pnm
   def image_to_pnm
-    pnm_image   = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@source.sub(@source.extname, ".pnm").basename}")
-    redirection = "#{@source} > #{pnm_image} #{clear_console_output}"
-    case @source.extname
+    src = @tmp ? @tmp : @src
+    pnm = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@src.sub(@src.extname, ".pnm").basename}")
+    case @src.extname
       when ".jpg" then
-        `djpeg -greyscale -pnm #{redirection}`
+        `djpeg -colors 2 -grayscale -dct float -pnm #{src} > #{pnm} #{cco}`
       when ".tif" then
-        `tifftopnm #{redirection}`
+        `tifftopnm #{src} > #{pnm} #{cco}`
       when ".png" then
-        `pngtopnm #{redirection}`
+        `pngtopnm  #{src} > #{pnm} #{cco}`
       when ".bmp" then
-        `bmptopnm #{redirection}`
+        `bmptopnm #{src} > #{pnm} #{cco}`
       else
         raise UnsupportedFileTypeError
     end
-    pnm_image
+    pnm
   end
 
   #Convert image to string
   def convert
-    txt_file  = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@source.sub(@source.extname, ".txt").basename}")
-    pnm_image = image_to_pnm
+    src = @tmp ? @tmp : @src
+    txt = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{src.sub(src.extname, ".txt").basename}")
+    pnm = image_to_pnm
     begin
-      `gocr #{pnm_image} -o #{txt_file} #{clear_console_output}`
-      @value = File.read(txt_file)
-      remove_file([pnm_image, txt_file])
+      `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

data/rocrad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rocrad}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ludwig Bratke"]
-  s.date = %q{2011-05-27}
+  s.date = %q{2011-05-29}
   s.description = %q{Ruby library for working with Ocrad - The GNU OCR}
   s.email = %q{EeCnee1@netscape.net}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/rocrad.rb",
     "lib/rocrad/errors.rb",
+    "lib/rocrad/mixed.rb",
     "rocrad.gemspec",
     "test/helper.rb",
     "test/images/mixed.tif",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
     "test/images/test.png",
     "test/images/test.tif",
     "test/images/test1.tif",
+    "test/test_mixed.rb",
     "test/test_rocrad.rb"
   ]
   s.homepage = %q{http://github.com/EeCnee/rocrad}
@@ -49,29 +51,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<uuid>, ["~> 2.3.2"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.0"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<rmagick>, ["~> 2.13.1"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.12"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.14"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, ["= 2.3.0"])
+      s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
+      s.add_development_dependency(%q<test-unit>, ["~> 2.3.0"])
     else
       s.add_dependency(%q<uuid>, ["~> 2.3.2"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.0"])
-      s.add_dependency(%q<rake>, ["~> 0.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rmagick>, ["~> 2.13.1"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.12"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.14"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<test-unit>, ["= 2.3.0"])
+      s.add_dependency(%q<rcov>, ["~> 0.9.9"])
+      s.add_dependency(%q<test-unit>, ["~> 2.3.0"])
     end
   else
     s.add_dependency(%q<uuid>, ["~> 2.3.2"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.0"])
-    s.add_dependency(%q<rake>, ["~> 0.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rmagick>, ["~> 2.13.1"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.12"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.14"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<test-unit>, ["= 2.3.0"])
+    s.add_dependency(%q<rcov>, ["~> 0.9.9"])
+    s.add_dependency(%q<test-unit>, ["~> 2.3.0"])
   end
 end
 

data/test/test_mixed.rb

@@ -0,0 +1,92 @@
+require 'helper'
+require 'pathname'
+
+class TestMixed < Test::Unit::TestCase
+
+  def setup
+    @path    = Pathname.new(__FILE__.gsub("test_mixed.rb", "")).expand_path
+    @tif     = @path.join("images", "mixed.tif").to_s
+    @txt_tif = "43ZZ".downcase
+  end
+
+  def test_should_be_instantiable
+    assert_equal Rocrad::Mixed, Rocrad::Mixed.new.class
+    assert_equal Rocrad::Mixed, Rocrad::Mixed.new(@tif).class
+  end
+
+  def test_should_translate_parts_of_the_image_to_text
+    mix_block = Rocrad::Mixed.new(@tif) do |image|
+      image.add_area(28, 19, 25, 25) #position of 4
+      image.add_area(180, 22, 20, 28) # position of 3
+      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
+
+    mix_block = Rocrad::Mixed.new(@tif, {:areas => [
+        {:x => 28, :y=>19, :w=>25, :h=>25}, #position of 4
+        {:x => 180, :y=>22, :w=>20, :h=>28}, # position of 3
+        {: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
+  end
+
+  def test_show_areas
+
+    mix_block = Rocrad::Mixed.new(@tif) do |image|
+      image.add_area(28, 19, 25, 25) #position of 4
+      image.add_area(180, 22, 20, 28) # position of 3
+      image.add_area(218, 22, 24, 28) # position of z
+      image.add_area(248, 24, 22, 22) # position of z
+    end
+
+    areas     = [{:x=>28, :h=>25, :w=>25, :y=>19},
+                 {:x=>180, :h=>28, :w=>20, :y=>22},
+                 {:x=>218, :h=>28, :w=>24, :y=>22},
+                 {:x=>248, :h=>22, :w=>22, :y=>24}]
+    assert_equal(areas, mix_block.areas)
+  end
+
+  def test_show_areas2
+    mix_block = Rocrad::Mixed.new(@tif, {:areas => [
+        {:x => 28, :y=>19, :w=>25, :h=>25}, #position of 4
+        {:x => 180, :y=>22, :w=>20, :h=>28}, # position of 3
+        {:x => 218, :y=>22, :w=>24, :h=>28}, # position of z
+        {:x => 248, :y=>24, :w=>22, :h=>22} # position of z
+    ]})
+
+    areas     = [{:x=>28, :h=>25, :w=>25, :y=>19},
+                 {:x=>180, :h=>28, :w=>20, :y=>22},
+                 {:x=>218, :h=>28, :w=>24, :y=>22},
+                 {:x=>248, :h=>22, :w=>22, :y=>24}]
+    assert_equal(areas, mix_block.areas)
+  end
+
+  def test_edit_areas
+    mix_block       = Rocrad::Mixed.new(@tif, {:areas => [
+        {:x => 28, :y=>19, :w=>25, :h=>25}, #position of 4
+        {:x => 180, :y=>22, :w=>20, :h=>28}, # position of 3
+        {:x => 218, :y=>22, :w=>24, :h=>28}, # position of z
+        {:x => 248, :y=>24, :w=>22, :h=>22} # position of z
+    ]})
+
+    mix_block.areas = mix_block.areas[1..3]
+    areas           = [{:x=>180, :h=>28, :w=>20, :y=>22},
+                       {: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
+
+    mix_block.areas = []
+    assert_equal([], mix_block.areas)
+    assert_equal "", mix_block.to_s_without_spaces
+
+    mix_block.areas = nil
+    #assert_equal([], mix_block.areas)
+    assert_equal "", mix_block.to_s_without_spaces
+  end
+
+end
+
+

data/test/test_rocrad.rb

@@ -7,16 +7,20 @@ end
 class TestRocrad < Test::Unit::TestCase
 
   def setup
-    @path      = Pathname.new(__FILE__.gsub("test_rocrad.rb", "")).expand_path
-    @image_jpg = @path.join("images", "test.jpg").to_s
-    f          = File.open(@image_jpg.to_s, "r")
-    @chars     = f.chars.to_a
+    @path  = Pathname.new(__FILE__.gsub("test_rocrad.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].to_s
+    @txt_tif = "43ZZ".downcase
+    @txt_png = ["H", "W", "9", "W".downcase].to_s
+    @txt_bmp = ["Z".downcase, "L", "A", "6"].to_s
   end
 
   def test_convert_via_http
     Net::HTTP.expects(:get).returns(@chars)
-    assert_equal "3R8Z", 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_without_spaces
   end
 
   def test_convert_via_http_raise_exception
@@ -28,12 +32,12 @@ class TestRocrad < Test::Unit::TestCase
   def test_be_instantiable
     assert_equal Rocrad, Rocrad.new.class
     assert_equal Rocrad, Rocrad.new("").class
-    assert_equal Rocrad, Rocrad.new(@image_jpg).class
+    assert_equal Rocrad, Rocrad.new(@jpg).class
   end
 
   def test_translate_image_to_text
-    assert_equal "3R8Z", Rocrad.new(@image_jpg).to_s_without_spaces
-    assert_equal "43ZZ", Rocrad.new(@path.join("images", "test.tif").to_s).to_s_without_spaces
+    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
   end
 
   def test_unsupported_file_type_error
@@ -49,43 +53,55 @@ class TestRocrad < Test::Unit::TestCase
   end
 
   def test_translate_images_png_jpg
-    assert_equal "HW9W", Rocrad.new(@path.join("images", "test.png").to_s).to_s_without_spaces
-    assert_equal "3R8Z", 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_without_spaces
+    assert_equal @txt_jpg, Rocrad.new(@path.join("images", "test.jpg").to_s).to_s_without_spaces
   end
 
   def test_translate_images_bmp
-    pend
-    assert_equal "ZLA6", Rocrad.new(@path.join("images", "test.bmp").to_s).to_s_without_spaces
-  end
-
-  def test_translate_mixed_tif
-    pend
-    assert_equal "43ZZ", Rocrad.new(@path.join("images", "mixed.tif").to_s).to_s_without_spaces
+    assert_equal @txt_bmp, Rocrad.new(@path.join("images", "test.bmp").to_s).to_s_without_spaces
   end
 
   def test_translate_test1_tif
-    pend
-    assert_equal "V2V4", 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_without_spaces
   end
 
   def test_change_the_image
-    image = Rocrad.new(@image_jpg)
-    assert_equal "3R8Z", image.to_s_without_spaces
-    image.source = @path.join("images", "test.tif").to_s
-    assert_equal "43ZZ", image.to_s_without_spaces
+    image = Rocrad.new(@jpg)
+    assert_equal @txt_jpg, image.to_s_without_spaces
+    image.src = @path.join("images", "test.tif").to_s
+    assert_equal @txt_tif, image.to_s_without_spaces
   end
 
   def test_unique_uid
-    assert_not_equal Rocrad.new(@image_jpg).instance_variable_get(:@uid).generate,
-                     Rocrad.new(@image_jpg).instance_variable_get(:@uid).generate
+    assert_not_equal Rocrad.new(@jpg).instance_variable_get(:@uid).generate,
+                     Rocrad.new(@jpg).instance_variable_get(:@uid).generate
+  end
+
+  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
+  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
   end
 
-  def test_generate_a_unique id
-    reg = Rocrad.new(@image_jpg)
-    assert_equal reg.generate_uid, reg.generate_uid
-    value = reg.generate_uid
-    reg.convert
-    assert_not_equal value, reg.generate_uid
+  def test_attr_reader_while_cropping
+    tif    = @path.join("images", "test.tif").to_s
+    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 rocrad.txt.include?("4")
+    assert_nil rocrad.tmp
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rocrad
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ludwig Bratke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +02:00
+date: 2011-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,56 +35,72 @@ dependencies:
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 57
+        segments: 
+        - 2
+        - 13
+        - 1
+        version: 2.13.1
+  name: rmagick
+  version_requirements: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 12
+        version: 0.9.12
   name: mocha
-  version_requirements: *id002
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 49
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 7
+        version: 0.8.7
   name: rake
-  version_requirements: *id003
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 11
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 14
+        version: 1.0.14
   name: bundler
-  version_requirements: *id004
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,28 +112,30 @@ dependencies:
         - 0
         version: 1.6.0
   name: jeweler
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 41
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 9
+        version: 0.9.9
   name: rcov
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -126,7 +144,7 @@ dependencies:
         - 0
         version: 2.3.0
   name: test-unit
-  version_requirements: *id007
+  version_requirements: *id008
   prerelease: false
 description: Ruby library for working with Ocrad - The GNU OCR
 email: EeCnee1@netscape.net
@@ -148,6 +166,7 @@ files:
 - VERSION
 - lib/rocrad.rb
 - lib/rocrad/errors.rb
+- lib/rocrad/mixed.rb
 - rocrad.gemspec
 - test/helper.rb
 - test/images/mixed.tif
@@ -157,6 +176,7 @@ files:
 - test/images/test.png
 - test/images/test.tif
 - test/images/test1.tif
+- test/test_mixed.rb
 - test/test_rocrad.rb
 has_rdoc: true
 homepage: http://github.com/EeCnee/rocrad