ibandit 0.7.0 → 0.8.0

data/lib/ibandit/pseudo_iban_assembler.rb

@@ -0,0 +1,77 @@
+module Ibandit
+  class PseudoIBANAssembler
+    def initialize(country_code: nil,
+                   bank_code: nil,
+                   branch_code: nil,
+                   account_number: nil)
+      @country_code = country_code
+      @bank_code = bank_code
+      @branch_code = branch_code
+      @account_number = account_number
+    end
+
+    def assemble
+      return unless can_assemble?
+
+      [
+        @country_code,
+        Constants::PSEUDO_IBAN_CHECK_DIGITS,
+        padded_bank_code,
+        padded_branch_code,
+        padded_account_number
+      ].join
+    end
+
+    private
+
+    def can_assemble?
+      country_code_valid? &&
+        bank_code_valid? &&
+        branch_code_valid? &&
+        account_number_valid?
+    end
+
+    def country_code_valid?
+      Constants::PSEUDO_IBAN_COUNTRY_CODES.include?(@country_code)
+    end
+
+    def bank_code_valid?
+      param_valid?(@bank_code, :pseudo_iban_bank_code_length)
+    end
+
+    def branch_code_valid?
+      param_valid?(@branch_code, :pseudo_iban_branch_code_length)
+    end
+
+    def account_number_valid?
+      param_valid?(@account_number, :pseudo_iban_account_number_length)
+    end
+
+    def param_valid?(value, length_key)
+      return true unless value.nil?
+      return true if structure[length_key] == 0
+      false
+    end
+
+    def padded_bank_code
+      pad(@bank_code, :pseudo_iban_bank_code_length)
+    end
+
+    def padded_branch_code
+      pad(@branch_code, :pseudo_iban_branch_code_length)
+    end
+
+    def padded_account_number
+      pad(@account_number, :pseudo_iban_account_number_length)
+    end
+
+    def pad(number, length_key)
+      return if number.nil?
+      number.rjust(structure[length_key], 'X')
+    end
+
+    def structure
+      Ibandit.structures.fetch(@country_code)
+    end
+  end
+end

data/lib/ibandit/pseudo_iban_splitter.rb

@@ -0,0 +1,86 @@
+module Ibandit
+  class PseudoIBANSplitter
+    def initialize(pseudo_iban)
+      @pseudo_iban = pseudo_iban
+    end
+
+    def split
+      return unless decomposable?
+
+      {
+        country_code: country_code,
+        bank_code: bank_code,
+        branch_code: branch_code,
+        account_number: account_number
+      }
+    end
+
+    private
+
+    def country_code
+      @pseudo_iban.slice(0, 2)
+    end
+
+    def check_digits
+      @pseudo_iban.slice(2, 2)
+    end
+
+    def bank_code
+      pseudo_iban_part(bank_code_start_index, :pseudo_iban_bank_code_length)
+    end
+
+    def branch_code
+      pseudo_iban_part(branch_code_start_index,
+                       :pseudo_iban_branch_code_length)
+    end
+
+    def account_number
+      pseudo_iban_part(account_number_start_index,
+                       :pseudo_iban_account_number_length)
+    end
+
+    def pseudo_iban_part(start_index, length_key)
+      length = structure.fetch(length_key)
+      return if length == 0
+
+      @pseudo_iban.slice(start_index, length).gsub(/\AX+/, '')
+    end
+
+    def bank_code_start_index
+      4
+    end
+
+    def branch_code_start_index
+      bank_code_start_index + structure.fetch(:pseudo_iban_bank_code_length)
+    end
+
+    def account_number_start_index
+      branch_code_start_index + structure.fetch(:pseudo_iban_branch_code_length)
+    end
+
+    def expected_length
+      account_number_start_index +
+        structure.fetch(:pseudo_iban_account_number_length)
+    end
+
+    def decomposable?
+      country_code_valid? && check_digits_valid? && correct_length?
+    end
+
+    def country_code_valid?
+      Constants::PSEUDO_IBAN_COUNTRY_CODES.include?(country_code)
+    end
+
+    def check_digits_valid?
+      check_digits == Constants::PSEUDO_IBAN_CHECK_DIGITS
+    end
+
+    def correct_length?
+      @pseudo_iban.length == expected_length
+    end
+
+    def structure
+      Ibandit.structures[country_code]
+    end
+  end
+end

