sqed 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f4d8affdf54fbd1921fd0d0ab561017a8f4afc
-  data.tar.gz: 1faccf4ba6649eaceb6a4c4aadc0a4eb21efb574
+  metadata.gz: 9a7fe6566fc76b5738f737ac760e511d1f360fe8
+  data.tar.gz: cd8b334216292a26934dbcbefcededcc74286504
 SHA512:
-  metadata.gz: 1cd78f97cf39d56ddbee8ef065e7a2cc8a5fe4ca6cd318e966cb1e50afc9a3b24291361216de4223a946e8e5fef3ea379fd8675c3aae69f1aa969b7e6975e6d4
-  data.tar.gz: 7f7b7f8d30d060f889080733e49dce6d34af01e190cf6ab33e21955f01d0dd55ac31f6f365bb2888ff8a732db41ba3d44fb0a3260fae9b9f86e36b57ea3f5c3c
+  metadata.gz: fc748be67d623a0e9f2675387ca555d71c5667729dae43ad6c40a32ed920795e32ef9ec39a6c80cdabea7631e4f8a7492f02de223f3d7aa02835686020c8082c
+  data.tar.gz: 89755069a82bc70380dca99e637379da4b2bf16ad0c61b2f2d0b985d1fe3d1247e1b5242ccfc41fa30ff270963d8c203eab1ed52dc612212c37dc6df2f312510

data/.gitignore

@@ -25,5 +25,5 @@ foo*.jpg
 SessionID_BarcodeImage.JPG
 
 tess*
