sqed 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4600b58a8dca4c59c21e0fcaa08c63e7564a56f4
-  data.tar.gz: f1f96f8e93e988bd53ca354c4fe3a67f359b1368
+  metadata.gz: f028e306ff2c2f95b9caaf8b1cfbc29416fce995
+  data.tar.gz: 4e560b1fb92746dbfb61ee62183555eea10cfdab
 SHA512:
-  metadata.gz: d7cb582b1d6db468617a132ce67a0dccab2315911eb650468ef6d0e756333cfcca710969d9d845dbe8c3149059499c486845072a053f5674412af268928e2f72
-  data.tar.gz: 9a24446ca6fb5caf9d7a9c436013e31cc6ceeb09e4c06f1968ee4cb5a2d544bd939d7b59e3bda023b2cfea38c4eb0cb1182e0971290738c44c8135a33d046b08
+  metadata.gz: a9c86658dcfecb19ac3529107637c51f313c9107fb38b801d1840932a7688eaf873e1b66674df99a7bec56ffcc662c2965b255e47d6eabd1f842fbd9efb746dd
+  data.tar.gz: af43d2974fa17ab3ce6d5c0b1fd32af0ab87f417f3faffbc393b11b06b991dc29c72508dde58f81e701fbc840d02512d9a3c09dd2a94a5f1c50f4019fcdc1d09

data/.travis.yml

@@ -8,6 +8,9 @@ rvm:
 #  - sudo apt-get update
 #  - sudo apt-get -y --reinstall install imagemagick
 #  - printf "\n" | pecl install imagick-beta
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq tesseract-ocr tesseract-ocr-nld
 branches:
   only:
     - master

data/LICENSE.txt

@@ -1,22 +1,17 @@
-Copyright (c) 2014 Matt Yoder
+The University of Illinois/NCSA Open Source License (NCSA)
 
-MIT License
+Copyright (c) 2014-onwwards Species File Group
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Developed by: 	 Species File Group	
+                 Illinois Natural History Survey
+                 http://speciesfile.org
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
+
+Neither the names of Species File Group, Illinois Natural History Survey, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.

data/lib/sqed.rb

@@ -3,8 +3,7 @@
 recent_ruby = RUBY_VERSION >= '2.1.1'
 raise "IMPORTANT: sqed gem requires ruby >= 2.1.1" unless recent_ruby
 
-require "RMagick"
-include Magick
+require "rmagick"
 
 # Instants take the following
 # 1) A base image @image
@@ -12,7 +11,7 @@ include Magick
 #
 # Return a Sqed::Result
 #    
-#     a = Sqed.new(pattern: :right_t, image: image)
+#     a = Sqed.new(pattern: :offset_cross, image: image)
 #     b = a.result # => Sqed::Result instance
 #
 class Sqed

data/lib/sqed/boundary_finder.rb

@@ -1,5 +1,3 @@
-require 'RMagick'
-
 # Sqed Boundary Finders find boundaries on images and return co-ordinates of those boundaries.  They do not
 # return derivative images. Finders operate on cropped images, i.e. only the "stage".
 #
@@ -15,7 +13,7 @@ class Sqed::BoundaryFinder
 
   def initialize(image: image, layout: layout)
     raise 'No layout provided.' if layout.nil?
-    raise 'No image provided.' if image.nil? || image.class != Magick::Image
+    raise 'No image provided.' if image.nil? || image.class.name != 'Magick::Image'
 
     @layout = layout
     @img = image
@@ -52,9 +50,9 @@ class Sqed::BoundaryFinder
     (0..samples_to_take).each do |s|
       # Create a sample image a single pixel tall
       if scan == :rows
-        j = image.crop(0, s * sample_subdivision_size, image.columns, 1, true)
+        j = image.crop(0, s * sample_subdivision_size, image.columns, 1)
       elsif scan == :columns
-        j = image.crop(s * sample_subdivision_size, 0, 1, image.rows, true)
+        j = image.crop(s * sample_subdivision_size, 0, 1, image.rows)
       else
         raise
       end

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 # This was "green" line finder attempting to be agnostic; now it is reworked to be color-specific line finder
 #

data/lib/sqed/boundary_finder/cross_finder.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 # Return four equal quadrants, no parsing through the image
 #

data/lib/sqed/boundary_finder/stage_finder.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 # Some of this code was originally inspired by Emmanuel Oga's gist https://gist.github.com/EmmanuelOga/2476153.
 #

data/lib/sqed/extractor.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 # An Extractor takes Boundries object and a metadata_map pattern and returns a Sqed::Result
 # 
@@ -17,7 +17,7 @@ class Sqed::Extractor
   def initialize(boundaries: boundaries, metadata_map: metadata_map, image: image)
     raise 'boundaries not provided or provided boundary is not a Sqed::Boundaries' if boundaries.nil? || !boundaries.class == Sqed::Boundaries
     raise 'metadata_map not provided or metadata_map not a Hash' if metadata_map.nil? || !metadata_map.class == Hash
-    raise 'image not provided' if image.nil? || !image.class == Magick::Image
+    raise 'image not provided' if image.nil? || !image.class.name == 'Magick::Image'
 
     @metadata_map = metadata_map
     @boundaries = boundaries

data/lib/sqed/parser/ocr_parser.rb

@@ -18,7 +18,6 @@ class Sqed::Parser::OcrParser < Sqed::Parser
     img = @image #.white_threshold(245)
 
     # @jrflood: this is where you will have to do some research, tuning images so that they can be better ocr-ed,
-    # all of these methods are from RMagick.
     # get potential border pixel color (based on quadrant?)
     new_color = img.pixel_color(1, 1)
     # img = img.scale(2)

data/lib/sqed/result.rb

@@ -39,7 +39,7 @@ class Sqed::Result
   end
 
   # return [Hash]
-  #   a map of layout_section_type => Image
+  #   a map of layout_section_type => Rmagick::Image
   def images
     result = {} 
     SqedConfig::LAYOUT_SECTION_TYPES.each do |k|

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/sqed_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'RMagick'
+
 describe Sqed do
 
   let(:s) {Sqed.new}

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'support/image_helpers'
 require 'byebug'
 require 'awesome_print'
 require 'fileutils'
-require 'RMagick'
+require 'rmagick'
 
 FileUtils::mkdir_p 'tmp'
 

data/sqed.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rtesseract', '~> 1.2.6'
   spec.add_dependency 'zxing_cpp', '~> 0.1.0'
 
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'did_you_mean', '~> 0.9'
   spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'awesome_print', '~> 1.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,49 +68,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: did_you_mean
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: did_you_mean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="