data/lib/ibandit/swedish_details_converter.rb

@@ -1,41 +1,92 @@
 module Ibandit
-  module SwedishDetailsConverter
-    def self.convert(account_number)
-      cleaned_account_number =
-        account_number.gsub(/[-.\s]/, '').gsub(/\A0+/, '')
-
-      bank_info = bank_info_for(cleaned_account_number.slice(0, 4))
+  class SwedishDetailsConverter
+    def initialize(branch_code: nil, account_number: nil)
+      @branch_code = branch_code
+      @account_number = account_number
+    end
 
+    def convert
       if bank_info.nil?
-        return { bank_code: nil,
-                 account_number: cleaned_account_number.rjust(17, '0') }
+        return { swift_bank_code: nil,
+                 swift_account_number: cleaned_account_number.rjust(17, '0') }
       end
 
-      clearing_code_length = bank_info.fetch(:clearing_code_length)
-      serial_number_length = bank_info.fetch(:serial_number_length)
+      {
+        account_number: serial_number,
+        branch_code: clearing_code,
+        swift_bank_code: bank_info.fetch(:bank_code).to_s,
+        swift_account_number: swift_account_number
+      }
+    end
 
-      clearing_code = cleaned_account_number.slice(0, clearing_code_length)
-      serial_number = cleaned_account_number[clearing_code_length..-1]
+    private
 
-      if bank_info.fetch(:zerofill_serial_number)
-        serial_number = serial_number.rjust(serial_number_length, '0')
-      end
+    def cleaned_account_number
+      # Don't trim leading zeroes if the account number we are given is a
+      # serial number (i.e. if the clearing code is separate).
+      @cleaned_account_number ||= if @branch_code.nil?
+                                    clean_account_number(@account_number)
+                                  else
+                                    remove_bad_chars(@account_number)
+                                  end
+    end
 
-      iban_account_number =
-        if bank_info.fetch(:include_clearing_code)
-          (clearing_code + serial_number).rjust(17, '0')
-        else
-          serial_number.rjust(17, '0')
-        end
+    def cleaned_branch_code
+      @cleaned_branch_code ||= remove_bad_chars(@branch_code)
+    end
 
-      {
-        bank_code: bank_info.fetch(:bank_code).to_s,
-        account_number: iban_account_number
-      }
+    def remove_bad_chars(number)
+      return if number.nil?
+      number.gsub(/[-.\s]/, '')
+    end
+
+    def clean_account_number(number)
+      return if number.nil?
+      remove_bad_chars(number).gsub(/\A0+/, '')
+    end
+
+    def bank_info
+      @bank_info ||= self.class.bank_info_for(bank_info_key)
     end
 
-    def self.valid_bank_code?(bank_code: bank_code,
-                              account_number: account_number)
+    def bank_info_key
+      (cleaned_branch_code || cleaned_account_number).slice(0, 4)
+    end
+
+    def clearing_code_length
+      bank_info.fetch(:clearing_code_length)
+    end
+
+    def serial_number_length
+      bank_info.fetch(:serial_number_length)
+    end
+
+    def clearing_code
+      cleaned_branch_code ||
+        cleaned_account_number.slice(0, clearing_code_length)
+    end
+
+    def serial_number
+      serial_number = if @branch_code.nil?
+                        cleaned_account_number[clearing_code_length..-1]
+                      else
+                        cleaned_account_number
+                      end
+
+      return serial_number unless bank_info.fetch(:zerofill_serial_number)
+
+      serial_number.rjust(serial_number_length, '0')
+    end
+
+    def swift_account_number
+      if bank_info.fetch(:include_clearing_code)
+        (clearing_code + serial_number).rjust(17, '0')
+      else
+        serial_number.rjust(17, '0')
+      end
+    end
+
+    def self.valid_bank_code?(bank_code: nil, account_number: nil)
       possible_bank_infos = possible_bank_info_for(
         bank_code: bank_code, account_number: account_number
       )
@@ -43,7 +94,7 @@ module Ibandit
       possible_bank_infos.any?
     end
 
-    def self.valid_length?(bank_code: bank_code, account_number: account_number)
+    def self.valid_length?(bank_code: nil, account_number: nil)
       return unless valid_bank_code?(
         bank_code: bank_code, account_number: account_number
       )
@@ -68,15 +119,11 @@ module Ibandit
       end
     end
 
-    private
-
     def self.bank_info_for(clearing_code)
       bank_info_table.find { |bank| bank[:range].include?(clearing_code.to_i) }
     end
-    private_class_method :bank_info_for
 
-    def self.possible_bank_info_for(bank_code: bank_code,
-                                    account_number: account_number)
+    def self.possible_bank_info_for(bank_code: nil, account_number: nil)
       clearing_number = account_number.gsub(/\A0+/, '').slice(0, 4).to_i
 
       possible_bank_infos = bank_info_table.select do |bank|

data/lib/ibandit/version.rb

@@ -1,3 +1,3 @@
 module Ibandit
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/spec/ibandit/iban_assembler_spec.rb

@@ -6,9 +6,9 @@ describe Ibandit::IBANAssembler do
     let(:args) do
       {
         country_code:   iban.country_code,
-        account_number: iban.account_number,
-        branch_code:    iban.branch_code,
-        bank_code:      iban.bank_code
+        account_number: iban.swift_account_number,
+        branch_code:    iban.swift_branch_code,
+        bank_code:      iban.swift_bank_code
       }.reject { |_key, value| value.nil? }
     end
 

data/spec/ibandit/iban_spec.rb

@@ -49,6 +49,9 @@ describe Ibandit::IBAN do
     its(:bank_code) { is_expected.to eq('WEST') }
     its(:branch_code) { is_expected.to eq('123456') }
     its(:account_number) { is_expected.to eq('98765432') }
+    its(:swift_bank_code) { is_expected.to eq('WEST') }
+    its(:swift_branch_code) { is_expected.to eq('123456') }
+    its(:swift_account_number) { is_expected.to eq('98765432') }
     its(:iban_national_id) { is_expected.to eq('WEST123456') }
     its(:local_check_digits) { is_expected.to be_nil }
 
@@ -65,6 +68,21 @@ describe Ibandit::IBAN do
       its(:local_check_digits) { is_expected.to be_nil }
     end
 
+    context 'when local details are not available' do
+      let(:iban_code) { 'SE2680000000075071211203' }
+
+      its(:country_code) { is_expected.to eq('SE') }
+      its(:check_digits) { is_expected.to eq('26') }
+      its(:bank_code) { is_expected.to be_nil }
+      its(:branch_code) { is_expected.to be_nil }
+      its(:account_number) { is_expected.to be_nil }
+      its(:swift_bank_code) { is_expected.to eq('800') }
+      its(:swift_branch_code) { is_expected.to be_nil }
+      its(:swift_account_number) { is_expected.to eq('00000075071211203') }
+      its(:iban_national_id) { is_expected.to eq('800') }
+      its(:local_check_digits) { is_expected.to be_nil }
+    end
+
     context 'when the IBAN was created with local details' do
       let(:arg) do
         {
@@ -79,6 +97,43 @@ describe Ibandit::IBAN do
       its(:bank_code) { is_expected.to eq(arg[:bank_code]) }
       its(:branch_code) { is_expected.to eq(arg[:branch_code]) }
       its(:account_number) { is_expected.to eq(arg[:account_number]) }
+      its(:swift_bank_code) { is_expected.to eq(arg[:bank_code]) }
+      its(:swift_branch_code) { is_expected.to eq(arg[:branch_code]) }
+      its(:swift_account_number) { is_expected.to eq(arg[:account_number]) }
+    end
+
+    context 'when the IBAN was created with local details for Sweden' do
+      let(:arg) do
+        {
+          country_code: 'SE',
+          branch_code: '1281',
+          account_number: '0105723'
+        }
+      end
+
+      its(:country_code) { is_expected.to eq(arg[:country_code]) }
+      its(:bank_code) { is_expected.to eq(arg[:bank_code]) }
+      its(:branch_code) { is_expected.to eq(arg[:branch_code]) }
+      its(:account_number) { is_expected.to eq(arg[:account_number]) }
+      its(:swift_bank_code) { is_expected.to eq('120') }
+      its(:swift_branch_code) { is_expected.to be_nil }
+      its(:swift_account_number) { is_expected.to eq('00000012810105723') }
+      its(:iban) { is_expected.to eq('SE5412000000012810105723') }
+      its(:pseudo_iban) { is_expected.to eq('SEZZX1281XXX0105723') }
+    end
+
+    context 'when the IBAN was created from a pseudo-IBAN' do
+      let(:arg) { 'SEZZX1281XXX0105723' }
+
+      its(:country_code) { is_expected.to eq('SE') }
+      its(:bank_code) { is_expected.to be_nil }
+      its(:branch_code) { is_expected.to eq('1281') }
+      its(:account_number) { is_expected.to eq('0105723') }
+      its(:swift_bank_code) { is_expected.to eq('120') }
+      its(:swift_branch_code) { is_expected.to be_nil }
+      its(:swift_account_number) { is_expected.to eq('00000012810105723') }
+      its(:iban) { is_expected.to eq('SE5412000000012810105723') }
+      its(:pseudo_iban) { is_expected.to eq('SEZZX1281XXX0105723') }
     end
   end
 
@@ -358,7 +413,7 @@ describe Ibandit::IBAN do
     end
 
     context 'with invalid details' do
-      before { allow(iban).to receive(:bank_code).and_return('WES') }
+      before { allow(iban).to receive(:swift_bank_code).and_return('WES') }
       it { is_expected.to eq(false) }
 
       context 'locale en', locale: :en do
@@ -444,7 +499,7 @@ describe Ibandit::IBAN do
     end
 
     context 'with invalid details' do
-      before { allow(iban).to receive(:branch_code).and_return('12345') }
+      before { allow(iban).to receive(:swift_branch_code).and_return('12345') }
       it { is_expected.to eq(false) }
 
       context 'locale en', locale: :en do
@@ -512,7 +567,7 @@ describe Ibandit::IBAN do
     end
 
     context 'without a branch code' do
-      before { allow(iban).to receive(:branch_code).and_return(nil) }
+      before { allow(iban).to receive(:swift_branch_code).and_return(nil) }
       it { is_expected.to eq(false) }
 
       context 'locale en', locale: :en do
@@ -584,7 +639,9 @@ describe Ibandit::IBAN do
     end
 
     context 'with an invalid account_number' do
-      before { allow(iban).to receive(:account_number).and_return('1234567') }
+      before do
+        allow(iban).to receive(:swift_account_number).and_return('1234567')
+      end
       it { is_expected.to eq(false) }
 
       context 'locale en', locale: :en do

data/spec/ibandit/local_details_cleaner_spec.rb

@@ -10,18 +10,27 @@ describe Ibandit::LocalDetailsCleaner do
       account_number: account_number
     }
   end
+
+  let(:local_details_with_swift) do
+    local_details.merge(
+      swift_bank_code:      bank_code,
+      swift_branch_code:    branch_code,
+      swift_account_number: account_number
+    )
+  end
+
   let(:country_code) { nil }
   let(:bank_code) { nil }
   let(:branch_code) { nil }
   let(:account_number) { nil }
 
   context 'without country code' do
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
   end
 
   context 'with an unsupported country code' do
     let(:country_code) { 'FU' }
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
   end
 
   context 'Austria' do
