rocrad 0.1.1 → 0.1.2

data/Gemfile

@@ -3,11 +3,13 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "rake", "0.8.7"
+gem "uuid", "~> 2.3.2"
 
 # 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 "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -6,9 +6,13 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    macaddr (1.0.0)
+    mocha (0.9.12)
     rake (0.8.7)
     rcov (0.9.9)
     test-unit (2.3.0)
+    uuid (2.3.2)
+      macaddr (~> 1.0)
 
 PLATFORMS
   ruby
@@ -16,6 +20,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
-  rake (= 0.8.7)
+  mocha (~> 0.9.0)
+  rake (~> 0.8.0)
   rcov
   test-unit (= 2.3.0)
+  uuid (~> 2.3.2)

data/Rakefile

@@ -14,13 +14,13 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rocrad"
-  gem.homepage = "http://github.com/EeCnee/rocrad"
-  gem.license = "MIT"
-  gem.summary = %Q{Ruby library for working with Ocrad - The GNU OCR}
+  gem.name        = "rocrad"
+  gem.homepage    = "http://github.com/EeCnee/rocrad"
+  gem.license     = "MIT"
+  gem.summary     = %Q{Ruby library for working with Ocrad - The GNU OCR}
   gem.description = %Q{Ruby library for working with Ocrad - The GNU OCR}
-  gem.email = "EeCnee1@netscape.net"
-  gem.authors = ["Ludwig Bratke"]
+  gem.email       = "EeCnee1@netscape.net"
+  gem.authors     = ["Ludwig Bratke"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -44,10 +44,10 @@ task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version       = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rocrad #{version}"
+  rdoc.title    = "rocrad #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rocrad/errors.rb

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

data/lib/rocrad.rb

@@ -1,5 +1,7 @@
 require "pathname"
 require "tempfile"
+require "uuid"
+require "net/http"
 
 require "rocrad/errors"
 
@@ -7,17 +9,68 @@ class Rocrad
 
   attr_accessor :options
 
+
   def initialize(src="", options={})
-    @uid                  = options.delete(:uid) || nil
-    @source               = Pathname.new src
+    @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 = ""
   end
 
-  def source= src
+  def source= src=""
     @value  = ""
-    @source = Pathname.new src
+    @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
+  end
+
+  #Output value
+  def to_s
+    return @value if @value != ""
+    if @source.instance_of? Pathname and @source.file?
+      convert
+      @value
+    elsif @source.instance_of? URI::HTTP
+      convert_via_http
+      @value
+    else
+      raise ImageNotSelectedError
+    end
+  end
+
+  #Remove spaces and break-lines
+  def to_s_without_spaces
+    to_s.gsub(" ", "").gsub("\n", "").gsub("\r", "")
+  end
+
+  private
+
+  def convert_via_http
+    tmp_path = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{Pathname.new(@source.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.close
+    uri     = @source
+    @source = tmp_path
+    convert
+    @source = uri
+    remove_file([tmp_path])
+  end
+
+  def get_source(src)
+    case (uri = URI.parse(src)).class.to_s
+      when "URI::HTTP" then
+        uri
+      when "URI::Generic" then
+        Pathname.new(uri.path)
+      else
+        Pathname.new(src)
+    end
   end
 
   #Remove files
@@ -34,16 +87,10 @@ class Rocrad
     raise Rocrad::TempFilesNotRemovedError
   end
 
-  def generate_uid
-    @uid = rand.to_s[2, 10] if @uid.nil?
-    @uid
-  end
-
   #Convert image to pnm
   def image_to_pnm
-    generate_uid
-    tmp_file    = Pathname.new(Dir::tmpdir).join("#{@uid}_#{@source.sub(@source.extname,".pnm").basename}")
-    redirection = "#{@source} > #{tmp_file} #{clear_console_output}"
+    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
       when ".jpg" then
         `djpeg -greyscale -pnm #{redirection}`
@@ -56,44 +103,20 @@ class Rocrad
       else
         raise UnsupportedFileTypeError
     end
-    tmp_file
+    pnm_image
   end
 
   #Convert image to string
   def convert
-    generate_uid
-    tmp_file  = Pathname.new(Dir::tmpdir).join("#{@uid}_#{@source.sub(@source.extname,".txt").basename}")
-    tmp_image = image_to_pnm
+    txt_file  = Pathname.new(Dir::tmpdir).join("#{@uid.generate}_#{@source.sub(@source.extname, ".txt").basename}")
+    pnm_image = image_to_pnm
     begin
-      `gocr #{tmp_image} -o #{tmp_file} #{clear_console_output}`
-      @value = File.read(tmp_file)
-      @uid   = nil
-      remove_file([tmp_image, tmp_file])
+      `gocr #{pnm_image} -o #{txt_file} #{clear_console_output}`
+      @value = File.read(txt_file)
+      remove_file([pnm_image, txt_file])
     rescue
       raise ConversionError
     end
   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
-  end
-
-  #Output value
-  def to_s
-    return @value if @value != ""
-    if @source.file?
-      convert
-      @value
-    else
-      raise ImageNotSelectedError
-    end
-  end
-
-  #Remove spaces and break-lines
-  def to_s_without_spaces
-    to_s.gsub(" ", "").gsub("\n", "").gsub("\r", "")
-  end
-
 end

data/rocrad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rocrad}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ludwig Bratke"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-05-27}
   s.description = %q{Ruby library for working with Ocrad - The GNU OCR}
   s.email = %q{EeCnee1@netscape.net}
   s.extra_rdoc_files = [
@@ -48,20 +48,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
+      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_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<test-unit>, ["= 2.3.0"])
     else
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
+      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<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<test-unit>, ["= 2.3.0"])
     end
   else
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
+    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<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/test/helper.rb

@@ -8,6 +8,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_rocrad.rb

@@ -9,6 +9,20 @@ 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
+    f.close
+  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
+  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
+    end
   end
 
   def test_be_instantiable
@@ -40,14 +54,17 @@ class TestRocrad < Test::Unit::TestCase
   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
   end
 
   def test_translate_test1_tif
+    pend
     assert_equal "V2V4", Rocrad.new(@path.join("images", "test1.tif").to_s).to_s_without_spaces
   end
 
@@ -59,7 +76,8 @@ class TestRocrad < Test::Unit::TestCase
   end
 
   def test_unique_uid
-    assert_not_equal Rocrad.new(@image_jpg).generate_uid, Rocrad.new(@image_jpg).generate_uid
+    assert_not_equal Rocrad.new(@image_jpg).instance_variable_get(:@uid).generate,
+                     Rocrad.new(@image_jpg).instance_variable_get(:@uid).generate
   end
 
   def test_generate_a_unique id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rocrad
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ludwig Bratke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +02:00
+date: 2011-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,20 +23,52 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
+        version: 2.3.2
+  name: uuid
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  name: mocha
+  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: 63
         segments: 
         - 0
         - 8
-        - 7
-        version: 0.8.7
+        - 0
+        version: 0.8.0
   name: rake
-  version_requirements: *id001
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +80,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id002
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +96,11 @@ dependencies:
         - 0
         version: 1.6.0
   name: jeweler
-  version_requirements: *id003
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +110,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id004
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -94,7 +126,7 @@ dependencies:
         - 0
         version: 2.3.0
   name: test-unit
-  version_requirements: *id005
+  version_requirements: *id007
   prerelease: false
 description: Ruby library for working with Ocrad - The GNU OCR
 email: EeCnee1@netscape.net