OCR.find_all_in_string: handle newlines and semicolons

barsoom · Sep 26, 2016 · a91729e · a91729e
1 parent 7c2a046
commit a91729e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/banktools-se/ocr.rb b/lib/banktools-se/ocr.rb
@@ -63,7 +63,9 @@ def self.to_number(number, length_digit: false, pad: "")
       end
 
       def self.find_all_in_string(string, length_digit: false, pad: "")
-        string.scan(/\d+/).select { |candidate|
+        expanded_string = string + " " + string.gsub("\n", "") + " " + string.gsub(";", "")
+
+        expanded_string.scan(/\d+/).select { |candidate|
           begin
             to_number(candidate, length_digit: length_digit, pad: pad)
             true

diff --git a/spec/ocr_spec.rb b/spec/ocr_spec.rb
@@ -82,6 +82,16 @@
       expect(BankTools::SE::OCR.find_all_in_string("x1230x")).to eq [ "1230" ]
     end
 
+    it "handles OCR numbers both separated and split by newlines" do
+      expect(BankTools::SE::OCR.find_all_in_string("1230\n4564")).to eq [ "1230", "4564", "12304564" ]
+      expect(BankTools::SE::OCR.find_all_in_string("45\n64")).to eq [ "4564" ]
+    end
+
+    it "handles OCR numbers both separated and split by semicolons" do
+      expect(BankTools::SE::OCR.find_all_in_string("1230;4564")).to eq [ "1230", "4564", "12304564" ]
+      expect(BankTools::SE::OCR.find_all_in_string("45;64")).to eq [ "4564" ]
+    end
+
     it "excludes duplicates" do
       expect(BankTools::SE::OCR.find_all_in_string("1230 1230 4564")).to eq [ "1230", "4564" ]
     end