ibandit 1.1.0 → 1.2.3

data/data/raw/swedish_bank_lookup.yml

@@ -1,8 +1,10 @@
 ---
 # Sources:
 # - https://sv.wikipedia.org/wiki/Lista_%C3%B6ver_clearingnummer_till_svenska_banker
-# - http://www.bgc.se/globalassets/dokument/tekniska-manualer/bankernaskontonummeruppbyggnad_tekniskmanual_sv.pdf
-# - SWIFT IBAN data
+# - Source before October 2020 (link now broken): http://www.bgc.se/globalassets/dokument/tekniska-manualer/bankernaskontonummeruppbyggnad_tekniskmanual_sv.pdf
+# - As of 30/10/2020: https://www.bankgirot.se/globalassets/dokument/anvandarmanualer/bankernaskontonummeruppbyggnad_anvandarmanual_sv.pdf
+# - Swedish Bankers' Association clearing numbers: https://www.swedishbankers.se/media/4245/1906_clearingnummer-institut.pdf
+# - https://transferwise.com/gb/iban/sweden
 #
 # Fields:
 # - Range:                  The range of clearing codes for this bank. Used to
@@ -400,6 +402,14 @@
   :zerofill_serial_number: false
   :include_clearing_code: true
   :validation_scheme: '1.2'
+- :range: [9770, 9779]
+  :bank: INTERGIRO INTL AB (PUBL)
+  :bank_code: 977
+  :clearing_code_length: 4
+  :serial_number_length: 17
+  :zerofill_serial_number: true
+  :include_clearing_code: false
+  :validation_scheme: '1.1'
 - :range: [9880, 9889]
   :bank: Riksgälden
   :bank_code: 988

data/data/structures.yml

@@ -95,7 +95,7 @@ BE:
   :national_id_length: 3
   :bban_format: "\\d{3}\\d{7}\\d{2}"
   :bank_code_format: "\\d{3}"
-  :account_number_format: "\\d{7}\\d{2}"
+  :account_number_format: "\\d{7}\\d{2}\\d{3}"
   :local_check_digit_position: 15
   :local_check_digit_length: 2
 BG:
@@ -902,7 +902,7 @@ US:
   :branch_code_length: 0
   :account_number_length: 17
   :bank_code_format: "\\d{9}"
-  :account_number_format: "\\A_*\\d{1,17}\\z"
+  :account_number_format: "_*\\d{1,17}"
   :national_id_length: 9
   :pseudo_iban_bank_code_length: 9
   :pseudo_iban_branch_code_length: 0

data/ibandit.gemspec

@@ -3,7 +3,7 @@
 require File.expand_path("lib/ibandit/version", __dir__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency "gc_ruboconfig",   "~> 2.12.0"
+  gem.add_development_dependency "gc_ruboconfig",   "~> 2.20.0"
   gem.add_development_dependency "nokogiri",        "~> 1.6"
   gem.add_development_dependency "pry",             "~> 0.10"
   gem.add_development_dependency "pry-nav",         "~> 0.2"

data/lib/ibandit/check_digit.rb

@@ -46,7 +46,7 @@ module Ibandit
         end
       end
 
-      (scaled_values.inject(:+) % 26 + 65).chr
+      (scaled_values.sum % 26 + 65).chr
     end
   end
 end

data/lib/ibandit/errors.rb

@@ -2,5 +2,6 @@
 
 module Ibandit
   class InvalidCharacterError < StandardError; end
+
   class UnsupportedAccountDetails < StandardError; end
 end

data/lib/ibandit/german_details_converter.rb

@@ -307,7 +307,7 @@ module Ibandit
         end
 
         def sum_of_weighted_values
-          weighted_values.reduce(0, &:+)
+          weighted_values.sum
         end
 
         def weighted_values
@@ -550,7 +550,7 @@ module Ibandit
         end
 
         def sum_of_weighted_digits
-          weighted_digits.reduce(0, &:+)
+          weighted_digits.sum
         end
 
         def weighted_digits
@@ -1045,7 +1045,7 @@ module Ibandit
       end
     end
 
-    class Rule004901 < BaseRule
+    class Rule004901 < Rule000000
       # Rule 0049 01 is actually about modulus checking, not IBAN construction
     end
 

data/lib/ibandit/iban.rb

@@ -9,7 +9,8 @@ module Ibandit
                 :swift_account_number, :source
 
     def initialize(argument)
-      if argument.is_a?(String)
+      case argument
+      when String
         input = argument.to_s.gsub(/\s+/, "").upcase
 
         pseudo_iban_splitter = PseudoIBANSplitter.new(input)
@@ -24,7 +25,7 @@ module Ibandit
           @iban = input
           extract_swift_details_from_iban!
         end
-      elsif argument.is_a?(Hash)
+      when Hash
         @source = :local_details
         build_iban_from_local_details(argument)
       else
@@ -225,7 +226,7 @@ module Ibandit
       return unless valid_country_code?
       return unless structure[:bban_format]
 
-      if bban&.match?(Regexp.new(structure[:bban_format]))
+      if bban&.match?(entire_string_regex(structure[:bban_format]))
         true
       else
         @errors[:format] = Ibandit.translate(:invalid_format,
@@ -238,7 +239,9 @@ module Ibandit
       return unless valid_bank_code_length?
       return true if structure[:bank_code_length]&.zero?
 
-      if swift_bank_code&.match?(Regexp.new(structure[:bank_code_format]))
+      if swift_bank_code&.match?(
+        entire_string_regex(structure[:bank_code_format]),
+      )
         true
       else
         @errors[:bank_code] = Ibandit.translate(:is_invalid)
@@ -250,7 +253,9 @@ module Ibandit
       return unless valid_branch_code_length?
       return true unless structure[:branch_code_format]
 
-      if swift_branch_code&.match?(Regexp.new(structure[:branch_code_format]))
+      if swift_branch_code&.match?(
+        entire_string_regex(structure[:branch_code_format]),
+      )
         true
       else
         @errors[:branch_code] = Ibandit.translate(:is_invalid)
@@ -262,7 +267,7 @@ module Ibandit
       return unless valid_account_number_length?
 
       if swift_account_number&.match?(
-        Regexp.new(structure[:account_number_format]),
+        entire_string_regex(structure[:account_number_format]),
       )
         true
       else
@@ -499,6 +504,10 @@ module Ibandit
       Ibandit.structures[country_code]
     end
 
+    def entire_string_regex(pattern)
+      Regexp.new("\\A#{pattern}\\z")
+    end
+
     def formatted
       iban.to_s.gsub(/(.{4})/, '\1 ').strip
     end

data/lib/ibandit/local_details_cleaner.rb

@@ -89,7 +89,9 @@ module Ibandit
     end
 
     def self.clean_ca_details(local_details)
-      return {} if local_details[:account_number].length < 7 # minimum length
+      account_number = local_details[:account_number].tr("-", "")
+
+      return {} if account_number.length < 7 # minimum length
 
       bank_code = if local_details[:bank_code].length == 3
                     local_details[:bank_code].rjust(4, "0")
@@ -98,7 +100,7 @@ module Ibandit
                   end
 
       {
-        account_number: local_details[:account_number].rjust(12, "0"),
+        account_number: account_number.rjust(12, "0"),
         bank_code: bank_code,
       }
     end
@@ -512,7 +514,7 @@ module Ibandit
         bank_code      = local_details[:bank_code]
         account_number = local_details[:account_number]
       else
-        cleaned_acct_number = local_details[:account_number].gsub(/[\s]/, "")
+        cleaned_acct_number = local_details[:account_number].gsub(/\s/, "")
 
         bank_code      = cleaned_acct_number.slice(2, 8)
         account_number = cleaned_acct_number[10..-1]

data/lib/ibandit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ibandit
-  VERSION = "1.1.0"
+  VERSION = "1.2.3"
 end

data/spec/fixtures/germany_integration_test_cases.json

@@ -134,7 +134,7 @@
   {
     "convertor": "001400",
     "valid": [
-      { "bank_code": "10090603", "account_number": "60624", "converted_bank_code": "30060601" }
+      { "bank_code": "30060601", "account_number": "60624", "converted_bank_code": "30060601" }
     ]
   },
   {
@@ -160,6 +160,12 @@
     "valid": [
       { "bank_code": "39060180", "account_number": "556", "converted_account_number": "0120440110" }
     ]
+  },
+  {
+    "convertor": "004901",
+    "valid": [
+      { "bank_code": "30060010", "account_number": "12345678", "converted_account_number": "12345678" }
+    ]
   }
   // {
   //   "convertor": "001900",

data/spec/fixtures/germany_unit_test_cases.json

@@ -435,5 +435,16 @@
     "valid": [
       { "bank_code": "10010010", "account_number" : "1234567890", "converted_bank_code": "66010200" }
     ]
+  },
+  {
+    "convertor": "004901",
+    "valid": [
+      {
+        "bank_code": "30060010",
+        "account_number": "1234567890",
+        "converted_bank_code": "30060010",
+        "converted_account_number": "1234567890"
+      }
+    ]
   }
 ]

data/spec/ibandit/iban_spec.rb

@@ -112,6 +112,22 @@ describe Ibandit::IBAN do
       its(:local_check_digits) { is_expected.to be_nil }
     end
 
+    context "when the IBAN was created from a Belgian IBAN" do
+      let(:iban_code) { "BE62510007547061" }
+
+      its(:country_code) { is_expected.to eq("BE") }
+      its(:bank_code) { is_expected.to eq("510") }
+      its(:branch_code) { is_expected.to be_nil }
+      its(:account_number) { is_expected.to eq("510007547061") }
+      its(:account_number_suffix) { is_expected.to be_nil }
+      its(:swift_bank_code) { is_expected.to eq("510") }
+      its(:swift_branch_code) { is_expected.to be_nil }
+      its(:swift_account_number) { is_expected.to eq("510007547061") }
+      its(:swift_national_id) { is_expected.to eq("510") }
+      its(:local_check_digits) { is_expected.to eq("61") }
+      its(:bban) { is_expected.to eq("510007547061") }
+    end
+
     context "when the IBAN was created with local details" do
       let(:arg) do
         {
@@ -452,6 +468,13 @@ describe Ibandit::IBAN do
         its(:to_s) { is_expected.to eq("") }
       end
 
+      context "and account number has invalid characters in" do
+        let(:account_number) { "123456XX789" }
+        let(:bank_code) { "0036" }
+
+        its(:valid?) { is_expected.to be false }
+      end
+
       context "and a 12 digit account number" do
         let(:account_number) { "012345678900" }
         let(:bank_code) { "0036" }
@@ -2247,16 +2270,16 @@ describe Ibandit::IBAN do
 
       context "with an invalid branch code" do
         let(:iban_code) { "GB60BARC20000055779911" }
+        let(:valid_bank_code) { true }
+        let(:valid_branch_code) { false }
+        let(:valid_account_number) { true }
+
         before { Ibandit.bic_finder = double(call: "BARCGB22XXX") }
 
         after { Ibandit.bic_finder = nil }
 
         before { iban.valid_local_modulus_check? }
 
-        let(:valid_bank_code) { true }
-        let(:valid_branch_code) { false }
-        let(:valid_account_number) { true }
-
         it "calls valid_branch_code? with an IBAN object" do
           expect(Ibandit.modulus_checker).
             to receive(:valid_branch_code?).

data/spec/ibandit/local_details_cleaner_spec.rb

@@ -167,6 +167,12 @@ describe Ibandit::LocalDetailsCleaner do
     its([:country_code]) { is_expected.to eq(country_code) }
     its([:bank_code]) { is_expected.to eq("0036") }
     its([:branch_code]) { is_expected.to eq("00063") }
+
+    context "with a hyphen" do
+      let(:account_number) { "0123456-789" }
+
+      its([:account_number]) { is_expected.to eq("000123456789") }
+    end
   end
 
   context "Cyprus" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - GoCardless
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gc_ruboconfig
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - TODO.md
 - bin/build_german_iban_rules.rb
 - bin/build_structure_file.rb
@@ -208,7 +209,7 @@ homepage: https://github.com/gocardless/ibandit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.
 test_files: []