@@ -29,7 +38,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '19043' }
     let(:account_number) { '00234573201' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an account number which needs zero-padding' do
       let(:account_number) { '234573201' }
@@ -43,27 +52,27 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'with a long account number' do
       let(:account_number) { '234573201999' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with a short bank code' do
       let(:bank_code) { '1904' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with a long bank code' do
       let(:bank_code) { '190430' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -83,7 +92,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -93,21 +102,21 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '9661' }
     let(:account_number) { '1020345678' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -117,7 +126,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '002' }
     let(:branch_code) { '00128' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with a short account number' do
       let(:account_number) { '1200527600' }
@@ -131,12 +140,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'with a long account number' do
       let(:account_number) { '00000001200527600' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with the branch code in the bank code field' do
@@ -148,7 +157,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -157,7 +166,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '0800' }
     let(:account_number) { '0000192000145399' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an account number prefix' do
       let(:prefix) { '000019' }
@@ -174,12 +183,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -188,16 +197,16 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '37040044' }
     let(:account_number) { '0532013000' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with an excessively short account number' do
@@ -215,7 +224,7 @@ describe Ibandit::LocalDetailsCleaner do
     context 'with unsupported account details' do
       let(:account_number) { '7955791111' }
       let(:bank_code) { '20000000' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -238,7 +247,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -257,7 +266,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -267,7 +276,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '0001' }
     let(:account_number) { '180000012345' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with bank and branch codes in the account number' do
       let(:bank_code) { nil }
@@ -281,7 +290,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -290,7 +299,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '123456' }
     let(:account_number) { '00000785' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with a shorter account number' do
       let(:account_number) { '785' }
@@ -307,12 +316,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -322,7 +331,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '01005' }
     let(:account_number) { '0500013M02606' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with the RIB key spaced in the account number' do
       let(:account_number) { '0500013M026 06' }
@@ -336,22 +345,22 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'with the RIB key missing' do
       let(:account_number) { '0500013M026' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -361,7 +370,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '200000' }
     let(:account_number) { '55779911' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with the sort code is hyphenated' do
       let(:branch_code) { '20-00-00' }
@@ -395,12 +404,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
 
       context 'with a BIC finder set' do
         let(:bic_finder) { double }
@@ -435,21 +444,21 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '0125' }
     let(:account_number) { '0000000012300695' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -458,7 +467,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '1001005' }
     let(:account_number) { '1863000160' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with bank code in the account number' do
       let(:bank_code) { nil }
@@ -470,13 +479,13 @@ describe Ibandit::LocalDetailsCleaner do
 
       context 'with a badly formatted account number' do
         let(:account_number) { '1863000160' }
-        it { is_expected.to eq(local_details) }
+        it { is_expected.to eq(local_details_with_swift) }
       end
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -486,7 +495,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '7301' }
     let(:account_number) { '61111101800000000' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with bank and branch codes in the account number' do
       let(:bank_code) { nil }
@@ -510,19 +519,19 @@ describe Ibandit::LocalDetailsCleaner do
 
       context 'with an invalid length account number' do
         let(:account_number) { '11773016-1111101' }
-        it { is_expected.to eq(local_details) }
+        it { is_expected.to eq(local_details_with_swift) }
       end
 
       context 'with a bank code, too' do
         let(:account_number) { '11773016-11111018' }
         let(:bank_code) { '117' }
-        it { is_expected.to eq(local_details) }
+        it { is_expected.to eq(local_details_with_swift) }
       end
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -532,7 +541,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '931152' }
     let(:account_number) { '12345678' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with the sort code is hyphenated' do
       let(:branch_code) { '93-11-52' }
@@ -566,12 +575,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
 
       context 'with a BIC finder set' do
         let(:bic_finder) { double }
@@ -642,7 +651,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -652,11 +661,11 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '11101' }
     let(:account_number) { '000000123456' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an explicit check digit' do
       before { local_details.merge!(check_digit: 'Y') }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with the account number not zero-padded' do
@@ -666,17 +675,17 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -685,16 +694,16 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '10000' }
     let(:account_number) { '11101001000' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -703,16 +712,16 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '001' }
     let(:account_number) { '9400644750000' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -721,16 +730,16 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { 'BANK' }
     let(:account_number) { '1234567890123' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -740,7 +749,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '01005' }
     let(:account_number) { '0500013M02606' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with the RIB key spaced in the account number' do
       let(:account_number) { '0500013M026 06' }
@@ -754,22 +763,22 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'with the RIB key missing' do
       let(:account_number) { '0500013M026' }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -779,7 +788,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '44093' }
     let(:account_number) { '000000009027293051' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with the account number spaced' do
       let(:account_number) { '9027 2930 51' }
@@ -793,12 +802,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
 
       context 'with a BIC finder set' do
         let(:bic_finder) { double }
@@ -832,21 +841,21 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { 'ABNA' }
     let(:account_number) { '0417164300' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with an account number that needs zero-padding' do
@@ -860,7 +869,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '8601' }
     let(:account_number) { '1117947' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with bank and branch codes in the account number' do
       let(:bank_code) { nil }
@@ -873,7 +882,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -882,7 +891,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '10201026' }
     let(:account_number) { '0000042270201111' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with a full length account number' do
       let(:bank_code) { nil }
@@ -895,7 +904,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -905,21 +914,21 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '0023' }
     let(:account_number) { '0023843000578' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -928,16 +937,16 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { 'AAAA' }
     let(:account_number) { '1B31007593840000' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -946,8 +955,10 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '501' }
     let(:account_number) { '5013-1007270' }
 
-    its([:bank_code]) { is_expected.to eq('501') }
-    its([:account_number]) { is_expected.to eq('00000050131007270') }
+    its([:account_number]) { is_expected.to eq('1007270') }
+    its([:branch_code]) { is_expected.to eq('5013') }
+    its([:swift_bank_code]) { is_expected.to eq('501') }
+    its([:swift_account_number]) { is_expected.to eq('00000050131007270') }
 
     context 'without an account number' do
       let(:account_number) { nil }
@@ -957,8 +968,9 @@ describe Ibandit::LocalDetailsCleaner do
     context 'without a bank code' do
       let(:bank_code) { nil }
 
-      its([:bank_code]) { is_expected.to eq('500') }
-      its([:account_number]) { is_expected.to eq('00000050131007270') }
+      its([:swift_bank_code]) { is_expected.to eq('500') }
+      its([:account_number]) { is_expected.to eq('1007270') }
+      its([:swift_account_number]) { is_expected.to eq('00000050131007270') }
     end
   end
 
@@ -967,7 +979,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '19100' }
     let(:account_number) { '0000123438' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an account number which needs zero-padding' do
       let(:account_number) { '123438' }
@@ -976,12 +988,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -990,7 +1002,7 @@ describe Ibandit::LocalDetailsCleaner do
     let(:bank_code) { '1200' }
     let(:account_number) { '0000198742637541' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an account number prefix' do
       let(:prefix) { '000019' }
@@ -1007,12 +1019,12 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 
@@ -1022,11 +1034,11 @@ describe Ibandit::LocalDetailsCleaner do
     let(:branch_code) { '11101' }
     let(:account_number) { '000000123456' }
 
-    it { is_expected.to eq(local_details) }
+    it { is_expected.to eq(local_details_with_swift) }
 
     context 'with an explicit check digit' do
       before { local_details.merge!(check_digit: 'Y') }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'with the account number not zero-padded' do
@@ -1036,17 +1048,17 @@ describe Ibandit::LocalDetailsCleaner do
 
     context 'without a bank code' do
       let(:bank_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without a branch code' do
       let(:branch_code) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
 
     context 'without an account number' do
       let(:account_number) { nil }
-      it { is_expected.to eq(local_details) }
+      it { is_expected.to eq(local_details_with_swift) }
     end
   end
 end