ibandit 0.11.28 → 1.1.0.1

data/data/structures.yml

@@ -149,15 +149,15 @@ CH:
   :bank_code_format: "\\d{5}"
   :account_number_format: "[A-Z0-9]{12}"
 CR:
-  :bank_code_position: 5
+  :bank_code_position: 6
   :bank_code_length: 3
   :branch_code_position: 0
   :branch_code_length: 0
-  :account_number_position: 8
+  :account_number_position: 9
   :account_number_length: 14
-  :total_length: 21
+  :total_length: 22
   :national_id_length: 3
-  :bban_format: "\\d{3}\\d{14}"
+  :bban_format: "0\\d{3}\\d{14}"
   :bank_code_format: "\\d{3}"
   :account_number_format: "\\d{14}"
 CY:

data/ibandit.gemspec

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
-require File.expand_path("../lib/ibandit/version", __FILE__)
+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 "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.52.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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "i18n"
 require "ibandit/version"
 require "ibandit/errors"
@@ -14,8 +16,8 @@ require "ibandit/pseudo_iban_splitter"
 require "ibandit/local_details_cleaner"
 require "ibandit/check_digit"
 
-I18n.load_path += Dir[File.expand_path("../../config/locales/*.{rb,yml}",
-                                       __FILE__)]
+I18n.load_path += Dir[File.expand_path("../config/locales/*.{rb,yml}",
+                                       __dir__)]
 
 module Ibandit
   class << self
@@ -23,17 +25,18 @@ module Ibandit
 
     def find_bic(country_code, national_id)
       raise NotImplementedError, "BIC finder is not defined" unless @bic_finder
+
       @bic_finder.call(country_code, national_id)
     end
 
     def structures
       @structures ||= YAML.load_file(
-        File.expand_path("../../data/structures.yml", __FILE__),
+        File.expand_path("../data/structures.yml", __dir__),
       )
     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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ibandit
   module CheckDigit
     ITALIAN_ODD_MAPPING = {
@@ -21,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/constants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ibandit
   module Constants
     CONSTRUCTABLE_IBAN_COUNTRY_CODES = %w[AT BE BG CY CZ DE DK EE ES FI FR GB GR
@@ -8,7 +10,7 @@ module Ibandit
     DECONSTRUCTABLE_IBAN_COUNTRY_CODES =
       CONSTRUCTABLE_IBAN_COUNTRY_CODES - PSEUDO_IBAN_COUNTRY_CODES
 
-    PSEUDO_IBAN_CHECK_DIGITS = "ZZ".freeze
+    PSEUDO_IBAN_CHECK_DIGITS = "ZZ"
 
     PSEUDO_IBAN_PADDING_CHARACTER_FOR = {
       "SE" => "X", # Using X for backwards compatibility

data/lib/ibandit/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ibandit
   class InvalidCharacterError < StandardError; end
   class UnsupportedAccountDetails < StandardError; end

data/lib/ibandit/german_details_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # German bank details don't map directly to IBANs in the same way as in other
 # countries - each bank has idiosyncracies for translating its cusomers' bank
 # details. These idiosyncracies are described in a document from the Bundesbank:
@@ -7,7 +9,7 @@ module Ibandit
   module GermanDetailsConverter
     def self.rules
       @rules ||= YAML.load_file(
-        File.expand_path("../../../data/german_iban_rules.yml", __FILE__),
+        File.expand_path("../../data/german_iban_rules.yml", __dir__),
       )
     end
 
@@ -290,6 +292,7 @@ module Ibandit
 
         def valid?
           return false unless valid_length? && valid_account_type?
+
           [master_number[-1].to_i, 10].include?(remainder)
         end
 
@@ -514,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
@@ -954,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 }
@@ -1025,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "yaml"
 
 module Ibandit
@@ -155,7 +157,7 @@ module Ibandit
 
     def valid_bank_code_length?
       return unless valid_country_code?
-      return true if structure[:bank_code_length] == 0
+      return true if structure[:bank_code_length]&.zero?
 
       if swift_bank_code.nil? || swift_bank_code.empty?
         @errors[:bank_code] = Ibandit.translate(:is_required)
@@ -175,7 +177,7 @@ module Ibandit
         return true
       end
 
-      if structure[:branch_code_length] == 0
+      if structure[:branch_code_length]&.zero?
         @errors[:branch_code] = Ibandit.translate(:not_used_in_country,
                                                   country_code: country_code)
       elsif swift_branch_code.nil? || swift_branch_code.empty?
@@ -208,6 +210,7 @@ module Ibandit
 
     def valid_characters?
       return if iban.nil?
+
       if iban.scan(/[^A-Z0-9]/).any?
         @errors[:characters] =
           Ibandit.translate(:non_alphanumeric_characters,
@@ -222,7 +225,7 @@ module Ibandit
       return unless valid_country_code?
       return unless structure[:bban_format]
 
-      if bban =~ Regexp.new(structure[:bban_format])
+      if bban&.match?(Regexp.new(structure[:bban_format]))
         true
       else
         @errors[:format] = Ibandit.translate(:invalid_format,
@@ -233,9 +236,9 @@ module Ibandit
 
     def valid_bank_code_format?
       return unless valid_bank_code_length?
-      return true if structure[:bank_code_length] == 0
+      return true if structure[:bank_code_length]&.zero?
 
-      if swift_bank_code =~ Regexp.new(structure[:bank_code_format])
+      if swift_bank_code&.match?(Regexp.new(structure[:bank_code_format]))
         true
       else
         @errors[:bank_code] = Ibandit.translate(:is_invalid)
@@ -247,7 +250,7 @@ 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?(Regexp.new(structure[:branch_code_format]))
         true
       else
         @errors[:branch_code] = Ibandit.translate(:is_invalid)
@@ -258,7 +261,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?(
+        Regexp.new(structure[:account_number_format]),
+      )
         true
       else
         @errors[:account_number] = Ibandit.translate(:is_invalid)
@@ -457,12 +462,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
 
@@ -477,7 +482,7 @@ module Ibandit
       @swift_account_number = swift_details[:account_number]
 
       return if Constants::PSEUDO_IBAN_COUNTRY_CODES.
-          include?(@country_code)
+        include?(@country_code)
 
       @bank_code      = swift_details[:bank_code]
       @branch_code    = swift_details[:branch_code]
@@ -530,6 +535,7 @@ module Ibandit
 
     def pseudo_iban?(input)
       return false if input.nil?
+
       input.slice(2, 2) == Constants::PSEUDO_IBAN_CHECK_DIGITS
     end
 

data/lib/ibandit/iban_assembler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ibandit
   module IBANAssembler
     EXCEPTION_COUNTRY_CODES = %w[IT SM BE].freeze

data/lib/ibandit/iban_splitter.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Ibandit
   module IBANSplitter
     def self.split(iban)
       {
-        country_code:   country_code_from(iban),
-        check_digits:   check_digits_from(iban),
-        bank_code:      bank_code_from(iban),
-        branch_code:    branch_code_from(iban),
+        country_code: country_code_from(iban),
+        check_digits: check_digits_from(iban),
+        bank_code: bank_code_from(iban),
+        branch_code: branch_code_from(iban),
         account_number: account_number_from(iban),
       }
     end
@@ -36,9 +38,8 @@ module Ibandit
     end
 
     def self.branch_code_from(iban)
-      unless decomposable?(iban) && structure(iban)[:branch_code_length] > 0
-        return
-      end
+      return unless decomposable?(iban) &&
+        structure(iban)[:branch_code_length]&.positive?
 
       iban.slice(
         structure(iban)[:branch_code_position] - 1,

data/lib/ibandit/local_details_cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ibandit
   module LocalDetailsCleaner
     def self.clean(local_details)
@@ -57,8 +59,9 @@ module Ibandit
       # Account number may be 4-11 digits long.
       # Add leading zeros to account number if < 11 digits.
       return {} unless local_details[:account_number].length >= 4
+
       {
-        bank_code:      local_details[:bank_code],
+        bank_code: local_details[:bank_code],
         account_number: local_details[:account_number].rjust(11, "0"),
       }
     end
@@ -71,7 +74,7 @@ module Ibandit
       return {} unless local_details[:account_number].length >= 5
 
       {
-        branch_code:    local_details[:branch_code].delete("-"),
+        branch_code: local_details[:branch_code].delete("-"),
         account_number: local_details[:account_number].rjust(10, "0"),
       }
     end
@@ -80,7 +83,7 @@ module Ibandit
       account_number = local_details[:account_number].tr("-", "")
 
       {
-        bank_code:      local_details[:bank_code] || account_number.slice(0, 3),
+        bank_code: local_details[:bank_code] || account_number.slice(0, 3),
         account_number: account_number,
       }
     end
@@ -137,8 +140,8 @@ module Ibandit
         end
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -158,7 +161,7 @@ module Ibandit
         end
 
       {
-        bank_code:      local_details[:bank_code],
+        bank_code: local_details[:bank_code],
         account_number: account_number,
       }
     end
@@ -180,7 +183,7 @@ module Ibandit
       return {} unless converted_details[:account_number].length >= 4
 
       {
-        bank_code:      converted_details[:bank_code],
+        bank_code: converted_details[:bank_code],
         account_number: converted_details[:account_number].rjust(10, "0"),
       }
     end
@@ -195,14 +198,14 @@ 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 {}
       end
 
       {
-        bank_code:      bank_code.rjust(4, "0"),
+        bank_code: bank_code.rjust(4, "0"),
         account_number: account_number.delete("-").rjust(10, "0"),
       }
     end
@@ -246,8 +249,8 @@ module Ibandit
       end
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -267,15 +270,15 @@ module Ibandit
         end
 
       {
-        bank_code:      local_details[:bank_code],
+        bank_code: local_details[:bank_code],
         account_number: account_number,
       }
     end
 
     def self.clean_fr_details(local_details)
       {
-        bank_code:      local_details[:bank_code],
-        branch_code:    local_details[:branch_code],
+        bank_code: local_details[:bank_code],
+        branch_code: local_details[:branch_code],
         account_number: local_details[:account_number].gsub(/[-\s]/, ""),
       }
     end
@@ -296,8 +299,8 @@ module Ibandit
       account_number = account_number.rjust(8, "0") if account_number.length > 5
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -317,7 +320,7 @@ module Ibandit
       bank_code, account_number = local_details[:account_number].split("-", 2)
 
       {
-        bank_code:      bank_code,
+        bank_code: bank_code,
         account_number: account_number,
       }
     end
@@ -334,14 +337,14 @@ module Ibandit
       case cleaned_acct_number.length
       when 16
         {
-          bank_code:      cleaned_acct_number.slice(0, 3),
-          branch_code:    cleaned_acct_number.slice(3, 4),
+          bank_code: cleaned_acct_number.slice(0, 3),
+          branch_code: cleaned_acct_number.slice(3, 4),
           account_number: cleaned_acct_number.slice(7, 9).ljust(17, "0"),
         }
       when 24
         {
-          bank_code:      cleaned_acct_number.slice(0, 3),
-          branch_code:    cleaned_acct_number.slice(3, 4),
+          bank_code: cleaned_acct_number.slice(0, 3),
+          branch_code: cleaned_acct_number.slice(3, 4),
           account_number: cleaned_acct_number.slice(7, 17),
         }
       else local_details
@@ -363,8 +366,8 @@ module Ibandit
       account_number = account_number.rjust(8, "0") if account_number.length > 5
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -381,7 +384,7 @@ module Ibandit
       end
 
       {
-        bank_code:      bank_code.rjust(4, "0"),
+        bank_code: bank_code.rjust(4, "0"),
         account_number: pad_is_account_number(parts),
       }
     end
@@ -389,8 +392,8 @@ module Ibandit
     def self.clean_it_details(local_details)
       # Add leading zeros to account number if < 12 digits.
       {
-        bank_code:      local_details[:bank_code],
-        branch_code:    local_details[:branch_code],
+        bank_code: local_details[:bank_code],
+        branch_code: local_details[:branch_code],
         account_number: local_details[:account_number].rjust(12, "0"),
       }
     end
@@ -430,8 +433,8 @@ module Ibandit
       account_number = account_number.rjust(18, "0")
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -439,7 +442,7 @@ module Ibandit
     def self.clean_nl_details(local_details)
       # Add leading zeros to account number if < 10 digits.
       {
-        bank_code:      local_details[:bank_code],
+        bank_code: local_details[:bank_code],
         account_number: local_details[:account_number].rjust(10, "0"),
       }
     end
@@ -458,7 +461,7 @@ module Ibandit
       end
 
       {
-        bank_code:      bank_code,
+        bank_code: bank_code,
         account_number: account_number,
       }
     end
@@ -496,8 +499,8 @@ module Ibandit
       end
 
       {
-        bank_code:      bank_code,
-        branch_code:    branch_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
         account_number: account_number,
       }
     end
@@ -516,7 +519,7 @@ module Ibandit
       end
 
       {
-        bank_code:      bank_code,
+        bank_code: bank_code,
         account_number: account_number,
       }
     end
@@ -549,7 +552,7 @@ module Ibandit
     def self.clean_si_details(local_details)
       # Add leading zeros to account number if < 10 digits.
       {
-        bank_code:      local_details[:bank_code],
+        bank_code: local_details[:bank_code],
         account_number: local_details[:account_number].rjust(10, "0"),
       }
     end
@@ -570,7 +573,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
@@ -578,8 +581,8 @@ module Ibandit
 
     def self.swift_details_for(local_details)
       {
-        swift_bank_code:      local_details[:bank_code],
-        swift_branch_code:    local_details[:branch_code],
+        swift_bank_code: local_details[:bank_code],
+        swift_branch_code: local_details[:branch_code],
         swift_account_number: local_details[:account_number],
       }
     end