ibandit 1.0.0 → 1.2.1

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,13 +3,14 @@
 require File.expand_path("lib/ibandit/version", __dir__)
 
 Gem::Specification.new do |gem|
+  gem.add_development_dependency "gc_ruboconfig",   "~> 2.17.0"
   gem.add_development_dependency "nokogiri",        "~> 1.6"
   gem.add_development_dependency "pry",             "~> 0.10"
   gem.add_development_dependency "pry-nav",         "~> 0.2"
   gem.add_development_dependency "rspec",           "~> 3.3"
   gem.add_development_dependency "rspec-its",       "~> 1.2"
-  gem.add_development_dependency "rubocop",         "~> 0.70.0"
-  gem.add_development_dependency "sax-machine",     "~> 1.3"
+  gem.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
+  gem.add_development_dependency "sax-machine", "~> 1.3"
 
   gem.add_runtime_dependency "i18n"
 

data/lib/ibandit.rb

@@ -36,7 +36,7 @@ module Ibandit
     end
 
     def translate(key, options = {})
-      I18n.translate(key, { scope: [:ibandit] }.merge(options))
+      I18n.translate(key, scope: [:ibandit], **options)
     end
   end
 end

data/lib/ibandit/check_digit.rb

@@ -23,7 +23,7 @@ module Ibandit
         end
       end
       remainder = digits.join.to_i % 97
-      sprintf("%02d", 98 - remainder)
+      sprintf("%<check_digit>02d", check_digit: 98 - remainder)
     end
 
     def self.italian(string)

data/lib/ibandit/german_details_converter.rb

@@ -517,7 +517,7 @@ module Ibandit
         updated_account_number =
           case unpadded_account_number.size
           when 5, 6 then unpadded_account_number + "00"
-          when 7 then
+          when 7
             if Check63.new(unpadded_account_number + "00").valid?
               unpadded_account_number + "00"
             else
@@ -957,6 +957,23 @@ module Ibandit
       end
     end
 
+    # New version of Rule004200 but with another range:
+    # For 10-digit Account Numbers, only the following Account Numbers are
+    # applicable to be issued / created into an IBAN with the
+    # standard-IBAN rule: nnn4400001 to nnn4499999
+    class Rule004201 < Rule004200
+      def converted_details
+        unpadded_account_number = @account_number.gsub(/\A0+/, "")
+
+        if unpadded_account_number.size == 10 &&
+            %w[4400001 4499999].include?(unpadded_account_number.slice(3, 10))
+          { bank_code: @bank_code, account_number: @account_number }
+        else
+          super
+        end
+      end
+    end
+
     class Rule004301 < BaseRule
       def converted_details
         { bank_code: "66650085", account_number: @account_number }
@@ -1028,6 +1045,10 @@ module Ibandit
       end
     end
 
+    class Rule004901 < Rule000000
+      # Rule 0049 01 is actually about modulus checking, not IBAN construction
+    end
+
     class Rule005000 < BaseRule
       def converted_details
         { bank_code: "28550000", account_number: @account_number }

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 =~ 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 =~ 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 =~ 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)
@@ -261,7 +266,9 @@ module Ibandit
     def valid_account_number_format?
       return unless valid_account_number_length?
 
-      if swift_account_number =~ Regexp.new(structure[:account_number_format])
+      if swift_account_number&.match?(
+        entire_string_regex(structure[:account_number_format]),
+      )
         true
       else
         @errors[:account_number] = Ibandit.translate(:is_invalid)
@@ -460,12 +467,12 @@ module Ibandit
       @swift_branch_code    = try_dup(local_details[:swift_branch_code])
       @swift_bank_code      = try_dup(local_details[:swift_bank_code])
 
-      @iban                 = IBANAssembler.assemble(swift_details)
+      @iban = IBANAssembler.assemble(swift_details)
 
       if source == :pseudo_iban
-        @check_digits       = try_dup(local_details[:check_digits])
+        @check_digits = try_dup(local_details[:check_digits])
       else
-        @check_digits       = @iban.slice(2, 2) unless @iban.nil?
+        @check_digits = @iban.slice(2, 2) unless @iban.nil?
       end
     end
 
@@ -497,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
@@ -198,7 +200,7 @@ module Ibandit
         bank_code, account_number = local_details[:account_number].split("-", 2)
       elsif local_details[:account_number].gsub(/\s/, "").length == 14
         cleaned_account_number = local_details[:account_number].gsub(/\s/, "")
-        bank_code      = cleaned_account_number.slice(0, 4)
+        bank_code = cleaned_account_number.slice(0, 4)
         account_number = cleaned_account_number.slice(4, 10)
       else
         return {}
@@ -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]
@@ -573,7 +575,7 @@ module Ibandit
       ken_1          = parts[2].nil? ? "" : parts[2].rjust(6, "0")
       ken_2          = parts[3].nil? ? "" : parts[3].rjust(4, "0")
 
-      kennitala      = ken_1.empty? ? "" : (ken_1 + ken_2).rjust(10, "0")
+      kennitala = ken_1.empty? ? "" : (ken_1 + ken_2).rjust(10, "0")
 
       hufo + reikningsnumer + kennitala
     end

data/lib/ibandit/version.rb

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

data/spec/fixtures/germany_integration_test_cases.json

@@ -22,15 +22,15 @@
       { "bank_code": "72020700", "account_number" : "1111111611" }
     ]
   },
-  {
-    "convertor": "000300",
-    "valid": [
-      { "bank_code": "51010800", "account_number" : "1" }
-    ],
-    "invalid": [
-      { "bank_code": "51010800", "account_number" : "6161604670" }
-    ]
-  },
+  // {
+  //   "convertor": "000300",
+  //   "valid": [
+  //     { "bank_code": "51010800", "account_number" : "1" }
+  //   ],
+  //   "invalid": [
+  //     { "bank_code": "51010800", "account_number" : "6161604670" }
+  //   ]
+  // },
   {
     "convertor": "000400",
     "valid": [
@@ -101,12 +101,12 @@
       {"bank_code":"51020000","account_number":"30009963","converted_bank_code":"50020200","converted_account_number":"30009963"}
     ]
   },
-  {
-    "convertor": "000900",
-    "valid": [
-      {"bank_code":"68351976","account_number":"1116232594","converted_bank_code":"68351557","converted_account_number":"3047232594"}
-    ]
-  },
+  // {
+  //   "convertor": "000900",
+  //   "valid": [
+  //     {"bank_code":"68351976","account_number":"1116232594","converted_bank_code":"68351557","converted_account_number":"3047232594"}
+  //   ]
+  // },
   {
     "convertor": "001001",
     "valid": [
@@ -162,9 +162,15 @@
     ]
   },
   {
-    "convertor": "001900",
+    "convertor": "004901",
     "valid": [
-      { "bank_code": "50130100", "account_number": "556", "converted_bank_code": "50120383" }
+      { "bank_code": "30060010", "account_number": "12345678", "converted_account_number": "12345678" }
     ]
   }
+  // {
+  //   "convertor": "001900",
+  //   "valid": [
+  //     { "bank_code": "50130100", "account_number": "556", "converted_bank_code": "50120383" }
+  //   ]
+  // }
 ]

data/spec/fixtures/germany_unit_test_cases.json

@@ -136,12 +136,12 @@
       { "bank_code": "10010010", "account_number" : "556", "converted_account_number": "0120440110" }
     ]
   },
-  {
-    "convertor": "001900",
-    "valid": [
-      { "bank_code": "10010010", "account_number" : "1234567890", "converted_bank_code": "50120383" }
-    ]
-  },
+  // {
+  //   "convertor": "001900",
+  //   "valid": [
+  //     { "bank_code": "10010010", "account_number" : "1234567890", "converted_bank_code": "50120383" }
+  //   ]
+  // },
   {
     "convertor": "002002",
     "valid": [
@@ -318,6 +318,20 @@
       { "bank_code": "10010010", "account_number" : "0040400000" },
       { "bank_code": "10010010", "account_number" : "0040412000" }
     ]
+  },
+    {
+    "convertor": "004201",
+    "valid": [
+      { "bank_code": "10010010", "account_number" : "0050462000" },
+      { "bank_code": "70020001", "account_number" : "0040402000" },
+      { "bank_code": "70020001", "account_number" : "1004400001" }
+    ],
+    "invalid": [
+      { "bank_code": "10010010", "account_number" : "504620001" },
+      { "bank_code": "10010010", "account_number" : "0040400000" },
+      { "bank_code": "10010010", "account_number" : "0040412000" },
+      { "bank_code": "70020001", "account_number" : "1035400001" }
+    ]
   },
   {
     "convertor": "004301",
@@ -421,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
@@ -286,7 +292,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context "with unsupported account details" do
       let(:account_number) { "7955791111" }
-      let(:bank_code) { "20000000" }
+      let(:bank_code) { "99999999" }
 
       it { is_expected.to eq(local_details_with_swift) }
     end

data/spec/ibandit/pseudo_iban_assembler_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe Ibandit::PseudoIBANAssembler do
-  subject(:pseudo_iban) { described_class.new(local_details).assemble }
+  subject(:pseudo_iban) { described_class.new(**local_details).assemble }
 
   context "for Sweden" do
     context "with valid parameters" do

data/spec/ibandit/structure_spec.rb

@@ -9,7 +9,7 @@ describe "structures.yml" do
   structures.each do |country, rules|
     context country do
       rules.each do |rule, value|
-        next unless rule =~ /_format$/
+        next unless rule.to_s.end_with?("_format")
 
         it "builds #{rule} rule" do
           expect { Regexp.new(value) }.to_not raise_exception