-
+.byebug_history
 /*.jpg

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/lib/sqed.rb

@@ -53,16 +53,16 @@ class Sqed
   # Provide a boundary_finder, overrides metadata taken from pattern
   attr_accessor :boundary_finder 
    
-  def initialize(image: image, pattern: pattern, has_border: true, boundary_color: :green, use_thumbnail: true, boundary_finder: nil, layout: nil, metadata_map: nil)
-    raise 'extraction pattern not defined' if pattern && !SqedConfig::EXTRACTION_PATTERNS.keys.include?(pattern) 
+  def initialize(target_image: image, target_pattern: pattern, has_border: true, boundary_color: :green, use_thumbnail: true, boundary_finder: nil, target_layout: nil, metadata_map: nil)
+    raise 'extraction pattern not defined' if target_pattern && !SqedConfig::EXTRACTION_PATTERNS.keys.include?(target_pattern) 
 
     # data, and stubs for results
-    @image = image
+    @image = target_image
     @boundaries = nil
     @stage_boundary = Sqed::Boundaries.new(:internal_box) 
 
     # extraction metadata
-    @pattern = (pattern || :cross)
+    @pattern = (target_pattern || :cross)
     @has_border = has_border
     @boundary_finder = boundary_finder.constantize if boundary_finder
     @layout = layout
@@ -76,13 +76,13 @@ class Sqed
   # @return [Hash]
   #   federate extraction options and apply user provided over-rides
   def extraction_metadata
-    data = SqedConfig::EXTRACTION_PATTERNS[@pattern]
+    data = SqedConfig::EXTRACTION_PATTERNS[pattern]
     
     data.merge!(boundary_color: boundary_color) 
     data.merge!(boundary_finder: @boundary_finder) if boundary_finder
     data.merge!(has_border: has_border) 
-    data.merge!(layout: layout) if layout 
-    data.merge!(metadata_map: metadata_map) if metadata_map
+    data.merge!(target_layout: layout) if layout 
+    data.merge!(target_metadata_map: metadata_map) if metadata_map
     data.merge!(use_thumbnail: use_thumbnail) 
     data
   end
@@ -136,16 +136,16 @@ class Sqed
     # pattern.nil? is no longer true -> must have values for all extraction_metadata keys
     return false if image.nil? || pattern.nil? 
     extractor = Sqed::Extractor.new(
-      boundaries: boundaries,
-      metadata_map: extraction_metadata[:metadata_map],
-      image: stage_image)
+      target_boundaries: boundaries,
+      target_metadata_map: extraction_metadata[:metadata_map],
+      target_image: stage_image)
     extractor.result
   end
 
   # @return [Hash]
   #   an overview of data/metadata, for debugging purposes only
   def attributes
-    { image: image,
+    { target_image: image,
       boundaries: boundaries,
       stage_boundary: stage_boundary
     }.merge!(extraction_metadata)
@@ -155,7 +155,7 @@ class Sqed
 
   def set_stage_boundary
     if has_border
-      boundary = Sqed::BoundaryFinder::StageFinder.new(image: image).boundaries
+      boundary = Sqed::BoundaryFinder::StageFinder.new(target_image: image).boundaries
       if boundary.populated? 
         @stage_boundary.set(0, boundary.for(0)) 
       else
@@ -167,8 +167,8 @@ class Sqed
   end
 
   def get_section_boundaries
-    options = {image: stage_image, use_thumbnail: use_thumbnail}
-    options.merge!( layout: extraction_metadata[:layout] ) unless extraction_metadata[:boundary_finder].name == 'Sqed::BoundaryFinder::CrossFinder'
+    options = {target_image: stage_image, use_thumbnail: use_thumbnail}
+    options.merge!( target_layout: extraction_metadata[:layout] ) unless extraction_metadata[:boundary_finder].name == 'Sqed::BoundaryFinder::CrossFinder'
     options.merge!( boundary_color: boundary_color) if extraction_metadata[:boundary_finder].name == 'Sqed::BoundaryFinder::ColorLineFinder'
 
     extraction_metadata[:boundary_finder].new(options).boundaries

data/lib/sqed/boundary_finder.rb

@@ -7,7 +7,7 @@ class Sqed::BoundaryFinder
   COLOR_DELTA = 1.3 # color (e.g. red) must be this much be *COLOR_DELTA > than other values (e.g. blue/green) 
 
   # the passed image
-  attr_reader :img
+  attr_reader :image
 
   # a symbol from SqedConfig::LAYOUTS
   attr_reader :layout
@@ -21,14 +21,14 @@ class Sqed::BoundaryFinder
   # when we compute using a derived thumbnail we temporarily store the full size image here
   attr_reader :original_image
 
-  def initialize(image: image, layout: layout, use_thumbnail: true)
-    raise 'No layout provided.' if layout.nil?
-    raise 'No image provided.' if image.nil? || image.class.name != 'Magick::Image'
+  def initialize(target_image: image, target_layout: layout, use_thumbnail: true)
+    raise 'No layout provided.' if target_layout.nil?
+    raise 'No image provided.' if target_image.nil? || target_image.class.name != 'Magick::Image'
 
     @use_thumbnail = use_thumbnail
 
-    @layout = layout
-    @img = image
+    @layout = target_layout
+    @image = target_image
     true
   end
 
@@ -38,14 +38,14 @@ class Sqed::BoundaryFinder
   end
 
   def longest_thumbnail_axis
-    img.columns > img.rows ? :width : :height 
+    image.columns > image.rows ? :width : :height 
   end
 
   def thumbnail_height
     if longest_thumbnail_axis == :height
       THUMB_SIZE
     else
-      (img.rows.to_f * (THUMB_SIZE.to_f / img.columns.to_f)).round.to_i
+      (image.rows.to_f * (THUMB_SIZE.to_f / image.columns.to_f)).round.to_i
     end
   end
 
@@ -53,21 +53,21 @@ class Sqed::BoundaryFinder
     if longest_thumbnail_axis == :width
       THUMB_SIZE
     else
-      (img.columns.to_f * (THUMB_SIZE.to_f / img.rows.to_f)).round.to_i
+      (image.columns.to_f * (THUMB_SIZE.to_f / image.rows.to_f)).round.to_i
     end
   end
 
   # see https://rmagick.github.io/image3.html#thumbnail
   def thumbnail
-    img.thumbnail(thumbnail_width, thumbnail_height)
+    image.thumbnail(thumbnail_width, thumbnail_height)
   end
 
   def width_factor
-    img.columns.to_f / thumbnail_width.to_f
+    image.columns.to_f / thumbnail_width.to_f
   end
 
   def height_factor
-    img.rows.to_f / thumbnail_height.to_f
+    image.rows.to_f / thumbnail_height.to_f
   end
 
   def zoom_boundaries
@@ -114,9 +114,9 @@ class Sqed::BoundaryFinder
   # @param scan
   #   (:rows|:columns), :rows finds vertical borders, :columns finds horizontal borders
   #
-  def self.color_boundary_finder(image: image, sample_subdivision_size: nil, sample_cutoff_factor: nil, scan: :rows, boundary_color: :green)
+  def self.color_boundary_finder(target_image: image, sample_subdivision_size: nil, sample_cutoff_factor: nil, scan: :rows, boundary_color: :green)
 
-    image_width = image.send(scan)
+    image_width = target_image.send(scan)
     sample_subdivision_size = get_subdivision_size(image_width) if sample_subdivision_size.nil?
     samples_to_take = (image_width / sample_subdivision_size).to_i - 1
 
@@ -125,9 +125,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 = target_image.crop(0, s * sample_subdivision_size, target_image.columns, 1, true)
       elsif scan == :columns
-        j = image.crop(s * sample_subdivision_size, 0, 1, image.rows, true)
+        j = target_image.crop(s * sample_subdivision_size, 0, 1, target_image.rows, true)
       else
         raise
       end

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -4,14 +4,14 @@ require 'rmagick'
 #
 class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
-  def initialize(image: image, layout: layout, boundary_color: :green, use_thumbnail: true)
-    super(image: image, layout: layout, use_thumbnail: use_thumbnail)
+  def initialize(target_image: image, target_layout: layout, boundary_color: :green, use_thumbnail: true)
+    super(target_image: target_image, target_layout: target_layout, use_thumbnail: use_thumbnail)
     raise 'No layout provided.' if @layout.nil?
     @boundary_color = boundary_color
 
    if use_thumbnail
-     @original_image = @img.copy
-     @img = thumbnail
+     @original_image = @image.copy
+     @image = thumbnail
    end  
     find_bands
   end
@@ -19,64 +19,64 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
   private
 
   def find_bands
-    case @layout    # boundaries.coordinates are referenced from stage image
+    case layout    # boundaries.coordinates are referenced from stage image
 
     # No specs for this yet
     when :seven_slot
-      top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: img, scan: :columns, boundary_color: @boundary_color)              # detect vertical division [array]
-      left_right_split = Sqed::BoundaryFinder.color_boundary_finder(image: img, sample_subdivision_size: 2, boundary_color: @boundary_color)  # detect horizontal division [array]
+      top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(target_image: image, scan: :columns, boundary_color: @boundary_color)              # detect vertical division [array]
+      left_right_split = Sqed::BoundaryFinder.color_boundary_finder(target_image: image, sample_subdivision_size: 2, boundary_color: @boundary_color)  # detect horizontal division [array]
 
       boundaries.set(0, [0, 0, left_right_split[0], top_bottom_split[0] ])  
-      boundaries.set(6, [0, top_bottom_split[2], left_right_split[0], img.rows - top_bottom_split[2] ] )  
+      boundaries.set(6, [0, top_bottom_split[2], left_right_split[0], image.rows - top_bottom_split[2] ] )  
 
-      right_top_img = img.crop( left_right_split[2], 0, img.columns - left_right_split[2], top_bottom_split[0] , true) # sections 1,2
-      right_bottom_img = img.crop(left_right_split[2], top_bottom_split[2], img.columns - left_right_split[2], img.rows - top_bottom_split[2], true)  # sections 3,4,5
+      right_top_image = image.crop( left_right_split[2], 0, image.columns - left_right_split[2], top_bottom_split[0] , true) # sections 1,2
+      right_bottom_image = image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)  # sections 3,4,5
 
-      right_top_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_top_img, boundary_color: @boundary_color)) # vertical line b/w 1 & 2, use "corrected_frequency" to account for color bleed from previous crop
+      right_top_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(target_image: right_top_image, boundary_color: @boundary_color)) # vertical line b/w 1 & 2, use "corrected_frequency" to account for color bleed from previous crop
 
       boundaries.set(1, [left_right_split[2], 0, right_top_split[0], top_bottom_split[0] ])
-      boundaries.set(2, [left_right_split[2] + right_top_split[2], 0, right_top_img.columns - right_top_split[2], top_bottom_split[0] ]   )  
+      boundaries.set(2, [left_right_split[2] + right_top_split[2], 0, right_top_image.columns - right_top_split[2], top_bottom_split[0] ]   )  
 
-      right_bottom_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_img, scan: :columns, sample_subdivision_size: 2, boundary_color: @boundary_color)) # horizontal line b/w (5,3) & 4, use "corrected_frequency" to account for color bleed from previous crop
+      right_bottom_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(target_image: right_bottom_image, scan: :columns, sample_subdivision_size: 2, boundary_color: @boundary_color)) # horizontal line b/w (5,3) & 4, use "corrected_frequency" to account for color bleed from previous crop
       
-      bottom_right_top_img = right_bottom_img.crop(0,0, img.columns - left_right_split[2], right_bottom_split[2], true) # 3,5 
+      bottom_right_top_image = right_bottom_image.crop(0,0, image.columns - left_right_split[2], right_bottom_split[2], true) # 3,5 
 
-      boundaries.set(3, [ left_right_split[2] + right_top_split[2], top_bottom_split[2], left_right_split[2] + right_top_split[2], bottom_right_top_img.rows ] )   
-      boundaries.set(5, [ left_right_split[2], top_bottom_split[2], right_top_split[0], bottom_right_top_img.rows ] )
+      boundaries.set(3, [ left_right_split[2] + right_top_split[2], top_bottom_split[2], left_right_split[2] + right_top_split[2], bottom_right_top_image.rows ] )   
+      boundaries.set(5, [ left_right_split[2], top_bottom_split[2], right_top_split[0], bottom_right_top_image.rows ] )
       
-      boundaries.set(4, [ left_right_split[2], top_bottom_split[2] + right_top_split[2], img.columns - left_right_split[2],  right_bottom_img.rows - right_top_split[2] ] ) 
+      boundaries.set(4, [ left_right_split[2], top_bottom_split[2] + right_top_split[2], image.columns - left_right_split[2],  right_bottom_image.rows - right_top_split[2] ] ) 
 
     when :vertical_split 
-      t = Sqed::BoundaryFinder.color_boundary_finder(image: img, boundary_color: @boundary_color)  #detect vertical division
+      t = Sqed::BoundaryFinder.color_boundary_finder(target_image: image, boundary_color: @boundary_color)  #detect vertical division
       return if t.nil?
-      boundaries.set(0, [0, 0, t[0], img.rows])  # left section of image
-      boundaries.set(1, [t[2], 0, img.columns - t[2], img.rows])  # right section of image
+      boundaries.set(0, [0, 0, t[0], image.rows])  # left section of image
+      boundaries.set(1, [t[2], 0, image.columns - t[2], image.rows])  # right section of image
 
     when :horizontal_split
-      t = Sqed::BoundaryFinder.color_boundary_finder(image: img, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division
+      t = Sqed::BoundaryFinder.color_boundary_finder(target_image: image, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division
       return if t.nil?
 
-      boundaries.set(0, [0, 0, img.columns, t[0]])  # upper section of image
-      boundaries.set(1, [0, t[2], img.columns, img.rows - t[2]])  # lower section of image
+      boundaries.set(0, [0, 0, image.columns, t[0]])  # upper section of image
+      boundaries.set(1, [0, t[2], image.columns, image.rows - t[2]])  # lower section of image
 
     when :right_t # only 3 zones expected, with horizontal division in right-side of vertical division
-      vertical = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      vertical = self.class.new(target_image: @image, target_layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
 
-      irt = img.crop(*vertical.for(1), true)
-      right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      irt = image.crop(*vertical.for(1), true)
+      right = self.class.new(target_image: irt, target_layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
       
       boundaries.set(0, vertical.for(0))    
       boundaries.set(1, [ vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ] ) 
       boundaries.set(2, [ vertical.x_for(1), right.y_for(1), right.width_for(1), right.height_for(1)] )  
 
     when :vertical_offset_cross   # 4 zones expected, with (varying) horizontal division in left- and right- sides of vertical division
-      vertical = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries
+      vertical = self.class.new(target_image: @image, target_layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries
 
-      ilt = img.crop(*vertical.for(0), true) 
-      irt = img.crop(*vertical.for(1), true)
+      ilt = image.crop(*vertical.for(0), true) 
+      irt = image.crop(*vertical.for(1), true)
 
-      left = self.class.new(image: ilt, layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries   # fails
-      right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries # OK
+      left = self.class.new(target_image: ilt, target_layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries   # fails
+      right = self.class.new(target_image: irt, target_layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries # OK
 
       boundaries.set(0, [0, 0, left.width_for(0), left.height_for(0) ]) 
       boundaries.set(1, [vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ]) 
@@ -85,13 +85,13 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
     # No specs for this yet
     when :horizontal_offset_cross
-      horizontal = self.class.new(image: @img, layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      horizontal = self.class.new(target_image: @image, target_layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
 
-      itop = img.crop(*horizontal.for(0), true) 
-      ibottom = img.crop(*horizontal.for(1), true)
+      itop = image.crop(*horizontal.for(0), true) 
+      ibottom = image.crop(*horizontal.for(1), true)
 
-      top = self.class.new(image: ilt, layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
-      bottom = self.class.new(image: irt, layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      top = self.class.new(target_image: ilt, target_layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      bottom = self.class.new(target_image: irt, target_layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
 
       boundaries.set(0, [0, 0, top.width_for(0), top.height_for(0) ]) 
       boundaries.set(1, [top.x_for(1), 0, top.width_for(1), top.height_for(1) ]) 
@@ -99,8 +99,8 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       boundaries.set(3, [0, horizontal.y_for(1), bottom.width_for(0), bottom.height_for(0) ]) 
 
     when :cross # 4 zones, with perfectly intersected horizontal and vertical division
-      v = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
-      h = self.class.new(image: @img, layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries 
+      v = self.class.new(target_image: @image, target_layout: :vertical_split, boundary_color: @boundary_color, use_thumbnail: false ).boundaries
+      h = self.class.new(target_image: @image, target_layout: :horizontal_split, boundary_color: @boundary_color, use_thumbnail: false).boundaries 
   
       return if v.nil? || h.nil?
 
@@ -111,13 +111,13 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
     else # no @layout provided !?
 
-      boundaries.set(0, [0, 0, img.columns, img.rows])   # totality of image as default
+      boundaries.set(0, [0, 0, image.columns, image.rows])   # totality of image as default
     end
 
     boundaries.complete = true if boundaries.populated?
 
    if use_thumbnail
-     @img = @original_image
+     @image = @original_image
      zoom_boundaries
      @original_image = nil
    end

data/lib/sqed/boundary_finder/cross_finder.rb

@@ -4,14 +4,14 @@ require 'rmagick'
 #
 class Sqed::BoundaryFinder::CrossFinder < Sqed::BoundaryFinder
 
-  def initialize(image: image)
-    @img = image
+  def initialize(target_image: image)
+    @image = target_image
     find_edges 
   end
 
   def find_edges
-    width = @img.columns / 2
-    height = @img.rows / 2
+    width = image.columns / 2
+    height = image.rows / 2
 
     boundaries.coordinates[0] = [0, 0, width, height] 
     boundaries.coordinates[1] = [width, 0, width, height] 

data/lib/sqed/boundary_finder/stage_finder.rb

@@ -15,20 +15,20 @@ class Sqed::BoundaryFinder::StageFinder < Sqed::BoundaryFinder
 
   attr_reader :x0, :y0, :x1, :y1, :min_width, :min_height, :rows, :columns
 
-  def initialize(image: image, is_border_proc: nil, min_ratio: MIN_CROP_RATIO)
-    super(image: image, layout: :internal_box) 
+  def initialize(target_image: image, is_border_proc: nil, min_ratio: MIN_CROP_RATIO)
+    super(target_image: target_image, target_layout: :internal_box) 
 
     @min_ratio = min_ratio
 
     # Initial co-ordinates
     @x0, @y0 = 0, 0
-    @x1, @y1 = img.columns, img.rows
-    @min_width, @min_height = img.columns * @min_ratio, img.rows * @min_ratio # minimum resultant area
-    @columns, @rows = img.columns, img.rows
+    @x1, @y1 = image.columns, image.rows
+    @min_width, @min_height = image.columns * @min_ratio, image.rows * @min_ratio # minimum resultant area
+    @columns, @rows = image.columns, image.rows
 
     
     # We need a border finder proc. Provide one if none was given.
-    @is_border = is_border_proc || self.class.default_border_finder(img) # if no proc specified, use default below
+    @is_border = is_border_proc || self.class.default_border_finder(image) # if no proc specified, use default below
 
     @x00 = @x0
     @y00 = @y0
@@ -53,7 +53,7 @@ class Sqed::BoundaryFinder::StageFinder < Sqed::BoundaryFinder
   # fails for 0.75, (0.18, 0.17,0.16,0.15); 0.70, 0.18;
   #
   # this sets variables (locally) for find_edges
-  def self.default_border_finder(img, samples = 5, threshold = 0.75, fuzz_factor = 0.40) # working on non-synthetic images 04-dec-2014
+  def self.default_border_finder(image, samples = 5, threshold = 0.75, fuzz_factor = 0.40) # working on non-synthetic images 04-dec-2014
     fuzz = ((Magick::QuantumRange + 1) * fuzz_factor).to_i
     # Returns true if the edge is a border (border meaning outer region to be cropped)
     lambda do |edge|
@@ -122,11 +122,11 @@ class Sqed::BoundaryFinder::StageFinder < Sqed::BoundaryFinder
   end
 
   def vline(x)
-    img.get_pixels x, @y00, 1, @height0 - 1
+    image.get_pixels x, @y00, 1, @height0 - 1
   end
 
   def hline(y)
-    img.get_pixels @x00, y, @width0 - 1, 1
+    image.get_pixels @x00, y, @width0 - 1, 1
   end
 
   # actually  + 1 (starting at zero?)

data/lib/sqed/extractor.rb

@@ -4,6 +4,8 @@ require 'rmagick'
 # 
 class Sqed::Extractor
 
+  class Error < StandardError; end;
+
   # a Sqed::Boundaries instance 
   attr_accessor :boundaries
 
@@ -14,14 +16,14 @@ class Sqed::Extractor
   # a Magick::Image file
   attr_accessor :image
 
-  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.name == 'Magick::Image'
+  def initialize(target_boundaries: boundaries, target_metadata_map: metadata_map, target_image: image)
+    raise Error, 'boundaries not provided or provided boundary is not a Sqed::Boundaries' if target_boundaries.nil? || !target_boundaries.class == Sqed::Boundaries
+    raise Error, 'metadata_map not provided or metadata_map not a Hash' if target_metadata_map.nil? || !target_metadata_map.class == Hash
+    raise Error, 'image not provided' if target_image.nil? || !target_image.class.name == 'Magick::Image'
 
-    @metadata_map = metadata_map
-    @boundaries = boundaries
-    @image = image
+    @metadata_map = target_metadata_map
+    @boundaries = target_boundaries
+    @image = target_image
   end
 
   def result
@@ -32,6 +34,10 @@ class Sqed::Extractor
     # assign the images to the result
     boundaries.each do |section_index, coords|
       section_type = metadata_map[section_index]
+     
+      # TODO: raise this higher up the chain 
+      raise Error, "invalid section_type [#{section_type}]" if !SqedConfig::LAYOUT_SECTION_TYPES.include?(section_type)
+
       r.send("#{section_type}_image=", extract_image(coords))
       r.boundary_coordinates[section_type] = coords
     end 

data/lib/sqed/parser/barcode_parser.rb

@@ -1,7 +1,6 @@
 # Given an image, return an ordered array of detectable barcodes
-
-
-
+# 
+#
 class Sqed::Parser::BarcodeParser < Sqed::Parser
 
   TYPE = :barcode
@@ -23,7 +22,7 @@ class Sqed::Parser::BarcodeParser < Sqed::Parser
   # Uses the same enging as zbarimg that you can install with brew (zbarimg)
   #
   def get_code_128
-    ZXing.decode @image.filename
+    nil # ZXing.decode @image.filename
   end
 
   # try a bunch of options, organized by most common,  give the first hit

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/sqed_config.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'zxing'
+# require 'zxing'
 
 require_relative "sqed/parser"
 require_relative "sqed/parser/ocr_parser"

data/spec/lib/sqed/boundaries_spec.rb

@@ -33,7 +33,7 @@ describe Sqed::Boundaries do
   end
 
   context '#offset' do
-    let(:s) { Sqed.new(image: ImageHelpers.crossy_green_line_specimen, pattern: :vertical_offset_cross) }
+    let(:s) { Sqed.new(target_image: ImageHelpers.crossy_green_line_specimen, target_pattern: :vertical_offset_cross) }
     let(:offset_boundaries) { 
       s.crop_image
       s.boundaries.offset(s.stage_boundary) 

data/spec/lib/sqed/boundary_finder/color_line_finder_spec.rb

@@ -4,29 +4,29 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
 
   let(:image) { ImageHelpers.crossy_green_line_specimen }
 
-  let(:b) { Sqed::BoundaryFinder::StageFinder.new(image: image) }
+  let(:b) { Sqed::BoundaryFinder::StageFinder.new(target_image: image) }
   let(:c) {b.boundaries}
   let(:d) { image.crop(*c.for(0), true) }
   
-  let(:e) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :right_t, use_thumbnail: false) }
+  let(:e) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: d, target_layout: :right_t, use_thumbnail: false) }
   let(:f) { e.boundaries }
-  let(:g) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :vertical_offset_cross, use_thumbnail: false)}
+  let(:g) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: d, target_layout: :vertical_offset_cross, use_thumbnail: false)}
   let(:h) { g.boundaries }
-  let(:gv) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :vertical_split, use_thumbnail: false) }
+  let(:gv) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: d, target_layout: :vertical_split, use_thumbnail: false) }
   let(:hv) { gv.boundaries }
  
   let(:ah) { ImageHelpers.vertical_offset_cross_red }
-  let(:bh) { Sqed::BoundaryFinder::StageFinder.new(image: ah) }
+  let(:bh) { Sqed::BoundaryFinder::StageFinder.new(target_image: ah) }
   let(:ch) { bh.boundaries }
   let(:dh) { ah.crop(*ch.for(0), true) }
-  let(:gh) { Sqed::BoundaryFinder::ColorLineFinder.new(image: dh, layout: :horizontal_split, boundary_color: :red, use_thumbnail: false) } # was :horizontal_split
+  let(:gh) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: dh, target_layout: :horizontal_split, boundary_color: :red, use_thumbnail: false) } # was :horizontal_split
   let(:hh) { gh.boundaries }
 
   let(:ibs) { ImageHelpers.black_stage_green_line_specimen } 
-  let(:bbs) { Sqed::BoundaryFinder::StageFinder.new(image: ibs) } 
+  let(:bbs) { Sqed::BoundaryFinder::StageFinder.new(target_image: ibs) } 
   let(:cbs) { bbs.boundaries }
   let(:dbs) { ibs.crop(*cbs.for(0), true) }
-  let(:gbs) { Sqed::BoundaryFinder::ColorLineFinder.new(image: dbs, layout: :vertical_offset_cross, use_thumbnail: false) }
+  let(:gbs) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: dbs, target_layout: :vertical_offset_cross, use_thumbnail: false) }
   let(:hbs) { gbs.boundaries }
 
   specify 'initial image columns are as expected for :image above' do
@@ -167,7 +167,7 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
   context 'thumbnail processing finds reasonable boundaries' do
 
     let(:thumb) { ImageHelpers.frost_stage_thumb  }
-    let(:finder) { Sqed::BoundaryFinder::ColorLineFinder.new(image: thumb, layout: :cross, use_thumbnail: false)}
+    let(:finder) { Sqed::BoundaryFinder::ColorLineFinder.new(target_image: thumb, target_layout: :cross, use_thumbnail: false)}
     let(:finder_boundaries) { finder.boundaries }
 
     let(:pct)  { 0.08 }

data/spec/lib/sqed/boundary_finder/cross_finder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Sqed::BoundaryFinder::CrossFinder do
   let(:image) { ImageHelpers.of_size(800, 600) }
-  let(:b) {Sqed::BoundaryFinder::CrossFinder.new(image: image)}
+  let(:b) {Sqed::BoundaryFinder::CrossFinder.new(target_image: image)}
   let(:c) {b.boundaries}
 
   specify '#boundaries returns a Sqed::Boundaries instance' do

data/spec/lib/sqed/boundary_finder/stage_finder_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Sqed::BoundaryFinder::StageFinder do 
-  let(:b) {Sqed::BoundaryFinder::StageFinder.new(image: ImageHelpers.cross_green )}
+  let(:b) {Sqed::BoundaryFinder::StageFinder.new(target_image: ImageHelpers.cross_green )}
 
   specify '#is border contains a proc' do
     expect(b.is_border.class).to eq(Proc)

data/spec/lib/sqed/boundary_finder_spec.rb

@@ -7,11 +7,11 @@ describe Sqed::BoundaryFinder do
   end
 
   context 'when initiated with an image' do
-    let(:b) {Sqed::BoundaryFinder.new(image: ImageHelpers.cross_green, layout: :vertical_offset_cross)}
+    let(:b) {Sqed::BoundaryFinder.new(target_image: ImageHelpers.cross_green, target_layout: :vertical_offset_cross)}
 
     context 'attributes' do
-      specify '#img' do
-        expect(b).to respond_to(:img)
+      specify '#image' do
+        expect(b).to respond_to(:image)
       end
     end
 
@@ -20,16 +20,16 @@ describe Sqed::BoundaryFinder do
     end
   end
 
-  context '.color_boundary_finder(image: image)' do
+  context '.color_boundary_finder(target_image: image)' do
     context 'with sample_subdivision_size: 10' do
       specify 'finds the vertical dividing line in a standard cross, with border still present' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.cross_green, sample_subdivision_size: 10 )[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.cross_green, sample_subdivision_size: 10 )[1]
         expect(center).to be > 492
         expect(center).to be < 504
       end
       
       specify 'finds the vertical dividing line in a right t green cross, with border still present' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.right_t_green, sample_subdivision_size: 10)[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.right_t_green, sample_subdivision_size: 10)[1]
         expect(center).to be > 695
         expect(center).to be < 705 
       end
@@ -37,59 +37,59 @@ describe Sqed::BoundaryFinder do
 
     context 'with sample_subdivision_size auto set' do
       specify 'finds the vertical dividing line in a standard cross, with border still present, when more precise' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.cross_green, sample_cutoff_factor: 0.7)[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.cross_green, sample_cutoff_factor: 0.7)[1]
         expect(center).to be > 492
         expect(center).to be < 504
       end
 
       specify 'finds the vertical dividing line a real image, with border still present' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen)[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.crossy_green_line_specimen)[1]
         expect(center).to be > 2452
         expect(center).to be < 2495 
       end
 
       specify 'finds the vertical dividing line a real image, with border still present, with 10x fewer subsamples' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 100 )[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 100 )[1]
         expect(center).to be > 2452
         expect(center).to be < 2495 
       end
 
       specify 'finds the vertical dividing line a real image, with border still present, with 50x fewer subsamples' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 500 )[1]
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 500 )[1]
         expect(center).to be > 2452
         expect(center).to be < 2495 
       end
 
       specify 'FAILS to find the vertical dividing line a real image, with border still present, with 200x fewer subsamples' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
         expect(center).to be nil
       end
 
       specify 'finds the vertical dividing line another real image, with border still present' do
-        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image)[1]
+        center = Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.greenline_image)[1]
         expect(center).to be > 2445
         expect(center).to be < 2495
       end
 
       specify 'finds the vertical dividing line another real image, with border still present, and 20x fewer subsamples' do
-        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 200)[1]
+        center = Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.greenline_image, sample_subdivision_size: 200)[1]
         expect(center).to be > 2445
         expect(center).to be < 2495
       end
 
       specify 'finds the vertical dividing line another real image, with border still present, and 50x fewer subsamples' do
-        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 500)[1]
+        center = Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.greenline_image, sample_subdivision_size: 500)[1]
         expect(center).to be > 2445
         expect(center).to be < 2495
       end
 
       specify 'FAILS to find the vertical dividing line in a standard cross, with border still present, when even more precise' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.cross_green, sample_cutoff_factor: 1)
+        center =  Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.cross_green, sample_cutoff_factor: 1)
         expect(center).to be nil
       end
 
       specify 'finds the horizontal dividing line another real image, with border still present' do
-        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, scan: :columns)[1]
+        center = Sqed::BoundaryFinder.color_boundary_finder(target_image: ImageHelpers.greenline_image, scan: :columns)[1]
         expect(center).to be > 1282
         expect(center).to be < 1332 
       end
@@ -116,7 +116,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from crossy_black_line_specimen image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.crossy_black_line_specimen, pattern: :vertical_offset_cross, boundary_color: :black)
+      @s = Sqed.new(target_image: ImageHelpers.crossy_black_line_specimen, target_pattern: :vertical_offset_cross, boundary_color: :black)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
       true
@@ -145,7 +145,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from black_green_line_specimen image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.black_stage_green_line_specimen, pattern: :vertical_offset_cross)
+      @s = Sqed.new(target_image: ImageHelpers.black_stage_green_line_specimen, target_pattern: :vertical_offset_cross)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
       true 
@@ -173,7 +173,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from original red_line image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.vertical_offset_cross_red, pattern: :right_t, boundary_color: :red)
+      @s = Sqed.new(target_image: ImageHelpers.vertical_offset_cross_red, target_pattern: :right_t, boundary_color: :red)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
     }

data/spec/lib/sqed/extractor_spec.rb

@@ -9,15 +9,15 @@ describe Sqed::Extractor do
 
   let(:boundaries) { 
     Sqed::BoundaryFinder::CrossFinder.new(
-      image: image
+      target_image: image
     ).boundaries
   }
 
   let(:e) {
     Sqed::Extractor.new(
-      boundaries: boundaries,
-      image: image,
-      metadata_map: metadata_map
+      target_boundaries: boundaries,
+      target_image: image,
+      target_metadata_map: metadata_map
     )
   }
 

data/spec/lib/sqed_spec.rb

@@ -70,7 +70,7 @@ describe Sqed do
   context 'all together, without border' do
     let(:image) { ImageHelpers.frost_stage }
     let(:pattern) { :vertical_offset_cross }
-    let(:s) { Sqed.new(image: image, pattern: pattern, has_border: false)  }
+    let(:s) { Sqed.new(target_image: image, target_pattern: pattern, has_border: false)  }
 
     specify '#boundaries returns a Sqed::Boundaries instance' do
       expect(s.boundaries.class.name).to eq('Sqed::Boundaries')
@@ -115,7 +115,7 @@ describe Sqed do
   context 'all together, with border' do
     let(:image) { ImageHelpers.greenline_image }
     let(:pattern) { :right_t }
-    let(:s) { Sqed.new(image: image, pattern: pattern, has_border: true)  }
+    let(:s) { Sqed.new(target_image: image, target_pattern: pattern, has_border: true)  }
 
     specify '#boundaries returns a Sqed::Boundaries instance' do
       expect(s.boundaries.class.name).to eq('Sqed::Boundaries')

data/spec/lib/stage_handling/seven_slot_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'handling 7 slot stages' do
 
   let(:image) { ImageHelpers.inhs_stage_7_slot }
-  let(:sqed) { Sqed.new( image: image, pattern: :seven_slot, boundary_color: :red, has_border: false ) }
+  let(:sqed) { Sqed.new(target_image: image, target_pattern: :seven_slot, boundary_color: :red, has_border: false ) }
 
   context 'parses' do
     specify 'new() without errors' do

data/sqed.gemspec

@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rake'
+  spec.add_dependency 'rake', '~> 11.1.2'
   spec.add_dependency 'rmagick', '~> 2.14'  
   spec.add_dependency 'rtesseract', '~> 1.2.6'
-  spec.add_dependency 'zxing_cpp', '~> 0.1.0'
 
-  spec.add_development_dependency 'rspec', '~> 3.3'
+  # A qrcode reader, too many problems with compiling, dependencies
+  # spec.add_dependency 'zxing_cpp', '~> 0.1.0'
+
+  spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'did_you_mean', '~> 0.9'
+  # spec.add_development_dependency 'did_you_mean', '~> 0.9'
   spec.add_development_dependency 'byebug'
   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.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.2
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -53,34 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
-- !ruby/object:Gem::Dependency
-  name: zxing_cpp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: did_you_mean
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -228,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Specimens Quickly Extracted and Digitized, or just "squid". A ruby gem for