ibandit 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af198971c12eee07f52d36f221c8aad6ae74d19
-  data.tar.gz: 6fd28ff02942241485baa88a467e2bac4243de76
+  metadata.gz: efe0d22849b9038cd0f8ba2d2a5ca9b73af14137
+  data.tar.gz: dbf58fdc4ba8242d3676b76b01f194a5d58c4412
 SHA512:
-  metadata.gz: 2d55d85858f2842f59c3ca940f5a1dea1638e39d191e1ed34f3a8e265a710cb673c2715b916c084e515044b561b98e2e9d18239afead21d67319e1290305f7b1
-  data.tar.gz: 1e62d33b36ac2a4d2b90cdce248a308b547721f493757fbb19f4a31bb48668a88d6fb72aecacf2932dc9daf33529e32d5d26922f6f46e98f01f686b8fcb8b7f8
+  metadata.gz: 254642c61af11750bc56d04714521b778a34ac4f9852d65eb426ab50cd820c828a90efd180058e2c6b453a4745162ecc731aaf9e4cbcd2fccbe156017d042edb
+  data.tar.gz: 1edbf221f87f7097760555697d26ec15bc7896906b3f63fd385c845f897cefebf17fa9dd74da3dff8e422e61004f3d132739f4a5e924c5cd4d14d5035c34e9f5

data/CHANGELOG.md

@@ -1,13 +1,20 @@
-## 0.2.1 - January 30, 2014
+## 0.3.0 - February 6, 2015
+
+- Move IBANBuilder interface into main IBAN class by overloading its constructor
+- Move validation of local details input out of IBANBuilder into IBAN
+- Split `IBAN.valid_length?` into individual checks on the length of bank code, branch code, and account number
+- Return `nil` for fields which aren't present, rather than an empty string
+
+## 0.2.1 - January 30, 2015
 
 - Add Lithuania to IBANBuilder
 
-## 0.2.0 - January 27, 2014
+## 0.2.0 - January 27, 2015
 
 - Add GermanDetailsConverter
 
 
-## 0.1.1 - January 8, 2014
+## 0.1.1 - January 8, 2015
 
 - Add zero-padding to CheckDigit.spanish
 

data/README.md

@@ -56,6 +56,9 @@ iban.errors                    # => { country_code: "'XQ' is not a valid..." }
 
 The following error keys may be set:
 - `country_code`
+- `bank_code`
+- `branch_code`
+- `account_number`
 - `check_digits`
 - `characters`
 - `length`

data/bin/build_structure_file.rb

@@ -37,21 +37,57 @@ def get_iban_structures(iban_structures_file, iban_registry_file)
       account_number_position: country.account_number_position.to_i,
       account_number_length: country.account_number_length.to_i,
       total_length: country.total_length.to_i,
-      iban_national_id_length: country.iban_national_id_length.to_i,
-      bban_format: bban_formats[country.country_code]
-    }
+      iban_national_id_length: country.iban_national_id_length.to_i
+    }.merge(bban_formats[country.country_code])
   end
 end
 
 def get_bban_formats(iban_registry_file)
   iban_registry_file.each_with_object({}) do |line, hash|
     bban_structure = line['BBAN structure '].strip
+
+    bank_code_structure, branch_code_structure =
+      if line['Bank identifier length']
+        line['Bank identifier length'].split(/, Branch identifier length:? /)
+      else
+        ['', nil]
+      end
+
     country_code = line['Country code as defined in ISO 3166'].strip
-    hash[country_code] = convert_swift_convention(bban_structure)
+    hash[country_code] = convert_swift_convention(bban_structure,
+                                                  bank_code_structure,
+                                                  branch_code_structure)
   end
 end
 
