ibandit 1.4.1 → 1.7.0

data/data/structures.yml

@@ -983,9 +983,12 @@ EG:
 AU:
   :bank_code_length: 0
   :branch_code_length: 6
-  :account_number_length: 10
+  :account_number_length: !ruby/range
+    begin: 5
+    end: 10
+    excl: false
   :branch_code_format: "\\d{6}"
-  :account_number_format: "[A-Z0-9]{10}"
+  :account_number_format: "[A-Z0-9]{5,10}"
   :pseudo_iban_bank_code_length: 0
   :pseudo_iban_branch_code_length: 6
   :pseudo_iban_account_number_length: 10
@@ -993,7 +996,10 @@ AU:
 CA:
   :bank_code_length: 4
   :branch_code_length: 5
-  :account_number_length: 12
+  :account_number_length: !ruby/range
+    begin: 7
+    end: 12
+    excl: false
   :bank_code_format: "\\d{4}"
   :branch_code_format: "\\d{5}"
   :account_number_format: "\\d{7,12}"
@@ -1015,7 +1021,10 @@ NZ:
 US:
   :bank_code_length: 9
   :branch_code_length: 0
-  :account_number_length: 17
+  :account_number_length: !ruby/range
+    begin: 1
+    end: 17
+    excl: false
   :bank_code_format: "\\d{9}"
   :account_number_format: "_*\\d{1,17}"
   :national_id_length: 9

data/ibandit.gemspec

@@ -3,10 +3,10 @@
 require File.expand_path("lib/ibandit/version", __dir__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency "gc_ruboconfig",   "~> 2.24.0"
+  gem.add_development_dependency "gc_ruboconfig",   "~> 2.26.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 "pry",             "~> 0.13"
+  gem.add_development_dependency "pry-byebug",      "~> 3.9"
   gem.add_development_dependency "rspec",           "~> 3.3"
   gem.add_development_dependency "rspec-its",       "~> 1.2"
   gem.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"

data/lib/ibandit/iban.rb

@@ -174,9 +174,7 @@ module Ibandit
 
     def valid_branch_code_length?
       return unless valid_country_code?
-      if swift_branch_code.to_s.length == structure[:branch_code_length]
-        return true
-      end
+      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,
@@ -199,8 +197,13 @@ module Ibandit
         return false
       end
 
-      if swift_account_number.length == structure[:account_number_length]
-        return true
+      case structure[:account_number_length]
+      when Range
+        if structure[:account_number_length].include?(swift_account_number.length)
+          return true
+        end
+      else
+        return true if swift_account_number.length == structure[:account_number_length]
       end
 
       @errors[:account_number] =

data/lib/ibandit/local_details_cleaner.rb

@@ -68,14 +68,13 @@ module Ibandit
 
     def self.clean_au_details(local_details)
       # Account number may be up to 10 digits long.
-      # Add leading zeros to account number if < 10 digits.
       #
       # Minimum account_number length is 5
       return {} unless local_details[:account_number].length >= 5
 
       {
         branch_code: local_details[:branch_code].delete("-"),
-        account_number: local_details[:account_number].rjust(10, "0"),
+        account_number: local_details[:account_number],
       }
     end
 
@@ -91,7 +90,7 @@ module Ibandit
     def self.clean_ca_details(local_details)
       account_number = local_details[:account_number].tr("-", "")
 
-      return {} if account_number.length < 7 # minimum length
+      return {} unless (7..12).cover?(account_number.length)
 
       bank_code = if local_details[:bank_code].length == 3
                     local_details[:bank_code].rjust(4, "0")
@@ -100,7 +99,7 @@ module Ibandit
                   end
 
       {
-        account_number: account_number.rjust(12, "0"),
+        account_number: account_number,
         bank_code: bank_code,
       }
     end
@@ -113,7 +112,7 @@ module Ibandit
 
       {
         bank_code: local_details[:bank_code],
-        account_number: account_number.rjust(17, "_"),
+        account_number: account_number,
       }
     end
 
@@ -330,9 +329,7 @@ module Ibandit
     def self.clean_hu_details(local_details)
       # This method supports being passed the component IBAN parts, as defined
       # by SWIFT, or a single 16 or 24 digit string.
-      if local_details[:bank_code] || local_details[:branch_code]
-        return local_details
-      end
+      return local_details if local_details[:bank_code] || local_details[:branch_code]
 
       cleaned_acct_number = local_details[:account_number].gsub(/[-\s]/, "")
 

data/lib/ibandit/version.rb

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

data/spec/ibandit/iban_spec.rb

@@ -201,13 +201,13 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("AU") }
         its(:bank_code) { is_expected.to be_nil }
         its(:branch_code) { is_expected.to eq("123456") }
-        its(:account_number) { is_expected.to eq("0123456789") }
+        its(:account_number) { is_expected.to eq("123456789") }
         its(:swift_bank_code) { is_expected.to be_nil }
         its(:swift_branch_code) { is_expected.to eq("123456") }
-        its(:swift_account_number) { is_expected.to eq("0123456789") }
+        its(:swift_account_number) { is_expected.to eq("123456789") }
         its(:swift_national_id) { is_expected.to eq("123456") }
         its(:iban) { is_expected.to be_nil }
-        its(:pseudo_iban) { is_expected.to eq("AUZZ1234560123456789") }
+        its(:pseudo_iban) { is_expected.to eq("AUZZ123456_123456789") }
         its(:valid?) { is_expected.to eq(true) }
         its(:to_s) { is_expected.to eq("") }
       end
@@ -218,13 +218,13 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("AU") }
         its(:bank_code) { is_expected.to be_nil }
         its(:branch_code) { is_expected.to eq("123456") }
-        its(:account_number) { is_expected.to eq("0000012345") }
+        its(:account_number) { is_expected.to eq("12345") }
         its(:swift_bank_code) { is_expected.to be_nil }
         its(:swift_branch_code) { is_expected.to eq("123456") }
-        its(:swift_account_number) { is_expected.to eq("0000012345") }
+        its(:swift_account_number) { is_expected.to eq("12345") }
         its(:swift_national_id) { is_expected.to eq("123456") }
         its(:iban) { is_expected.to be_nil }
-        its(:pseudo_iban) { is_expected.to eq("AUZZ1234560000012345") }
+        its(:pseudo_iban) { is_expected.to eq("AUZZ123456_____12345") }
         its(:valid?) { is_expected.to eq(true) }
         its(:to_s) { is_expected.to eq("") }
       end
@@ -235,13 +235,13 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("AU") }
         its(:bank_code) { is_expected.to be_nil }
         its(:branch_code) { is_expected.to eq("123456") }
-        its(:account_number) { is_expected.to eq("0000123456") }
+        its(:account_number) { is_expected.to eq("123456") }
         its(:swift_bank_code) { is_expected.to be_nil }
         its(:swift_branch_code) { is_expected.to eq("123456") }
-        its(:swift_account_number) { is_expected.to eq("0000123456") }
+        its(:swift_account_number) { is_expected.to eq("123456") }
         its(:swift_national_id) { is_expected.to eq("123456") }
         its(:iban) { is_expected.to be_nil }
-        its(:pseudo_iban) { is_expected.to eq("AUZZ1234560000123456") }
+        its(:pseudo_iban) { is_expected.to eq("AUZZ123456____123456") }
         its(:valid?) { is_expected.to eq(true) }
         its(:to_s) { is_expected.to eq("") }
       end
@@ -269,13 +269,13 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("AU") }
         its(:bank_code) { is_expected.to be_nil }
         its(:branch_code) { is_expected.to eq("123456") }
-        its(:account_number) { is_expected.to eq("0XX1234567") }
+        its(:account_number) { is_expected.to eq("XX1234567") }
         its(:swift_bank_code) { is_expected.to be_nil }
         its(:swift_branch_code) { is_expected.to eq("123456") }
-        its(:swift_account_number) { is_expected.to eq("0XX1234567") }
+        its(:swift_account_number) { is_expected.to eq("XX1234567") }
         its(:swift_national_id) { is_expected.to eq("123456") }
         its(:iban) { is_expected.to be_nil }
-        its(:pseudo_iban) { is_expected.to eq("AUZZ1234560XX1234567") }
+        its(:pseudo_iban) { is_expected.to eq("AUZZ123456_XX1234567") }
         its(:valid?) { is_expected.to eq(true) }
         its(:to_s) { is_expected.to eq("") }
       end
@@ -303,13 +303,13 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("AU") }
         its(:bank_code) { is_expected.to be_nil }
         its(:branch_code) { is_expected.to eq("123456") }
-        its(:account_number) { is_expected.to eq("0000000000") }
+        its(:account_number) { is_expected.to eq("000000") }
         its(:swift_bank_code) { is_expected.to be_nil }
         its(:swift_branch_code) { is_expected.to eq("123456") }
-        its(:swift_account_number) { is_expected.to eq("0000000000") }
+        its(:swift_account_number) { is_expected.to eq("000000") }
         its(:swift_national_id) { is_expected.to eq("123456") }
         its(:iban) { is_expected.to be_nil }
-        its(:pseudo_iban) { is_expected.to eq("AUZZ1234560000000000") }
+        its(:pseudo_iban) { is_expected.to eq("AUZZ123456____000000") }
         its(:valid?) { is_expected.to eq(false) }
         its(:to_s) { is_expected.to eq("") }
       end
@@ -321,13 +321,13 @@ describe Ibandit::IBAN do
       its(:country_code) { is_expected.to eq("AU") }
       its(:bank_code) { is_expected.to be_nil }
       its(:branch_code) { is_expected.to eq("123456") }
-      its(:account_number) { is_expected.to eq("0123456789") }
+      its(:account_number) { is_expected.to eq("123456789") }
       its(:swift_bank_code) { is_expected.to be_nil }
       its(:swift_branch_code) { is_expected.to eq("123456") }
-      its(:swift_account_number) { is_expected.to eq("0123456789") }
+      its(:swift_account_number) { is_expected.to eq("123456789") }
       its(:swift_national_id) { is_expected.to eq("123456") }
       its(:iban) { is_expected.to be_nil }
-      its(:pseudo_iban) { is_expected.to eq("AUZZ1234560123456789") }
+      its(:pseudo_iban) { is_expected.to eq("AUZZ123456_123456789") }
       its(:valid?) { is_expected.to eq(true) }
       its(:to_s) { is_expected.to eq("") }
 
@@ -358,7 +358,7 @@ describe Ibandit::IBAN do
       it "is invalid and has the correct errors" do
         expect(subject.valid?).to eq(false)
         expect(subject.errors).
-          to eq(account_number: "is the wrong length (should be 10 characters)")
+          to eq(account_number: "is the wrong length (should be 5..10 characters)")
       end
     end
 
@@ -377,7 +377,7 @@ describe Ibandit::IBAN do
       it "is invalid and has the correct errors" do
         expect(subject.valid?).to eq(false)
         expect(subject.errors).to eq(
-          account_number: "is the wrong length (should be 10 characters)",
+          account_number: "is the wrong length (should be 5..10 characters)",
         )
       end
     end
@@ -418,12 +418,12 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("CA") }
         its(:bank_code) { is_expected.to eq("0036") }
         its(:branch_code) { is_expected.to eq("00063") }
-        its(:account_number) { is_expected.to eq("000000123456") }
+        its(:account_number) { is_expected.to eq("0123456") }
         its(:swift_bank_code) { is_expected.to eq("0036") }
         its(:swift_branch_code) { is_expected.to eq("00063") }
-        its(:swift_account_number) { is_expected.to eq("000000123456") }
+        its(:swift_account_number) { is_expected.to eq("0123456") }
         its(:swift_national_id) { is_expected.to eq("003600063") }
-        its(:pseudo_iban) { is_expected.to eq("CAZZ003600063000000123456") }
+        its(:pseudo_iban) { is_expected.to eq("CAZZ003600063_____0123456") }
 
         its(:iban) { is_expected.to be_nil }
         its(:valid?) { is_expected.to eq(true) }
@@ -437,12 +437,12 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("CA") }
         its(:bank_code) { is_expected.to eq("36") }
         its(:branch_code) { is_expected.to eq("00063") }
-        its(:account_number) { is_expected.to eq("000000123456") }
+        its(:account_number) { is_expected.to eq("0123456") }
         its(:swift_bank_code) { is_expected.to eq("36") }
         its(:swift_branch_code) { is_expected.to eq("00063") }
-        its(:swift_account_number) { is_expected.to eq("000000123456") }
+        its(:swift_account_number) { is_expected.to eq("0123456") }
         its(:swift_national_id) { is_expected.to eq("3600063") }
-        its(:pseudo_iban) { is_expected.to eq("CAZZ__3600063000000123456") }
+        its(:pseudo_iban) { is_expected.to eq("CAZZ__3600063_____0123456") }
 
         its(:iban) { is_expected.to be_nil }
         its(:valid?) { is_expected.to eq(false) }
@@ -456,12 +456,12 @@ describe Ibandit::IBAN do
         its(:country_code) { is_expected.to eq("CA") }
         its(:bank_code) { is_expected.to eq("0036") }
         its(:branch_code) { is_expected.to eq("00063") }
-        its(:account_number) { is_expected.to eq("000000123456") }
+        its(:account_number) { is_expected.to eq("0123456") }
         its(:swift_bank_code) { is_expected.to eq("0036") }
         its(:swift_branch_code) { is_expected.to eq("00063") }
-        its(:swift_account_number) { is_expected.to eq("000000123456") }
+        its(:swift_account_number) { is_expected.to eq("0123456") }
         its(:swift_national_id) { is_expected.to eq("003600063") }
-        its(:pseudo_iban) { is_expected.to eq("CAZZ003600063000000123456") }
+        its(:pseudo_iban) { is_expected.to eq("CAZZ003600063_____0123456") }
 
         its(:iban) { is_expected.to be_nil }
         its(:valid?) { is_expected.to eq(true) }
@@ -501,11 +501,11 @@ describe Ibandit::IBAN do
       its(:country_code) { is_expected.to eq("CA") }
       its(:bank_code) { is_expected.to eq("0036") }
       its(:branch_code) { is_expected.to eq("00063") }
-      its(:account_number) { is_expected.to eq("000000123456") }
+      its(:account_number) { is_expected.to eq("0123456") }
       its(:swift_bank_code) { is_expected.to eq("0036") }
       its(:swift_branch_code) { is_expected.to eq("00063") }
-      its(:swift_account_number) { is_expected.to eq("000000123456") }
-      its(:pseudo_iban) { is_expected.to eq("CAZZ003600063000000123456") }
+      its(:swift_account_number) { is_expected.to eq("0123456") }
+      its(:pseudo_iban) { is_expected.to eq("CAZZ003600063_____0123456") }
 
       its(:iban) { is_expected.to be_nil }
       its(:valid?) { is_expected.to be true }
@@ -518,7 +518,7 @@ describe Ibandit::IBAN do
       it "is invalid and has the correct errors" do
         expect(subject.valid?).to eq(false)
         expect(subject.errors).
-          to eq(account_number: "is the wrong length (should be 12 characters)")
+          to eq(account_number: "is the wrong length (should be 7..12 characters)")
       end
     end
 
@@ -709,10 +709,10 @@ describe Ibandit::IBAN do
 
         its(:country_code) { is_expected.to eq("US") }
         its(:bank_code) { is_expected.to eq(bank_code) }
-        its(:account_number) { is_expected.to eq("__________0123456") }
+        its(:account_number) { is_expected.to eq("0123456") }
         its(:swift_bank_code) { is_expected.to eq(bank_code) }
         its(:swift_branch_code) { is_expected.to eq(nil) }
-        its(:swift_account_number) { is_expected.to eq("__________0123456") }
+        its(:swift_account_number) { is_expected.to eq("0123456") }
         its(:swift_national_id) { is_expected.to eq(bank_code) }
 
         its(:pseudo_iban) do

data/spec/ibandit/local_details_cleaner_spec.rb

@@ -95,7 +95,7 @@ describe Ibandit::LocalDetailsCleaner do
       let(:branch_code) { "123-456" }
 
       its([:country_code]) { is_expected.to eq(country_code) }
-      its([:account_number]) { is_expected.to eq("0123456789") }
+      its([:account_number]) { is_expected.to eq("123456789") }
       its([:branch_code]) { is_expected.to eq("123456") }
     end
 
@@ -103,7 +103,7 @@ describe Ibandit::LocalDetailsCleaner do
       let(:branch_code) { "123456" }
 
       its([:country_code]) { is_expected.to eq(country_code) }
-      its([:account_number]) { is_expected.to eq("0123456789") }
+      its([:account_number]) { is_expected.to eq("123456789") }
       its([:branch_code]) { is_expected.to eq("123456") }
     end
   end
@@ -163,7 +163,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { "0036" }
     let(:branch_code) { "00063" }
 
-    its([:account_number]) { is_expected.to eq("000000123456") }
+    its([:account_number]) { is_expected.to eq("0123456") }
     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") }
@@ -171,7 +171,7 @@ describe Ibandit::LocalDetailsCleaner do
     context "with a hyphen" do
       let(:account_number) { "0123456-789" }
 
-      its([:account_number]) { is_expected.to eq("000123456789") }
+      its([:account_number]) { is_expected.to eq("0123456789") }
     end
   end
 
@@ -1311,7 +1311,7 @@ describe Ibandit::LocalDetailsCleaner do
       let(:account_number) { "0123456789" }
 
       its([:bank_code]) { is_expected.to eq(bank_code) }
-      its([:account_number]) { is_expected.to eq("_______0123456789") }
+      its([:account_number]) { is_expected.to eq("0123456789") }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: ruby
 authors:
 - GoCardless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-09-10 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.24.0
+        version: 2.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.26.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.