ibandit 1.1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7f514b3f0df40558c334ff8e13f316fda58307227b9ca9fc5a19b7cfc9cb6b
-  data.tar.gz: 9b560e5f044623db8945f60d2daae511b7e9121b9323b433cf505290d9aa7199
+  metadata.gz: ce9c18eff5b207baa0033413309a91725ee47d144a89d73a4bcd2d97f04d5b11
+  data.tar.gz: ba2ede678314e2e635c709dd946e55fd03b540357d4cf91bb1be2ce4b2d804a1
 SHA512:
-  metadata.gz: 33cccec4dfdc300394f34f97793b6ce1f427676276b513bc8b05f607158390788cbd92f13e1e63bd885ab77bf04f70296326f2e2098f3c34632754757e7824b0
-  data.tar.gz: a252432670aa9f7a2e29ca0c0984bbfab27a5a103bcdc9e41feedfad94e5226d81844b789bb3c17c922fb88cec632d6add0b3664e242a9f58a633337ac3ee4ce
+  metadata.gz: cbcd99312290c857c48287c4f401fac1774a17e53f18064199f437df1e246a78e220ac73751ea44b6201a16508aa329a796142b7c46146ac4143b2fb082150f0
+  data.tar.gz: '0289e1cf17c880b4b34f6f8f89cdc37f3cb5348a5f47bfab04b7aa19bd3dd0e58021d96f58cfb4bbd0117813cfff35e796ebc090fd1152ec25b65fb5a7ca4398'

data/.rubocop.yml

@@ -43,3 +43,8 @@ Metrics/ModuleLength:
 
 Layout/DotPosition:
   EnforcedStyle: 'trailing'
+
+# Wants to to lock to Ruby 2.4 as specified here but as this is a public gem
+# this is quite aggressive.
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,16 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-05-30 14:34:05 +0100 using RuboCop version 0.70.0.
+# on 2020-08-25 10:15:35 UTC using RuboCop version 0.89.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 10
+# Offense count: 8
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 25
 
-# Offense count: 4
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 8
 
@@ -23,7 +25,7 @@ Naming/MemoizedInstanceVariableName:
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
     - 'lib/ibandit/german_details_converter.rb'
@@ -45,25 +47,24 @@ RSpec/ExpectInHook:
     - 'spec/ibandit/german_details_converter_spec.rb'
 
 # Offense count: 12
-# Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 2
 
+# Offense count: 182
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 7
+
 # Offense count: 20
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
     - 'spec/ibandit/iban_spec.rb'
 
-# Offense count: 367
+# Offense count: 368
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 3
-RSpec/ScatteredLet:
-  Exclude:
-    - 'spec/ibandit/iban_spec.rb'
-
 # Offense count: 18
 RSpec/ScatteredSetup:
   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0 - August 25, 2020
+
+- Improve validation for iban lengths
+- Strip unwanted hyphen chars for Canadian IBANs
+- Update rubocop and related gems
+
 ## 1.1.0.1 - June 17, 2020
 
 - Fix Rule4901

data/Rakefile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/data/structures.yml

@@ -95,7 +95,7 @@ BE:
   :national_id_length: 3
   :bban_format: "\\d{3}\\d{7}\\d{2}"
   :bank_code_format: "\\d{3}"
-  :account_number_format: "\\d{7}\\d{2}"
+  :account_number_format: "\\d{7}\\d{2}\\d{3}"
   :local_check_digit_position: 15
   :local_check_digit_length: 2
 BG:
@@ -902,7 +902,7 @@ US:
   :branch_code_length: 0
   :account_number_length: 17
   :bank_code_format: "\\d{9}"
-  :account_number_format: "\\A_*\\d{1,17}\\z"
+  :account_number_format: "_*\\d{1,17}"
   :national_id_length: 9
   :pseudo_iban_bank_code_length: 9
   :pseudo_iban_branch_code_length: 0

data/ibandit.gemspec

@@ -3,7 +3,7 @@
 require File.expand_path("lib/ibandit/version", __dir__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency "gc_ruboconfig",   "~> 2.12.0"
+  gem.add_development_dependency "gc_ruboconfig",   "~> 2.17.0"
   gem.add_development_dependency "nokogiri",        "~> 1.6"
   gem.add_development_dependency "pry",             "~> 0.10"
   gem.add_development_dependency "pry-nav",         "~> 0.2"

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.2.0"
 end

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?).

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.2.0
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-09-01 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.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - TODO.md
 - bin/build_german_iban_rules.rb
 - bin/build_structure_file.rb
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.