-def convert_swift_convention(swift_string)
+# IBAN Registry has BBAN format (which seems to be accurate), and Bank
+# identifier length, which contains something roughly like the format for the
+# bank code and usually the branch code where applicable. This is a best attempt
+# to convert those from weird SWIFT-talk into regexes, and then work out the
+# account number format regex by taking the bank and branch code regexes off
+# the front of the BBAN format.
+#
+# This works about 70% of the time, the rest are overridden in
+# structure_additions.yml
+def convert_swift_convention(bban, bank, branch)
+  bban_regex = iban_registry_to_regex(bban)
+  bank_regex = iban_registry_to_regex(bank)
+  branch_regex = branch.nil? ? nil : iban_registry_to_regex(branch)
+
+  non_account_number_regex = [bank_regex, branch_regex].join
+  account_number_start = (bban_regex.index(non_account_number_regex) || 0) +
+                         non_account_number_regex.length
+  account_number_regex = bban_regex[account_number_start..-1]
+
+  {
+    bban_format:           bban_regex,
+    bank_code_format:      bank_regex,
+    branch_code_format:    branch_regex,
+    account_number_format: account_number_regex
+  }.reject { |_, value| value.nil? }
+end
+
+def iban_registry_to_regex(swift_string)
   swift_string.gsub(/(\d+)!([nac])/, '\2{\1}').
     gsub('n', '\d').
     gsub('a', '[A-Z]').

data/data/raw/structure_additions.yml

@@ -1,10 +1,23 @@
 ---
+AL:
+  :bank_code_format: \d{3}
+  :branch_code_format: \d{5}
+BR:
+  :bank_code_format: \d{8}
+  :branch_code_format: \d{5}
+  :account_number_format: '\d{10}[A-Z]{1}[A-Z0-9]{1}'
 BE:
   :local_check_digit_position: 15
   :local_check_digit_length: 2
+BH:
+  :bank_code_format: '[A-Z]{4}'
+  :account_number_format: '[A-Z0-9]{14}'
 DE:
   :bban_format: \d{8}\d{10}
+  :account_number_format: \d{10}
 EE:
+  :bank_code_format: '[1-9][0-9]'
+  :account_number_format: \d{2}\d{11}\d{1}
   :local_check_digit_position: 20
   :local_check_digit_length: 1
 ES:
@@ -12,31 +25,61 @@ ES:
   :local_check_digit_length: 2
 FI:
   :bban_format: \d{6}\d{7}\d{1}
+  :bank_code_format: \d{6}
+  :account_number_format: \d{7}\d{1}
   :local_check_digit_position: 18
   :local_check_digit_length: 1
 FR:
+  :branch_code_format: \d{5}
+  :account_number_format: '[A-Z0-9]{11}\d{2}'
   :local_check_digit_position: 26
   :local_check_digit_length: 2
+GB:
+  :branch_code_format: \d{6}
+  :account_number_format: \d{8}
 HU:
   :bban_format: \d{3}\d{4}\d{1}\d{15}\d{1}
+  :account_number_format: \d{1}\d{15}\d{1}
 IT:
   :local_check_digit_position: 5
   :local_check_digit_length: 1
+LB:
+  :bban_format: \d{4}[A-Z0-9]{20}
+  :bank_code_format: \d{4}
+  :account_number_format: '[A-Z0-9]{14}'
 MC:
   :local_check_digit_position: 26
   :local_check_digit_length: 2
+MU:
+  :bban_format: '[A-Z]{4}\d{2}\d{2}\d{12}\d{3}[A-Z]{3}'
+  :bank_code_format: '[A-Z]{4}\d{2}'
+  :branch_code_format: \d{2}
+  :account_number_format: '\d{12}\d{3}[A-Z]{3}'
 NL:
   :local_check_digit_position: 18
   :local_check_digit_length: 1
 PT:
+  :branch_code_format: \d{4}
+  :account_number_format: \d{11}\d{2}
   :local_check_digit_position: 24
   :local_check_digit_length: 2
 QA:
   :bban_format: '[A-Z]{4}[A-Z0-9]{21}'
+  :bank_code_format: '[A-Z]{4}'
+  :account_number_format: '[A-Z0-9]{21}'
+SA:
+  :bank_code_format: \d{2}
+  :account_number_format: '[A-Z0-9]{18}'
+SI:
+  :bank_code_format: \d{5}
+  :account_number_format: \d{8}\d{2}
 SK:
   :local_check_digit_position: 14
   :local_check_digit_length: 1
 SM:
+  :bank_code_format: \d{5}
+  :branch_code_format: \d{5}
+  :account_number_format: '[A-Z0-9]{12}'
   :local_check_digit_position: 5
   :local_check_digit_length: 1
 TL: