bicvalidator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c321ebf86e1e672e2c097f4f5813caf795d7e38
-  data.tar.gz: 34e449db08b93742528ca1b1d240982ee8a7a17f
+  metadata.gz: 82d4b194fd9542db105f28417793c1ab7509596a
+  data.tar.gz: ae7994ca2142ed3d6215fa0cfeb165bcc009b6de
 SHA512:
-  metadata.gz: c688af75a8caa1217735e9a54733bdf6f3cc94781c6d58815b2f927a19aa0acb6eda4569bcf5fe1b71b06a640ff301fd8ed9302cdc426a72f8fa4d6de2a62792
-  data.tar.gz: 295dbf1d6561c291ae593b48c03ed9e50da7b8ff29dd20f93c2a3a45cddb2f5b1c7c893c50c5415fc911905b4dd2bdb59747931671b86bd85dac4356c09d2c4a
+  metadata.gz: faba57f7de958b26b323fbabd57c3d473d799ba6454d9b7b2c377d8ba3af533a3ff52b846d4224658e08c27e4da2e34c147f32c5df8f7c0c54db72b7327e891b
+  data.tar.gz: c52eecde0d93095dc6c2c2df32d54e2a8db1272f01b1f4c28f029aabfd7f1e6a7c71a4b726cb4cc03699852f82b034e21e152e3fbb9ff452995f5a0c5cc3c583

data/README.md

@@ -9,7 +9,7 @@ Optional kann man den Check auch ausstellen.
 Das muss ins Gemfile:
 
 ```ruby
-gem 'bicvalidator',:git => 'https://github.com/olafkaderka/bicvalidator.git', :branch => 'master'
+gem 'bicvalidator'
 ```
 
 Und dann ausführen:

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'appraisal'
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/bicvalidator.gemspec

@@ -33,10 +33,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-
+  #A Ruby library for testing your library against different versions of dependencie
+  spec.add_development_dependency 'appraisal'
 
   #for mattr_accessor, reverse_merge
-  spec.add_dependency "activesupport", '>= 4.0'
+  spec.add_dependency "activesupport"
   
   #laender 
   #Countries is a collection of all sorts of useful information for every country in the ISO 3166 standard. 

data/lib/bicvalidator/version.rb

@@ -1,3 +1,3 @@
 module Bicvalidator
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/bicvalidator.rb

@@ -5,155 +5,100 @@ require 'active_support/core_ext'
 require 'countries'
 
 module Bicvalidator
-  #mattr_accessor kommt aus active_support/core_ext'
-  mattr_accessor :sepa_bic_countries
+  
+  mattr_accessor :sepa_bic_countries  
 
-  ##https://wiki.xmldation.com/Support/EPC/List_of_SEPA_countries
-  #kann ich somit in einem initailizer wieder ueberschreiben
   Bicvalidator.sepa_bic_countries = ["AT", "BE", "BG", "CH", "CY", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GB", "GR", "HR", "HU", "IE", "IT", "LI", "LT", "LU", "LV", "MC", "MT", "NL", "NO", "PL", "PT", "RO", "SE", "SI", "SK", "SM", "GI", "GF", "GP", "GG", "IS", "IM", "JE", "MQ", "YT", "RE", "BL", "MF", "PM"]
 
 
-    class Validate
-      attr_accessor :errorcode, :bic_bankcode, :bic_code, :bic_country, :sepa_country
-
-      def initialize(options={})  
-          default_options = {
-            :bic_code => nil,
-            :bic_bankcode => nil,
-            :bic_country => nil, 
-            :sepa_country_check => true,
-          }
-          @options = options.reverse_merge(default_options)
-          @errorcode = nil
-          @sepa_country = false
-          self.start_validation
+    class Bic
+
+      attr_accessor :bic_code, :bank, :country, :location, :branch
+
+      def initialize(bic_str) 
+          ##strip reicht nicht denn strip entfernt nur leerzeichen vorne und hinten
+          @bic_code = bic_str.strip.gsub(/\s+/, '').upcase
+      end
+
+      def errorcode
+        return if valid?
+        return "BV0010" if !has_valid_lenght?
+        return "BV0011" if !has_valid_format?
+        return "BV0012" if !valid_country_code?
+        return "BV0013" if !valid_location_code?
+        return "BV0014" if !valid_branch_code?
+      end
+      #in instanz
+      def valid?
+        has_valid_lenght? && has_valid_format? && valid_country_code? && valid_location_code? && valid_branch_code?
+      end
+
+      def has_valid_lenght?
+         [8, 11].include? @bic_code.length     
+      end
+
+      def has_valid_format?
+        !(@bic_code =~ bic_iso_format).nil?
       end
 
-      def start_validation
-          #hier muss auch = "" abgefangen werden, daher check mit blank?
-          @bic_code = @options[:bic_code].blank? ? nil :  @options[:bic_code]
-          @bic_bankcode = @options[:bic_bankcode].blank? ? nil : @options[:bic_bankcode]
-          @bic_country = @options[:bic_country].blank? ? nil :  @options[:bic_country]     
-         
-
-          if [@bic_code,@bic_bankcode,@bic_country].all? {|x| x.nil?}
-            @errorcode = "BV0000"
-            return
-          end
-
-          @sepa_country_check = @options[:sepa_country_check]
-
-          if @bic_code
-            #strip reicht nicht denn strip entfernt nur leerzeichen vorne und hinten
-            @bic_code = self.canonicalize_str(@bic_code)
-
-                          #invalid character     
-            if (@bic_code =~ /^[A-Z0-9]+$/).nil?
-              @bic_code = nil
-              @errorcode = "BV0010"
-              return 
-            end
-
-            #muss 8 oder 11 stellen haben
-            case @bic_code.length
-            when 8
-              #wir furllen immer mit XXX auf 11 Stellen auf 
-              @bic_code = "#{@bic_code}XXX"
-            when 11
-              
-            else
-              @bic_code = nil
-              @errorcode = "BV0011"
-              return
-            end
-            #wir setzen bic_country auf die 4+5 Stelle des der BIC
-            @bic_country = @bic_code[4..5]
-
-          end    
-
-          #egal ob durch biccode gesetzt oder das land ubergeben wurde immer st checkn ob da was geht
-          if @bic_country
-            #strip reicht nicht denn strip entfernt nur leerzeichen vorne und hinten
-            @bic_country = self.canonicalize_str(@bic_country)
-
-            if @bic_country.length != 2
-              @bic_country = nil
-              @errorcode = "BV0020" 
-              return
-            end
-            if (@bic_country =~ /^[A-Z]+$/).nil?
-              @bic_country = nil
-              @errorcode = "BV0021"
-              return 
-            end
-
-            #gibts das land uberhaupt zb wenn ZZ kommt
-            if ISO3166::Country.new("#{@bic_country}").nil?
-              @bic_country = nil
-              @errorcode = "BV0025" 
-              return
-            end
-
-            if Bicvalidator.sepa_bic_countries.include? @bic_country
-              @sepa_country = true
-            end
-
-            if @sepa_country_check and !@sepa_country
-              @errorcode = "BV0026"
-              return 
-            end
-
-          end
-
-          if @bic_bankcode
-            
-            if !@bic_country 
-              #bankcode ohne land geht nicht
-              @errorcode = "BV0030" 
-              return
-            end
-           
-            #strip reicht nicht denn strip entfernt nur leerzeichen vorne und hinten
-            @bic_bankcode = self.canonicalize_str(@bic_bankcode)
-
-            #es duerfen nur A-Z und 0-9 kommne, keine Sonderzeichen
-            if (@bic_bankcode =~ /^[A-Z0-9]+$/).nil?
-              @bic_bankcode = nil
-              @errorcode = "BV0032"
-              return 
-            end
-
-            return if !["DE","AT","ES","CH"].include? @bic_country
-            
-            #kontonummer in DE 8 stellig
-            case @bic_country
-            when "AT","CH"
-              #kontonummer in AT 5 stellig Zahlen
-              rule = '^[0-9]{5}$'
-            when "DE","ES"
-              #kontonummer in DE 8 stellig Zahlen
-              rule = '^[0-9]{8}$'
-            end
-
-            if regexp = Regexp.new(rule).match(@bic_bankcode)
-              #hat er gefunden
-            else
-              @bic_bankcode = nil
-              @errorcode = "BV0040"
-              return
-            end
-          
-          end   
+      def valid_country_code?
+        !ISO3166::Country.new(country).nil?
+      end
 
+      def valid_location_code?
+        #http://de.wikipedia.org/wiki/ISO_9362
+        #2-stellige Codierung des Ortes in zwei Zeichen. Das erste Zeichen darf nicht die Ziffer „0“ oder „1“ sein.
+        #Der Buchstabe 'O' ist als zweites Zeichen nicht gestattet.
+        !(location[0] =~ /[^01]/ && location[1] =~ /[^O]/).nil?
+      end
 
+      def valid_branch_code?
+        #Der Branch-Code darf nicht mit „X“ anfangen, es sei denn, es ist „XXX“.
+        return true if @bic_code.length == 8
+        return true if branch == "XXX"
+        (branch[0] =~ /[X]/).nil?          
       end
 
+      def sepa_scheme?
+        valid? and Bicvalidator.sepa_bic_countries.include? country
+      end
 
 
-      def canonicalize_str(str)
-        str.strip.gsub(/\s+/, '').upcase
+      def bank
+        @bank ||= match[1]
       end
 
+      def country
+        @country ||= match[2]
+      end
+
+      def location
+        @location ||= match[3]
+      end
+
+      def branch
+        @branch ||= match[4]
+      end
+
+      private
+
+      def bic_iso_format
+        #https://de.wikipedia.org/wiki/ISO_9362
+        #BBBB 4-stelliger Bankcode, vom Geldinstitut frei wählbar
+        #CC 2-stelliger Ländercode nach ISO 3166-1
+        #LL 2-stellige Codierung des Ortes in zwei Zeichen. 
+          #Das erste Zeichen darf nicht die Ziffer „0“ oder „1“ sein. 
+          #Wenn das zweite Zeichen kein Buchstabe, sondern eine Ziffer ist, so bedeutet dies:
+        #bbb 3-stellige Kennzeichnung (Branch-Code) der Filiale oder Abteilung (optional)
+        #test in http://rubular.com/
+        /([A-Z]{4})([A-Z]{2})([0-9A-Z]{2})([0-9A-Z]{3})?/
+      end
+
+      def match
+        bic_iso_format.match(@bic_code)
+      end
+
+
     end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bicvalidator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Olaf Kaderka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement