ibandit 1.21.0 → 1.27.0

data/data/structures.yml

@@ -273,7 +273,7 @@ EE:
   :iban_example: EE382200221020145685
   :bban_example: '2200221020145685'
   :domestic_account_number_example: '221020145685'
-  :bban_format: "\\d{2}\\d{2}\\d{11}\\d{1}"
+  :bban_format: "\\d{2}\\d{14}"
   :bank_code_format: "[1-9][0-9]"
   :account_number_format: "\\d{2}\\d{11}\\d{1}"
   :local_check_digit_position: 20
@@ -286,7 +286,7 @@ ES:
   :account_number_position: 13
   :account_number_length: 12
   :total_length: 24
-  :national_id_length: 4
+  :national_id_length: 8
   :iban_example: ES9121000418450200051332
   :bban_example: '21000418450200051332'
   :domestic_account_number_example: 2100 0418 45 0200051332
@@ -841,8 +841,8 @@ PT:
   :domestic_account_number_example: 0002.0123.12345678901.54
   :bban_format: "\\d{4}\\d{4}\\d{11}\\d{2}"
   :bank_code_format: "\\d{4}"
-  :account_number_format: "\\d{11}\\d{2}"
   :branch_code_format: "\\d{4}"
+  :account_number_format: "\\d{11}\\d{2}"
   :local_check_digit_position: 24
   :local_check_digit_length: 2
 RO:
@@ -1103,10 +1103,10 @@ ST:
   :account_number_length: 13
   :total_length: 25
   :national_id_length: 8
-  :iban_example: ST68000200010192194210112
-  :bban_example: '000200010192194210112'
-  :domestic_account_number_example: '01921942101.12'
-  :bban_format: "\\d{4}\\d{4}\\d{11}\\d{2}"
+  :iban_example: ST23000100010051845310146
+  :bban_example: '000100010051845310146'
+  :domestic_account_number_example: '0051845310146'
+  :bban_format: "\\d{8}\\d{11}\\d{2}"
   :bank_code_format: "\\d{4}"
   :branch_code_format: "\\d{4}"
   :account_number_format: "\\d{11}\\d{2}"
@@ -1137,9 +1137,9 @@ IQ:
   :iban_example: IQ98NBIQ850123456789012
   :bban_example: NBIQ850123456789012
   :domestic_account_number_example: '123456789012'
-  :bban_format: "[A-Z]{4}\\d{3}\\d{12}"
   :bank_code_format: "[A-Z]{4}"
   :branch_code_format: "\\d{3}"
+  :bban_format: "[A-Z]{4}\\d{3}\\d{12}"
   :account_number_format: "\\d{12}"
 SV:
   :bank_code_position: 5
@@ -1357,6 +1357,12 @@ MN:
   :account_number_length: 12
   :total_length: 20
   :national_id_length: 4
+  :iban_example: MN121234123456789123
+  :bban_example: '1234123456789123'
+  :domestic_account_number_example: 1234 5678 9123
+  :bban_format: "\\d{4}\\d{12}"
+  :bank_code_format: "\\d{4}"
+  :account_number_format: "\\d{12}"
 DZ:
   :bank_code_position: 5
   :bank_code_length: 3
@@ -1472,13 +1478,90 @@ RU:
   :account_number_length: 15
   :total_length: 33
   :national_id_length: 14
-  :iban_example: RU1704452522540817810538091310419
+  :iban_example: RU0304452522540817810538091310419
   :bban_example: 044525225 40817 810 5 3809 1310419
   :domestic_account_number_example: 40817 810 5 3809 1310419
   :bban_format: "\\d{9}\\d{5}[A-Z0-9]{15}"
   :bank_code_format: "\\d{9}"
   :branch_code_format: "\\d{5}"
   :account_number_format: "[A-Z0-9]{15}"
+SO:
+  :bank_code_position: 5
+  :bank_code_length: 4
+  :branch_code_position: 9
+  :branch_code_length: 3
+  :account_number_position: 12
+  :account_number_length: 12
+  :total_length: 23
+  :national_id_length: 7
+  :iban_example: SO211000001001000100141
+  :bban_example: '1000001001000100141'
+  :domestic_account_number_example: '001000100141'
+  :bban_format: "\\d{4}\\d{3}\\d{12}"
+  :bank_code_format: "\\d{4}"
+  :branch_code_format: "\\d{3}"
+  :account_number_format: "\\d{12}"
+NI:
+  :bank_code_position: 5
+  :bank_code_length: 4
+  :branch_code_position: 0
+  :branch_code_length: 0
+  :account_number_position: 9
+  :account_number_length: 20
+  :total_length: 28
+  :national_id_length: 4
+  :iban_example: NI45BAPR00000013000003558124
+  :bban_example: BAPR00000013000003558124
+  :domestic_account_number_example: '00000013000003558124'
+  :bban_format: "[A-Z]{4}\\d{20}"
+  :bank_code_format: "[A-Z]{4}"
+  :account_number_format: "\\d{20}"
+FK:
+  :bank_code_position: 5
+  :bank_code_length: 2
+  :branch_code_position: 0
+  :branch_code_length: 0
+  :account_number_position: 7
+  :account_number_length: 12
+  :total_length: 18
+  :national_id_length: 2
+  :iban_example: FK88SC123456789012
+  :bban_example: SC123456789012
+  :domestic_account_number_example: '123456789012'
+  :bban_format: "[A-Z]{2}\\d{12}"
+  :bank_code_format: "[A-Z]{2}"
+  :account_number_format: "\\d{12}"
+OM:
+  :bank_code_position: 5
+  :bank_code_length: 3
+  :branch_code_position: 0
+  :branch_code_length: 0
+  :account_number_position: 8
+  :account_number_length: 16
+  :total_length: 23
+  :national_id_length: 3
+  :iban_example: OM810180000001299123456
+  :bban_example: '0180000001299123456'
+  :domestic_account_number_example: '0000001299123456'
+  :bban_format: "\\d{3}[A-Z0-9]{16}"
+  :bank_code_format: "\\d{3}"
+  :account_number_format: "[A-Z0-9]{16}"
+YE:
+  :bank_code_position: 5
+  :bank_code_length: 4
+  :branch_code_position: 9
+  :branch_code_length: 4
+  :account_number_position: 13
+  :account_number_length: 18
+  :total_length: 30
+  :national_id_length: 8
+  :iban_example: YE15CBYE0001018861234567891234
+  :bban_example: CBYE0001018861234567891234
+  :domestic_account_number_example: '018861234567891234'
+  :bban_format: "[A-Z]{4}\\d{4}[A-Z0-9]{18}"
+  :bank_code_format: "[A-Z]{4}"
+  :branch_code_format: "\\d{4}"
+  :account_number_format: "[A-Z0-9]{18}"
 AU:
   :bank_code_length: 0
   :branch_code_length: 6

data/ibandit.gemspec

@@ -27,13 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.7.0"
-  spec.add_development_dependency "gc_ruboconfig",   "~> 5.0"
-  spec.add_development_dependency "nokogiri",        "~> 1.6"
-  spec.add_development_dependency "pry",             "~> 0.13"
-  spec.add_development_dependency "pry-byebug",      "~> 3.10"
-  spec.add_development_dependency "rspec",           "~> 3.12"
-  spec.add_development_dependency "rspec-its",       "~> 1.2"
-  spec.add_development_dependency "sax-machine", "~> 1.3"
 
-  spec.add_runtime_dependency "i18n"
+  spec.add_dependency "i18n"
 end

data/lib/ibandit/iban.rb

@@ -56,12 +56,14 @@ module Ibandit
     end
 
     def account_number
+      return nil if @account_number.nil?
       return @account_number unless country_code == "NZ"
 
       @account_number[0..6]
     end
 
     def account_number_suffix
+      return nil if @account_number.nil?
       return nil unless country_code == "NZ"
 
       @account_number[7..]
@@ -128,6 +130,7 @@ module Ibandit
     end
 
     def valid_check_digits?
+      return true if source == :pseudo_iban && check_digits == Constants::PSEUDO_IBAN_CHECK_DIGITS
       return unless decomposable? && valid_characters?
 
       expected_check_digits = CheckDigit.iban(country_code, bban)
@@ -179,16 +182,15 @@ module Ibandit
       return unless valid_country_code?
       return true if swift_branch_code.to_s.length == structure[:branch_code_length]
 
