ruby_marks 0.2.0 → 0.2.1

data/README.md

@@ -423,10 +423,12 @@ end
 ```ruby
 # Will execute your custom code if didn't a group isn't found, or it have a line count different than expected,
 # or in one or more lines the options marks found are different of the specified in marks options.
-# It returns the recognizer object, a boolean value to incorrect expected lines count, and a boolean value
-# to incorrect bubble line found, and a boolean value to bubbles adjusted or not.
+# It returns the recognizer object, a boolean value to incorrect expected lines count, and a hash with the 
+# incorrect bubble lines found, and a hash with the coordinates of bubbles adjusted.
+# Pay attention on incorrect_expected_lines and incorrect_bubble_line_found, because if some of this variables
+# becomes present, then your document may have an incorrect result scan...
 
-recognizer.add_watcher :clock_mark_difference_watcher do |recognizer, incorrect_expected_lines, incorrect_bubble_line_found, bubbles_adjusted|
+recognizer.add_watcher :incorrect_group_watcher do |recognizer, incorrect_expected_lines, incorrect_bubble_line_found, bubbles_adjusted|
   # place your custom code 
 end
 ```

data/lib/ruby_marks/group.rb

@@ -6,11 +6,10 @@ module RubyMarks
     attr_accessor :mark_width, :mark_height, :marks_options, :coordinates, :expected_coordinates,
                   :mark_width_tolerance, :mark_height_tolerance, :marks, :distance_between_marks
 
-
     def initialize(label, recognizer)
       @label = label
       @recognizer = recognizer
-      
+
       @mark_width  = @recognizer.config.default_mark_width
       @mark_height = @recognizer.config.default_mark_height
 

data/lib/ruby_marks/recognizer.rb

@@ -4,7 +4,7 @@ module RubyMarks
   class Recognizer
     
     attr_reader   :file, :raised_watchers, :groups, :watchers, :file_str, :original_file_str
-    attr_accessor :config
+    attr_accessor :config, :groups_detected
 
 
     def initialize
@@ -23,6 +23,7 @@ module RubyMarks
       @file = @file.threshold(@config.calculated_threshold_level) 
       @original_file = @file
       @file = @file.edge(@config.edge_level)
+      @groups_detected = false
 
       @groups.each_pair do |label, group|
         group.marks = Hash.new { |hash, key| hash[key] = [] }
@@ -84,7 +85,7 @@ module RubyMarks
       result = Hash.new { |hash, key| hash[key] = [] }
       result.tap do |result|
  
-        self.detect_groups
+        self.detect_groups unless @groups_detected
 
         @groups.each_pair do |label, group|        
           marks = Hash.new { |hash, key| hash[key] = [] }
@@ -92,14 +93,12 @@ module RubyMarks
             value.each do |mark|
               marks[line] << mark.value if mark.marked?
             end
+
+            multiple_marked_found = true if marks[line].size > 1            
+            unmarked_group_found  = true if marks[line].empty?
           end
-          
-          if marks.any?
-            result[group.label.to_sym] = marks
-            multiple_marked_found = true if marks.size > 1
-          else
-            unmarked_group_found = true
-          end  
+          marks.delete_if { |line, value| value.empty? }
+          result[group.label.to_sym] = marks if marks.any?
         end
 
         raise_watcher :scan_unmarked_watcher, result if unmarked_group_found
@@ -112,8 +111,8 @@ module RubyMarks
     def detect_groups    
       file_str = RubyMarks::ImageUtils.export_file_to_str(@file)
       original_file_str = RubyMarks::ImageUtils.export_file_to_str(@original_file)
-      incorrect_bubble_line_found = false
-      bubbles_adjusted = false
+      incorrect_bubble_line_found = Hash.new { |hash, key| hash[key] = [] }
+      bubbles_adjusted = []
       incorrect_expected_lines = false
       @groups.each_pair do |label, group|
         next unless group.expected_coordinates.any?
@@ -185,8 +184,6 @@ module RubyMarks
               first_position += marks.first.coordinates[:x1]
 
               elements_position_count += 1
-            else
-              incorrect_bubble_line_found = true
             end
           end
 
@@ -204,7 +201,7 @@ module RubyMarks
 
                     group.marks[line].delete(current_mark)
                     reprocess = true
-                    bubbles_adjusted = true
+                    bubbles_adjusted << current_mark.coordinates
                     break 
 
                   else
@@ -248,7 +245,7 @@ module RubyMarks
                       group.marks[line] << current_mark
                       group.marks[line].sort! { |a, b| a.coordinates[:x1] <=> b.coordinates[:x1] }
                       reprocess = true
-                      bubbles_adjusted = true
+                      bubbles_adjusted << current_mark.coordinates
                       break
                     end
                   end
@@ -261,11 +258,16 @@ module RubyMarks
             end
           end
 
+          group.marks.each_pair do |line, marks|
+            if marks.count != group.marks_options.count 
+              incorrect_bubble_line_found[group.label.to_sym] << line
+            end
+          end
         end
       end  
-
-      if incorrect_bubble_line_found || bubbles_adjusted || incorrect_expected_lines
-        raise_watcher :incorrect_group_watcher, incorrect_expected_lines, incorrect_bubble_line_found, bubbles_adjusted 
+      @groups_detected = true
+      if incorrect_bubble_line_found.any? || bubbles_adjusted.any? || incorrect_expected_lines 
+        raise_watcher :incorrect_group_watcher, incorrect_expected_lines, incorrect_bubble_line_found, bubbles_adjusted.flatten 
       end
     end
 
@@ -370,7 +372,7 @@ module RubyMarks
 
       file.tap do |file|
 
-        self.detect_groups
+        self.detect_groups unless @groups_detected
 
         @groups.each_pair do |label, group|  
 

data/lib/ruby_marks/version.rb

@@ -1,3 +1,3 @@
 module RubyMarks
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/test/ruby_marks/recognizer_test.rb

@@ -138,7 +138,7 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
     @file = 'assets/sheet_demo1_invalid.png'
     @recognizer.file = @file 
 
-    @recognizer.add_watcher :incorrect_group_watcher 
+    @recognizer.add_watcher :incorrect_group_watcher
 
     @recognizer.scan
     assert @recognizer.raised_watchers.include?(:incorrect_group_watcher)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_marks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: