bank-contact 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a634611f8033bbb771984e23f9c52d0d42430358
-  data.tar.gz: aee62a415954e8aebd42d3cc257301a6a975987a
+  metadata.gz: 956289106e81aeb5209fe45c020dd92ffd1caca7
+  data.tar.gz: 25afd8a545784de7c02bd094b1b34f1e1d44e307
 SHA512:
-  metadata.gz: c20be34292875bb16535a1f4bd70949f84488ac89ab340b4edce6c7be0e7ff3fdfc3ee1dce936962441dcb3634823d6244abd93290cfcb8ca6bb1c7686785bef
-  data.tar.gz: 5d0086e752090a6dd1f15a4d595ff4827a73e40abc81177068d286d090d8daecce690fdfd5041417e9e19233a706915e5e7ceb2cc9c30bc3cd94f81f72b7f6dc
+  metadata.gz: f26c8171bd9cf7d190e01623c2aac84ada412d0624deb437e08ffbfa9854e69546455a2d5d3760de189e18e7b7dcc45f4a494583a030bd44a2e6016a295922da
+  data.tar.gz: ccdf67e7d84b59d23ffc6611b01829cb924ad5b22ab64addf7a1baecebcbcd9cd6d0180872973ac36444a8fc21ba5035b4d19bab40181a650564b8920479837c

data/lib/bank/bic.rb

@@ -2,12 +2,14 @@ require 'bank/validators/bic_validator' if defined? ActiveModel
 
 module Bank
   class BIC
+    REGEX = /^([A-Z]{4})([A-Z]{2})([A-Z0-9]{2})([A-Z0-9]{3})?$/.freeze
+    
     def self.valid?(code)
       new(code).valid?
     end
 
     def initialize(code)
-      @code = code.to_s.strip.gsub(/\s+/, '').upcase
+      @code = code.to_s.gsub(/\s+/, '').upcase
     end
 
     def bank_code
@@ -27,7 +29,11 @@ module Bank
     end
 
     def to_s(formatted=false)
-      formatted ? "#{bank_code} #{country_code} #{location_code} #{branch_code}".strip : @code
+      formatted ? to_formatted_str : @code
+    end
+    
+    def to_formatted_str
+      "#{bank_code} #{country_code} #{location_code} #{branch_code}".strip
     end
 
     def test?
@@ -43,24 +49,19 @@ module Bank
     end
 
     def valid?
-      valid_length? && valid_format? && valid_location_code? && valid_branch_code?
-    end
-
-    def valid_length?
-      @code.length == 8 || @code.length == 11
+      valid_format? && valid_location_code? && valid_branch_code?
     end
 
     def valid_format?
-      !!(@code =~ /^[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?$/)
+      !!@code[REGEX]
     end
 
     def valid_location_code?
-      location_code[0] != '0' && location_code[0] != '1' && location_code[1] != 'O'
+      !location_code.start_with?('0', '1') && !location_code.end_with?('O')
     end
 
     def valid_branch_code?
-      branch_code.nil? || !(branch_code[0] == 'X' && branch_code != 'XXX')
+      branch_code.empty? || branch_code == 'XXX' || !branch_code.start_with?('X')
     end
-
   end
-end
+end

data/lib/bank/iban.rb

@@ -12,7 +12,7 @@ module Bank
     end
 
     def initialize(code)
-      @code = code.to_s.strip.gsub(/\s+/, '').upcase
+      @code = code.to_s.gsub(/\s+/, '').upcase
     end
 
     def country_code

data/lib/bank/version.rb

@@ -1,3 +1,3 @@
 module Bank
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/bic_spec.rb

@@ -21,24 +21,6 @@ describe Bank::BIC do
     @bic.branch_code.must_equal 'XXX'
   end
 
-  [8, 11].each do |len|
-    describe 'x' * len do
-      it 'has a valid length' do
-        Bank::BIC.new('x' * len).valid_length?.must_equal true
-      end
-    end
-  end
-
-  1.upto(20) do |len|
-    if len != 8 && len != 11
-      describe 'x' * len do
-        it 'has a valid length' do
-          Bank::BIC.new('x' * len).valid_length?.must_equal false
-        end
-      end
-    end
-  end
-
   [
     'UCJAES2MXXX',
     'ABAGATWWXXX',
@@ -46,17 +28,20 @@ describe Bank::BIC do
   ].each do |code|
     describe code do
       it 'has a valid format' do
-        Bank::BIC.new(code).valid_format?.must_equal true
+        Bank::BIC.new(code).valid?.must_equal true
       end
     end
   end
 
   [
-    '12341234'
+    '12341234',    # only digits
+    'UCJAES2MXAA', # branch code starts with 'X'
+    'UCJAES2MAA',  # too short
+    'UCJAES2M0001' # too long
   ].each do |code|
     describe code do
       it 'has an invalid format' do
-        Bank::BIC.new(code).valid_format?.must_equal false
+        Bank::BIC.new(code).valid?.must_equal false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bank-contact
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: IBAN + SWIFT/BIC