ibandit 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101e32709372c4aa77b414ffd6a51e72b76d01c0
-  data.tar.gz: 18864657f16536a50ef7037a1e0c3d583c94693f
+  metadata.gz: a8c359511af493cf0c67d92be073707e7e89aafa
+  data.tar.gz: 086f4eb19008f7deafe3112d7902e684adc41a0c
 SHA512:
-  metadata.gz: a7d31438134017276eea2e49cd41861cc9f52da897e3954a0315bb8f405867e864935c4b9538eff7dd44bff0fc0db41f4d4750aab916ea0ce49bf9acad63fa6b
-  data.tar.gz: 3069f177708f23613f0d3d7e35837ae77b6366aed8aaae399e3a9f7fd24b281634d9515c0a55068deb1ebbe0659b5a9fdfe786725838a166be7c7a22056d0cad
+  metadata.gz: 42bbedef82e946bf3e563949d9f30a387704b848a0043de9b8d6cb37347ce136895167ac8dc1f40da129ec3e47995b17964c2c35d30855847307d8b5abeb3e84
+  data.tar.gz: 24f02a0e80d6bb64361741a465b3da217839d9fa695634d481ad7b98649a6573b9048b1251aba74e5d679a97810bc9543633a367242047e8341e52e5bd36d3ce

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.0 -  January 25, 2016
+
+- BREAKING CHANGE: Update modulus checker hooks to expect a `valid_branch_code?`
+  method. See https://github.com/gocardless/ibandit/pull/65 for more details.
+
 ## 0.8.8 -  January 22, 2016
 
 - Strip whitespace from Spanish account numbers

data/lib/ibandit/iban.rb

@@ -243,7 +243,9 @@ module Ibandit
       return unless valid_format?
       return true unless Ibandit.modulus_checker
 
-      valid_modulus_check_bank_code? && valid_modulus_check_account_number?
+      valid_modulus_check_bank_code? &&
+        valid_modulus_check_branch_code? &&
+        valid_modulus_check_account_number?
     end
 
     def passes_country_specific_checks?
@@ -385,7 +387,14 @@ module Ibandit
     def valid_modulus_check_bank_code?
       return true if Ibandit.modulus_checker.valid_bank_code?(iban.to_s)
 
-      @errors[modulus_check_bank_code_field] = Ibandit.translate(:is_invalid)
+      @errors[:bank_code] = Ibandit.translate(:is_invalid)
+      false
+    end
+
+    def valid_modulus_check_branch_code?
+      return true if Ibandit.modulus_checker.valid_branch_code?(iban.to_s)
+
+      @errors[:branch_code] = Ibandit.translate(:is_invalid)
       false
     end
 
@@ -396,15 +405,6 @@ module Ibandit
       false
     end
 
-    def modulus_check_bank_code_field
-      if LocalDetailsCleaner.required_fields(country_code).
-         include?(:branch_code)
-        :branch_code
-      else
-        :bank_code
-      end
-    end
-
     def swift_details
       {
         country_code: @country_code,

data/lib/ibandit/version.rb

@@ -1,3 +1,3 @@
 module Ibandit
-  VERSION = '0.8.8'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/spec/ibandit/iban_spec.rb

@@ -1137,6 +1137,7 @@ describe Ibandit::IBAN do
       before do
         Ibandit.modulus_checker = double(
           valid_bank_code?: valid_bank_code,
+          valid_branch_code?: valid_branch_code,
           valid_account_number?: valid_account_number)
       end
       after { Ibandit.modulus_checker = nil }
@@ -1145,6 +1146,7 @@ describe Ibandit::IBAN do
       context 'with an invalid bank code' do
         let(:iban_code) { 'AT611904300234573201' }
         let(:valid_bank_code) { false }
+        let(:valid_branch_code) { true }
         let(:valid_account_number) { true }
 
         it { is_expected.to be(false) }
@@ -1177,60 +1179,64 @@ describe Ibandit::IBAN do
         context 'locale nl', locale: :nl do
           specify { expect(iban.errors).to include(bank_code: 'is ongeldig') }
         end
+      end
 
-        context 'when the bank code is not required' do
-          let(:iban_code) { 'GB60BARC20000055779911' }
-          before { Ibandit.bic_finder = double(call: 'BARCGB22XXX') }
-          after { Ibandit.bic_finder = nil }
-          before { iban.valid_local_modulus_check? }
+      context 'with an invalid branch code' do
+        let(:iban_code) { 'GB60BARC20000055779911' }
+        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 { is_expected.to be(false) }
-          context 'locale en', locale: :en do
-            specify do
-              expect(iban.errors).to include(branch_code: 'is invalid')
-            end
+        it { is_expected.to be(false) }
+        context 'locale en', locale: :en do
+          specify do
+            expect(iban.errors).to include(branch_code: 'is invalid')
           end
+        end
 
-          context 'locale fr', locale: :fr do
-            specify do
-              expect(iban.errors).to include(branch_code: 'est invalide')
-            end
+        context 'locale fr', locale: :fr do
+          specify do
+            expect(iban.errors).to include(branch_code: 'est invalide')
           end
+        end
 
-          context 'locale de', locale: :de do
-            specify do
-              expect(iban.errors).to include(branch_code: 'ist nicht gültig')
-            end
+        context 'locale de', locale: :de do
+          specify do
+            expect(iban.errors).to include(branch_code: 'ist nicht gültig')
           end
+        end
 
-          context 'locale pt', locale: :pt do
-            specify do
-              expect(iban.errors).to include(branch_code: 'é inválido')
-            end
+        context 'locale pt', locale: :pt do
+          specify do
+            expect(iban.errors).to include(branch_code: 'é inválido')
           end
+        end
 
-          context 'locale es', locale: :es do
-            specify do
-              expect(iban.errors).to include(branch_code: 'es inválido')
-            end
+        context 'locale es', locale: :es do
+          specify do
+            expect(iban.errors).to include(branch_code: 'es inválido')
           end
+        end
 
-          context 'locale it', locale: :it do
-            specify do
-              expect(iban.errors).to include(branch_code: 'non è valido')
-            end
+        context 'locale it', locale: :it do
+          specify do
+            expect(iban.errors).to include(branch_code: 'non è valido')
           end
+        end
 
-          context 'locale nl', locale: :nl do
-            specify do
-              expect(iban.errors).to include(branch_code: 'is ongeldig')
-            end
+        context 'locale nl', locale: :nl do
+          specify do
+            expect(iban.errors).to include(branch_code: 'is ongeldig')
           end
         end
       end
 
       context 'with an invalid account number' do
         let(:valid_bank_code) { true }
+        let(:valid_branch_code) { true }
         let(:valid_account_number) { false }
 
         it { is_expected.to be(false) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Grey Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec