ibandit 1.1.0.1 → 1.3.0

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

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.1"
+  VERSION = "1.3.0"
 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" }
     ]
   },
   {

data/spec/ibandit/iban_assembler_spec.rb

@@ -11,7 +11,7 @@ describe Ibandit::IBANAssembler do
         account_number: iban.swift_account_number,
         branch_code: iban.swift_branch_code,
         bank_code: iban.swift_bank_code,
-      }.reject { |_key, value| value.nil? }
+      }.compact
     end
 
     it "successfully reconstructs the IBAN" do

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?).
@@ -3109,7 +3132,7 @@ describe Ibandit::IBAN do
     end
 
     context "for a valid Belgian IBAN" do
-      let(:iban_code) { "BE62 5100 0754 7061" }
+      let(:iban_code) { "BE68 5390 0754 7034" }
 
       it { is_expected.to be_valid }
     end
@@ -3156,6 +3179,18 @@ describe Ibandit::IBAN do
       it { is_expected.to_not be_valid }
     end
 
+    context "for a valid Costa Rican IBAN" do
+      let(:iban_code) { "CR05 0152 0200 1026 2840 66" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "for an invalid Costa Rican IBAN" do
+      let(:iban_code) { "CR05 0152 0200 1026 2840" }
+
+      it { is_expected.to_not be_valid }
+    end
+
     context "for a valid Cypriot IBAN" do
       let(:iban_code) { "CY17 0020 0128 0000 0012 0052 7600" }
 
@@ -3192,6 +3227,18 @@ describe Ibandit::IBAN do
       it { is_expected.to_not be_valid }
     end
 
+    context "for a valid Dominican Republic IBAN" do
+      let(:iban_code) { "DO28 BAGR 0000 0001 2124 5361 1324" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "for an invalid Dominican Republic IBAN" do
+      let(:iban_code) { "DO28 BAGR 0000 0001 2124 5361" }
+
+      it { is_expected.to_not be_valid }
+    end
+
     context "for a valid Estonian IBAN" do
       let(:iban_code) { "EE38 2200 2210 2014 5685" }
 
@@ -3576,6 +3623,18 @@ describe Ibandit::IBAN do
       it { is_expected.to_not be_valid }
     end
 
+    context "for a valid Palestinian IBAN" do
+      let(:iban_code) { "PS92 PALS 0000 0000 0400 1234 5670 2" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "for an invalid Palestinian IBAN" do
+      let(:iban_code) { "PS92 PALS 0000 0000 0400 1234 5670" }
+
+      it { is_expected.to_not be_valid }
+    end
+
     context "for a valid Potuguese IBAN" do
       let(:iban_code) { "PT50 0002 0123 1234 5678 9015 4" }
 
@@ -3600,6 +3659,30 @@ describe Ibandit::IBAN do
       it { is_expected.to_not be_valid }
     end
 
+    context "for a valid Kosovan IBAN" do
+      let(:iban_code) { "XK05 1212 0123 4567 8906" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "for an invalid Kosovan IBAN" do
+      let(:iban_code) { "XK05 1212 0123 4567 890" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "for a valid Timor-Leste IBAN" do
+      let(:iban_code) { "TL38 0080 0123 4567 8910 157" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "for an invalid Timor-Leste IBAN" do
+      let(:iban_code) { "TL38 0080 0123 4567 8910" }
+
+      it { is_expected.to_not be_valid }
+    end
+
     context "for a valid Romanian IBAN" do
       let(:iban_code) { "RO49 AAAA 1B31 0075 9384 0000" }
 
@@ -3755,6 +3838,114 @@ describe Ibandit::IBAN do
 
       it { is_expected.to_not be_valid }
     end
+
+    context "with a valid LC iban" do
+      let(:iban_code) { "LC55 HEMM 0001 0001 0012 0012 0002 3015" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid LC iban" do
+      let(:iban_code) { "LC55 HEMM 0001 0001 0012 0012 0002" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid UA iban" do
+      let(:iban_code) { "UA21 3223 1300 0002 6007 2335 6600 1" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid UA iban" do
+      let(:iban_code) { "UA21 3223 1300 0002 6007 2335 6600 " }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid ST iban" do
+      let(:iban_code) { "ST23 0001 0001 0051 8453 1014 6" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid ST iban" do
+      let(:iban_code) { "ST23 0001 0001 0051 8453 1014" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid SC iban" do
+      let(:iban_code) { "SC18 SSCB 1101 0000 0000 0000 1497 USD" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid SC iban" do
+      let(:iban_code) { "SC18 SSCB 1101 0000 0000 0000 USD" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid IQ iban" do
+      let(:iban_code) { "IQ98 NBIQ 8501 2345 6789 012" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid IQ iban" do
+      let(:iban_code) { "IQ98 NBIQ 8501 2345 6789" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid SV iban" do
+      let(:iban_code) { "SV 62 CENR 00000000000000700025" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid SV iban" do
+      let(:iban_code) { "SV 62 CENR 00000000000000700" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid BY iban" do
+      let(:iban_code) { "BY13 NBRB 3600 9000 0000 2Z00 AB00" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid BY iban" do
+      let(:iban_code) { "BY13 NBRB 3600 9000 0000 2Z00" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid VA iban" do
+      let(:iban_code) { "VA59 001 1230 0001 2345 678" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid VA iban" do
+      let(:iban_code) { "VA59 001 1230 0001 2345" }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context "with a valid EG iban" do
+      let(:iban_code) { "EG380019000500000000263180002" }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an invalid EG iban" do
+      let(:iban_code) { "EG3800190005000000002631800" }
+
+      it { is_expected.to_not be_valid }
+    end
   end
 
   describe "#local_check_digits" do

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.1
+  version: 1.3.0
 platform: ruby
 authors:
 - GoCardless
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2021-02-18 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.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -149,10 +149,12 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - TODO.md
 - bin/build_german_iban_rules.rb
 - bin/build_structure_file.rb
@@ -208,7 +210,7 @@ homepage: https://github.com/gocardless/ibandit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.
 test_files: []