-      if structure[:branch_code_length]&.zero?
-        @errors[:branch_code] = Ibandit.translate(:not_used_in_country,
+      @errors[:branch_code] = if structure[:branch_code_length]&.zero?
+                                Ibandit.translate(:not_used_in_country,
                                                   country_code: country_code)
-      elsif swift_branch_code.nil? || swift_branch_code.empty?
-        @errors[:branch_code] = Ibandit.translate(:is_required)
-      else
-        @errors[:branch_code] =
-          Ibandit.translate(:wrong_length,
-                            expected: structure[:branch_code_length])
-      end
+                              elsif swift_branch_code.nil? || swift_branch_code.empty?
+                                Ibandit.translate(:is_required)
+                              else
+                                Ibandit.translate(:wrong_length,
+                                                  expected: structure[:branch_code_length])
+                              end
       false
     end
 
@@ -390,7 +392,6 @@ module Ibandit
       valid_modulus_check_branch_code?
     end
 
-    # rubocop:disable Metrics/AbcSize
     def bank_code_passes_checksum_test?
       return false unless swift_bank_code
       return false if swift_bank_code.length != 9
@@ -407,8 +408,6 @@ module Ibandit
 
       mod.zero?
     end
-    # rubocop:enable Metrics/AbcSize
-
     ###################
     # Private methods #
     ###################

data/lib/ibandit/sweden/bank_lookup.rb

@@ -13,7 +13,7 @@ module Ibandit
       end
 
       def self.bank_info_table
-        @swedish_bank_lookup ||=
+        @bank_info_table ||=
           begin
             relative_path = "../../../../data/raw/swedish_bank_lookup.yml"
             raw_info = YAML.load_file(File.expand_path(relative_path, __FILE__))

data/lib/ibandit/sweden/validator.rb

@@ -64,7 +64,7 @@ module Ibandit
           length += bank[:clearing_code_length] if bank[:include_clearing_code]
 
           cleaned_account_number = account_number.gsub(/\A0+/, "")
-          if bank[:zerofill_serial_number] && !bank[:include_clearing_code]
+          if !bank[:include_clearing_code]
             cleaned_account_number =
               cleaned_account_number.
                 rjust(bank.fetch(:serial_number_length), "0")

data/lib/ibandit/version.rb

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

data/lib/ibandit.rb

@@ -30,10 +30,8 @@ module Ibandit
     end
 
     def structures
-      @structures ||= YAML.safe_load(
-        File.read(File.expand_path("../data/structures.yml", __dir__)),
-        permitted_classes: [Range, Symbol],
-      )
+      @structures ||= YAML.safe_load_file(File.expand_path("../data/structures.yml", __dir__),
+                                          permitted_classes: [Range, Symbol])
     end
 
     def translate(key, options = {})

data/spec/ibandit/german_details_converter_spec.rb

@@ -59,7 +59,7 @@ describe Ibandit::GermanDetailsConverter do
   end
 
   describe "integration tests" do
-    include_examples "json based fixture", "germany_integration_test_cases" do
+    it_behaves_like "json based fixture", "germany_integration_test_cases" do
       let(:test_subject) do
         described_class.
           convert(bank_code: bank_code, account_number: account_number)
@@ -68,7 +68,7 @@ describe Ibandit::GermanDetailsConverter do
   end
 
   describe "unit tests" do
-    include_examples "json based fixture", "germany_unit_test_cases" do
+    it_behaves_like "json based fixture", "germany_unit_test_cases" do
       let(:test_subject) do
         klass.new(bank_code, account_number).converted_details
       end

data/spec/ibandit/iban_assembler_spec.rb

@@ -293,11 +293,11 @@ describe Ibandit::IBANAssembler do
       it_behaves_like "allows round trips", "ES80 2310 0001 1800 0001 2345"
 
       context "without a bank_code or branch code" do
-        before { args.delete(:bank_code) }
-
-        before { args.delete(:branch_code) }
-
-        before { args[:account_number] = "23100001180000012345" }
+        before do
+          args.delete(:bank_code)
+          args.delete(:branch_code)
+          args[:account_number] = "23100001180000012345"
+        end
 
         it { is_expected.to be_nil }
       end
@@ -487,27 +487,29 @@ describe Ibandit::IBANAssembler do
       it_behaves_like "allows round trips", "HU42 1177 3016 1111 1018 0000 0000"
 
       context "without a bank_code or branch_code" do
-        before { args.delete(:bank_code) }
-
-        before { args.delete(:branch_code) }
-
-        before { args[:account_number] = "11773016-11111018-00000000" }
+        before do
+          args.delete(:bank_code)
+          args.delete(:branch_code)
+          args[:account_number] = "11773016-11111018-00000000"
+        end
 
         it { is_expected.to be_nil }
       end
 
       context "without a bank_code" do
-        before { args.delete(:bank_code) }
-
-        before { args[:account_number] = "11773016-11111018-00000000" }
+        before do
+          args.delete(:bank_code)
+          args[:account_number] = "11773016-11111018-00000000"
+        end
 
         it { is_expected.to be_nil }
       end
 
       context "without a branch_code" do
-        before { args.delete(:branch_code) }
-
-        before { args[:account_number] = "11773016-11111018-00000000" }
+        before do
+          args.delete(:branch_code)
+          args[:account_number] = "11773016-11111018-00000000"
+        end
 
         it { is_expected.to be_nil }
       end
@@ -826,9 +828,10 @@ describe Ibandit::IBANAssembler do
       it_behaves_like "allows round trips", "NO93 8601 1117 947"
 
       context "without a bank_code" do
-        before { args.delete(:bank_code) }
-
-        before { args[:account_number] = "86011117947" }
+        before do
+          args.delete(:bank_code)
+          args[:account_number] = "86011117947"
+        end
 
         it { is_expected.to be_nil }
       end
@@ -854,9 +857,10 @@ describe Ibandit::IBANAssembler do
       it_behaves_like "allows round trips", "PL60 1020 1026 0000 0422 7020 1111"
 
       context "without a bank_code" do
-        before { args.delete(:bank_code) }
-
-        before { args[:account_number] = "60102010260000042270201111" }
+        before do
+          args.delete(:bank_code)
+          args[:account_number] = "60102010260000042270201111"
+        end
 
         it { is_expected.to be_nil }
       end