ibandit 1.0.1 → 1.0.2

data/ibandit.gemspec

@@ -3,13 +3,14 @@
 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 "nokogiri",        "~> 1.6"
   gem.add_development_dependency "pry",             "~> 0.10"
   gem.add_development_dependency "pry-nav",         "~> 0.2"
   gem.add_development_dependency "rspec",           "~> 3.3"
   gem.add_development_dependency "rspec-its",       "~> 1.2"
-  gem.add_development_dependency "rubocop",         "~> 0.75.1"
-  gem.add_development_dependency "sax-machine",     "~> 1.3"
+  gem.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
+  gem.add_development_dependency "sax-machine", "~> 1.3"
 
   gem.add_runtime_dependency "i18n"
 

data/lib/ibandit/german_details_converter.rb

@@ -957,6 +957,23 @@ module Ibandit
       end
     end
 
+    # New version of Rule004200 but with another range:
+    # For 10-digit Account Numbers, only the following Account Numbers are
+    # applicable to be issued / created into an IBAN with the
+    # standard-IBAN rule: nnn4400001 to nnn4499999
+    class Rule004201 < Rule004200
+      def converted_details
+        unpadded_account_number = @account_number.gsub(/\A0+/, "")
+
+        if unpadded_account_number.size == 10 &&
+            %w[4400001 4499999].include?(unpadded_account_number.slice(3, 10))
+          { bank_code: @bank_code, account_number: @account_number }
+        else
+          super
+        end
+      end
+    end
+
     class Rule004301 < BaseRule
       def converted_details
         { bank_code: "66650085", account_number: @account_number }
@@ -1028,6 +1045,10 @@ module Ibandit
       end
     end
 
+    class Rule004910 < BaseRule
+      # Rule 0049 10 is actually about modulus checking, not IBAN construction
+    end
+
     class Rule005000 < BaseRule
       def converted_details
         { bank_code: "28550000", account_number: @account_number }

data/lib/ibandit/iban.rb

@@ -225,7 +225,7 @@ module Ibandit
       return unless valid_country_code?
       return unless structure[:bban_format]
 
-      if bban =~ Regexp.new(structure[:bban_format])
+      if bban&.match?(Regexp.new(structure[:bban_format]))
         true
       else
         @errors[:format] = Ibandit.translate(:invalid_format,
@@ -238,7 +238,7 @@ module Ibandit
       return unless valid_bank_code_length?
       return true if structure[:bank_code_length]&.zero?
 
-      if swift_bank_code =~ Regexp.new(structure[:bank_code_format])
+      if swift_bank_code&.match?(Regexp.new(structure[:bank_code_format]))
         true
       else
         @errors[:bank_code] = Ibandit.translate(:is_invalid)
@@ -250,7 +250,7 @@ module Ibandit
       return unless valid_branch_code_length?
       return true unless structure[:branch_code_format]
 
-      if swift_branch_code =~ Regexp.new(structure[:branch_code_format])
+      if swift_branch_code&.match?(Regexp.new(structure[:branch_code_format]))
         true
       else
         @errors[:branch_code] = Ibandit.translate(:is_invalid)
@@ -261,7 +261,9 @@ module Ibandit
     def valid_account_number_format?
       return unless valid_account_number_length?
 
-      if swift_account_number =~ Regexp.new(structure[:account_number_format])
+      if swift_account_number&.match?(
+        Regexp.new(structure[:account_number_format]),
+      )
         true
       else
         @errors[:account_number] = Ibandit.translate(:is_invalid)

data/lib/ibandit/version.rb

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

data/spec/fixtures/germany_integration_test_cases.json

@@ -22,15 +22,15 @@
       { "bank_code": "72020700", "account_number" : "1111111611" }
     ]
   },
-  {
-    "convertor": "000300",
-    "valid": [
-      { "bank_code": "51010800", "account_number" : "1" }
-    ],
-    "invalid": [
-      { "bank_code": "51010800", "account_number" : "6161604670" }
-    ]
-  },
+  // {
+  //   "convertor": "000300",
+  //   "valid": [
+  //     { "bank_code": "51010800", "account_number" : "1" }
+  //   ],
+  //   "invalid": [
+  //     { "bank_code": "51010800", "account_number" : "6161604670" }
+  //   ]
+  // },
   {
     "convertor": "000400",
     "valid": [
@@ -101,12 +101,12 @@
       {"bank_code":"51020000","account_number":"30009963","converted_bank_code":"50020200","converted_account_number":"30009963"}
     ]
   },
-  {
-    "convertor": "000900",
-    "valid": [
-      {"bank_code":"68351976","account_number":"1116232594","converted_bank_code":"68351557","converted_account_number":"3047232594"}
-    ]
-  },
+  // {
+  //   "convertor": "000900",
+  //   "valid": [
+  //     {"bank_code":"68351976","account_number":"1116232594","converted_bank_code":"68351557","converted_account_number":"3047232594"}
+  //   ]
+  // },
   {
     "convertor": "001001",
     "valid": [
@@ -160,11 +160,11 @@
     "valid": [
       { "bank_code": "39060180", "account_number": "556", "converted_account_number": "0120440110" }
     ]
-  },
-  {
-    "convertor": "001900",
-    "valid": [
-      { "bank_code": "50130100", "account_number": "556", "converted_bank_code": "50120383" }
-    ]
   }
+  // {
+  //   "convertor": "001900",
+  //   "valid": [
+  //     { "bank_code": "50130100", "account_number": "556", "converted_bank_code": "50120383" }
+  //   ]
+  // }
 ]

data/spec/fixtures/germany_unit_test_cases.json

@@ -136,12 +136,12 @@
       { "bank_code": "10010010", "account_number" : "556", "converted_account_number": "0120440110" }
     ]
   },
-  {
-    "convertor": "001900",
-    "valid": [
-      { "bank_code": "10010010", "account_number" : "1234567890", "converted_bank_code": "50120383" }
-    ]
-  },
+  // {
+  //   "convertor": "001900",
+  //   "valid": [
+  //     { "bank_code": "10010010", "account_number" : "1234567890", "converted_bank_code": "50120383" }
+  //   ]
+  // },
   {
     "convertor": "002002",
     "valid": [
@@ -318,6 +318,20 @@
       { "bank_code": "10010010", "account_number" : "0040400000" },
       { "bank_code": "10010010", "account_number" : "0040412000" }
     ]
+  },
+    {
+    "convertor": "004201",
+    "valid": [
+      { "bank_code": "10010010", "account_number" : "0050462000" },
+      { "bank_code": "70020001", "account_number" : "0040402000" },
+      { "bank_code": "70020001", "account_number" : "1004400001" }
+    ],
+    "invalid": [
+      { "bank_code": "10010010", "account_number" : "504620001" },
+      { "bank_code": "10010010", "account_number" : "0040400000" },
+      { "bank_code": "10010010", "account_number" : "0040412000" },
+      { "bank_code": "70020001", "account_number" : "1035400001" }
+    ]
   },
   {
     "convertor": "004301",

data/spec/ibandit/local_details_cleaner_spec.rb

@@ -286,7 +286,7 @@ describe Ibandit::LocalDetailsCleaner do
 
     context "with unsupported account details" do
       let(:account_number) { "7955791111" }
-      let(:bank_code) { "20000000" }
+      let(:bank_code) { "99999999" }
 
       it { is_expected.to eq(local_details_with_swift) }
     end

data/spec/ibandit/structure_spec.rb

@@ -9,7 +9,7 @@ describe "structures.yml" do
   structures.each do |country, rules|
     context country do
       rules.each do |rule, value|
-        next unless rule =~ /_format$/
+        next unless rule.to_s.end_with?("_format")
 
         it "builds #{rule} rule" do
           expect { Regexp.new(value) }.to_not raise_exception

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ibandit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gc_ruboconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
@@ -131,10 +145,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -209,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convert national banking details into IBANs, and vice-versa.

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-
-matrix:
-  allow_failures:
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-sudo: false
-
-script:
-  - bundle exec rubocop
-  - bundle exec rspec spec