ibandit 1.6.1 → 1.8.1

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

data/ibandit.gemspec

@@ -3,13 +3,13 @@
 require File.expand_path("lib/ibandit/version", __dir__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency "gc_ruboconfig",   "~> 2.26.0"
+  gem.add_development_dependency "gc_ruboconfig",   "~> 2.31.0"
   gem.add_development_dependency "nokogiri",        "~> 1.6"
   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"
+  gem.add_development_dependency "rspec_junit_formatter", "~> 0.5.0"
   gem.add_development_dependency "sax-machine", "~> 1.3"
 
   gem.add_runtime_dependency "i18n"

data/lib/ibandit/german_details_converter.rb

@@ -270,13 +270,15 @@ module Ibandit
         when "13"
           if unpadded_account_number.size.between?(6, 7)
             unpadded_account_number + "00"
-          else @account_number
+          else
+            @account_number
           end
         when "76"
           case unpadded_account_number.size
           when 7..8
             if Check76.new(@account_number).valid? then @account_number
-            else unpadded_account_number + "00"
+            else
+              unpadded_account_number + "00"
             end
           when 5..6 then unpadded_account_number + "00"
           else @account_number

data/lib/ibandit/local_details_cleaner.rb

@@ -42,7 +42,8 @@ module Ibandit
         %i[account_number]
       when "GB", "IE", "MT"
         if Ibandit.bic_finder.nil? then %i[bank_code branch_code account_number]
-        else %i[branch_code account_number]
+        else
+          %i[branch_code account_number]
         end
       when "AU"
         %i[branch_code account_number]
@@ -68,14 +69,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
 

data/lib/ibandit/version.rb

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

data/lib/ibandit.rb

@@ -30,8 +30,9 @@ module Ibandit
     end
 
     def structures
-      @structures ||= YAML.load_file(
-        File.expand_path("../data/structures.yml", __dir__),
+      @structures ||= YAML.safe_load(
+        File.read(File.expand_path("../data/structures.yml", __dir__)),
+        permitted_classes: [Range, Symbol],
       )
     end
 

data/spec/ibandit/german_details_converter_spec.rb

@@ -19,7 +19,7 @@ describe Ibandit::GermanDetailsConverter do
 
         convertor.fetch("valid", []).each do |tuple|
           context "bank code: #{tuple['bank_code']} account number " \
-            "#{tuple['account_number']}" do
+                  "#{tuple['account_number']}" do
             let(:bank_code) do
               tuple["bank_code"]
             end
@@ -44,7 +44,7 @@ describe Ibandit::GermanDetailsConverter do
 
         convertor.fetch("invalid", []).each do |tuple|
           context "bank code: #{tuple['bank_code']} account number " \
-            "#{tuple['account_number']}" do
+                  "#{tuple['account_number']}" do
             let(:bank_code) { tuple["bank_code"] || "00000000" }
             let(:account_number) { tuple["account_number"] }
 

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
@@ -1061,7 +1061,7 @@ describe Ibandit::IBAN do
           iban.valid_length?
           expect(iban.errors).
             to include(length: "Length doesn't match SWIFT specification " \
-                       "(expected 22 characters, received 20)")
+                               "(expected 22 characters, received 20)")
         end
       end
 
@@ -1313,7 +1313,7 @@ describe Ibandit::IBAN do
           iban.valid_branch_code_length?
           expect(iban.errors).
             to include(branch_code: "is the wrong length (should be 6 " \
-                       "characters)")
+                                    "characters)")
         end
       end
 

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

data/spec/ibandit/structure_spec.rb

@@ -3,8 +3,8 @@
 require "spec_helper"
 
 describe "structures.yml" do
-  structure_file = File.expand_path("../../data/structures.yml", __dir__)
-  structures = YAML.load_file(structure_file)
+  structure_file = File.read(File.expand_path("../../data/structures.yml", __dir__))
+  structures = YAML.safe_load(structure_file, permitted_classes: [Range, Symbol])
 
   structures.each do |country, rules|
     context country do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.1
 platform: ruby
 authors:
 - GoCardless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2022-02-08 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.26.0
+        version: 2.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.0
+        version: 2.31.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.