banktools-se 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e034f74096ed867627484354817c11aba890bb
-  data.tar.gz: 0418f31cf0df526976031a3cbeee701f59fc0a58
+  metadata.gz: 4f480d8889741823d7cc4e020dff15d39406fd68
+  data.tar.gz: 547a6c83c6fe15e4a6e17f943a9b1b925ff1f3ad
 SHA512:
-  metadata.gz: d53bc1373a91f12a8a65ea3b2e09734f0e6e23fa25a16af4c63fd6b5a577919b955b18c60327ef8d5b20ba828e6826a287dbdce77b481da71bf5b9f409365270
-  data.tar.gz: b1babe91af17f1029af9d71fea57cf0fb6819e8bcab2922c0579169a68a84ed575bc005b279d3eba4e22c3653af1c2fb1ce72325f58c16318d49ae4e9d3197b1
+  metadata.gz: e2b9fa6aeae917ee57d0b2c98303b4437fdb9f7f084ef873cffefc3c9d243a111565f0bf52b7fb10e9af6cc502fee6a72c45ac021e344f9ba6dcdabeaab4b770
+  data.tar.gz: 1070b2bcecd0aca9bdb4a2de78bd94111242a42fa28b072d4ec06fccb15cc8f17e69bc269e0eb218ac4a8b1467b16b8cf68fec6242898da9c03e0f00bf2e0cb8

data/README.markdown

@@ -34,11 +34,14 @@ Inspired by [iulianu/iban-tools](https://github.com/iulianu/iban-tools). Please
     fundraising_account.fundraising?  # => true
 
     # OCR
+
     BankTools::SE::OCR.from_number("123")  # => "1230"
     BankTools::SE::OCR.from_number("123", length_digit: true)  # => "12351"
     BankTools::SE::OCR.from_number("123", length_digit: true, pad: "0")  # => "123067"
+
     BankTools::SE::OCR.to_number("1230")  # => "123"
     BankTools::SE::OCR.to_number("123067", length_digit: true, pad: "0")  # => "123"
+    BankTools::SE::OCR.to_number("1230", length_digit: true, pad: "0")  # Raises exception because there's no length digit or padding.
 
     # Plusgiro
 

data/lib/banktools-se/ocr.rb

@@ -5,6 +5,8 @@ module BankTools
     class OCR
       class InvalidOCR < StandardError; end
       class OverlongOCR < InvalidOCR; end
+      class BadPadding < InvalidOCR; end
+      class BadLengthDigit < InvalidOCR; end
       class BadChecksum < InvalidOCR; end
       class MustBeNumeric < InvalidOCR; end
 
@@ -34,14 +36,27 @@ module BankTools
 
       def self.to_number(number, opts = {})
         number = number.to_s
-        strip_length_digit = opts.fetch(:length_digit, false)
+        should_have_length_digit = opts.fetch(:length_digit, false)
         strip_padding = opts.fetch(:pad, "").to_s
 
         raise MustBeNumeric unless number.match(/\A\d+\z/)
         raise BadChecksum unless Utils.valid_luhn?(number)
 
+        if should_have_length_digit
+          length_digit = number[-2]
+          last_digit_of_actual_length = number.length.to_s[-1]
+          raise BadLengthDigit if length_digit != last_digit_of_actual_length
+        end
+
         digits_to_chop  = 1  # Checksum.
-        digits_to_chop += 1 if strip_length_digit
+        digits_to_chop += 1 if should_have_length_digit
+
+        if strip_padding.length > 0
+          expected_padding_end = -digits_to_chop - 1
+          expected_padding_start = expected_padding_end - strip_padding.length + 1
+          raise BadPadding if number[expected_padding_start..expected_padding_end] != strip_padding
+        end
+
         digits_to_chop += strip_padding.length
 
         number[0...-digits_to_chop]

data/lib/banktools-se/version.rb

@@ -1,5 +1,5 @@
 module BankTools
   module SE
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/spec/ocr_spec.rb

@@ -42,7 +42,7 @@ describe BankTools::SE::OCR do
       BankTools::SE::OCR.to_number("123456789023", length_digit: true).should eq "1234567890"
     end
 
-    it "can pad the number" do
+    it "strips the given padding" do
       BankTools::SE::OCR.to_number("1234567890037", length_digit: true, pad: "0").should eq "1234567890"
     end
 
@@ -50,6 +50,18 @@ describe BankTools::SE::OCR do
       expect { BankTools::SE::OCR.to_number("1231") }.to raise_error(BankTools::SE::OCR::BadChecksum)
     end
 
+    it "raises if length digit is wrong" do
+      expect { BankTools::SE::OCR.to_number("12369", length_digit: true) }.to raise_error(BankTools::SE::OCR::BadLengthDigit)
+    end
+
+    it "raises if padding doesn't match the given value" do
+      expect { BankTools::SE::OCR.to_number("1230", pad: "") }.not_to raise_error
+      expect { BankTools::SE::OCR.to_number("12302", pad: "0") }.not_to raise_error
+      expect { BankTools::SE::OCR.to_number("1230002", pad: "000") }.not_to raise_error
+
+      expect { BankTools::SE::OCR.to_number("12344", pad: "0") }.to raise_error(BankTools::SE::OCR::BadPadding)
+    end
+
     it "raises if input is non-numeric" do
       expect { BankTools::SE::OCR.to_number("garbage") }.to raise_error(BankTools::SE::OCR::MustBeNumeric)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banktools-se
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Henrik Nyh