romanianvalidators 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77accfec82cda9b706ea0ac3fe7dda0d4c642996
-  data.tar.gz: 9848303566d97e623d97d6f4cf4bc0c4c7ec5410
+  metadata.gz: 106793ba3003fa1e423dccb482ddb68ebe40434f
+  data.tar.gz: 4bedcaa54fadc580cc94e94be67d926d3276042d
 SHA512:
-  metadata.gz: 47586d2962a1f8857d3dad0258331e1b9a69a99864515096fcbe7dce94947c6e0f626eb1c906406efc1c6653d9d4f8dc21b6c5d377443fa7448164f43f5a2cf9
-  data.tar.gz: 076077782f9438a71dd877dc97ed1aecc02b0a4e2957eb57cb9bcffd153d0462e177665844bf614bc051ee116617095a5789b5f9376070681b168f819167f41f
+  metadata.gz: 07c908f816f01e6b7da2b8b44cea6a50fd6ef90a85345014444841d390b9bb2c38dfb56f5f03c269e6083265224cb2557a61c17b1ebc42dd4173bdc011bdb473
+  data.tar.gz: eb59ae55e08cfbed0c1af5ab7278b4d72837dc08ca7023da6182706761b799c721fc669b2b21087005e78732e90489554752036ac6ddc19e1e38528bc5a430f4

data/.gitignore

@@ -2,4 +2,5 @@
 *.gem
 *.rbc
 Gemfile.lock
-.rvmrc
+.rvmrc
+.bundle*

data/.travis.yml

@@ -2,11 +2,9 @@ language: ruby
 rvm:
   - 1.8.7
   - ree
-  - jruby-18mode
   - rbx-18mode
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
   - rbx-19mode
   - ruby-head
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.1.4 (2013-04-29)
+ * bugfix
+
+### 0.1.3 (2013-04-28)
+ * refactoring
+ * added code climate badge
+
 ### 0.1.2 (2013-04-15)
  * can pass custom validation message
  * tested on ruby 2.0

data/README.md

@@ -1,9 +1,9 @@
-# Romanian Validators [![Build Status](https://travis-ci.org/mtarnovan/romanianvalidators.png)](https://travis-ci.org/mtarnovan/romanianvalidators)
+# Romanian Validators [![Build Status](https://travis-ci.org/mtarnovan/romanianvalidators.png)](https://travis-ci.org/mtarnovan/romanianvalidators) [![Gem Version](https://badge.fury.io/rb/romanianvalidators.png)](http://badge.fury.io/rb/romanianvalidators) [![Code Climate](https://codeclimate.com/github/mtarnovan/romanianvalidators.png)](https://codeclimate.com/github/mtarnovan/romanianvalidators)
 
-ActiveModel validators for: 
+ActiveModel validators for:
 
   * Cod Numeric Personal (CNP)
-  * Cod de identificare fiscală (CIF) and 
+  * Cod de identificare fiscală (CIF) and
   * IBAN (only Romanian format as published by Romanian National Bank).
   * BIC
 
@@ -47,9 +47,9 @@ The algorithms for validation are found in the source code.
 
 ### TODO
 
-  * test more edge cases; test nil, blank; test messages; test in app
+  * test more edge cases
   * add javascript validation ?
 
 ### Copyright
 
-Copyright (c) 2007-2012 Mihai Târnovan. MIT LICENSE. See LICENSE for details.
+Copyright (c) 2007-2013 Mihai Târnovan. MIT LICENSE. See LICENSE for details.

data/lib/active_model/validations/bic_validator.rb

@@ -1,28 +1,19 @@
 module ActiveModel
   module Validations
-
     class BicValidator < EachValidator
-      def validate_each(record, attribute, value)
-        allow_blank = options.fetch(:allow_blank, false)
-        allow_nil = options.fetch(:allow_nil, false)
-        message = options.fetch(:message, nil)
-        record.errors.add_on_empty(attribute) if value.nil? && !allow_nil
-        record.errors.add_on_blank(attribute) if value.blank? && !allow_blank
-        record.errors.add(attribute, message) unless Bic.valid?(value)
-      end
+
+      include ActiveModel::Validations::EmptyBlankEachValidator
 
       # This is only a basic validation of a BIC
       # http://www.swift.com/biconline/index.cfm?fuseaction=display_aboutbic
-      class Bic
-        def self.valid?(bic)
-          country_codes = %w[AF AL DZ AS AD AO AI AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BO BA BW BR BN BG BF BI KH CM CA CV KY CF TD CL CN CO KM CG CD CK CR CI HR CU CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FK FO FJ FI FR GF PF GA GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT VA HN HK HU IS IN ID IR IQ IE IL IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV ML MT MH MQ MR MU MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW SH KN LC PM VC WS SM ST SA SN SC SL SG SK SI SB SO ZA ES LK SD SR SJ SZ SE CH SY TW TJ TZ TH TG TK TO TT TN TR TM TC TV UG UA AE GB US UY UZ VU VE VN VG VI WF EH YE ZM ZW] 
-          return false unless bic.size == 8 || bic.size == 11 # length 8 or 11
-          return false unless (bic[0..3]=~(/[^A-Z]/)).nil? # first 4 must be letters only
-          return true if country_codes.include?(bic[4..5])
-          false
-        end
+      def valid?(bic)
+        country_codes = %w[AF AL DZ AS AD AO AI AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BO BA BW BR BN BG BF BI KH CM CA CV KY CF TD CL CN CO KM CG CD CK CR CI HR CU CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FK FO FJ FI FR GF PF GA GM GE DE GH GI GR GL GD GP GU GT GN GW GY HT VA HN HK HU IS IN ID IR IQ IE IL IT JM JP JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV ML MT MH MQ MR MU MX FM MD MC MN MS MA MZ MM NA NR NP NL AN NC NZ NI NE NG NU NF MP NO OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW SH KN LC PM VC WS SM ST SA SN SC SL SG SK SI SB SO ZA ES LK SD SR SJ SZ SE CH SY TW TJ TZ TH TG TK TO TT TN TR TM TC TV UG UA AE GB US UY UZ VU VE VN VG VI WF EH YE ZM ZW]
+        return false unless bic.size == 8 || bic.size == 11 # length 8 or 11
+        return false unless (bic[0..3]=~(/[^A-Z]/)).nil? # first 4 must be letters only
+        return true if country_codes.include?(bic[4..5])
+        false
       end
-    end
 
+    end
   end
 end

data/lib/active_model/validations/cif_validator.rb

@@ -1,15 +1,11 @@
 module ActiveModel
   module Validations
-
     class CifValidator < EachValidator
-      def validate_each(record, attribute, value)
-        allow_blank = options.fetch(:allow_blank, false)
-        allow_nil = options.fetch(:allow_nil, false)
-        message = options.fetch(:message, nil)
-        record.errors.add_on_empty(attribute) if value.nil? && !allow_nil
-        record.errors.add_on_blank(attribute) if value.blank? && !allow_blank
-        record.errors.add(attribute, message) unless Cif.valid?(value)
-      end
+
+      # reversed test key (753217532)
+      TEST_KEY = "235712357".freeze
+
+      include ActiveModel::Validations::EmptyBlankEachValidator
 
       # Algoritmul de validare al unui cod CUI
       # Pas preliminar: Se testeaza daca codul respecta formatul unui cod CUI. Adica lungimea maxima sa fie de 10 cifre si sa contina doar caractere numerice.
@@ -17,17 +13,18 @@ module ActiveModel
       # Pas 2: Se ignora prima cifra din codul CUI inversat (aceasta este cifra de control) si se inmulteste fiecare cifra cu cifra corespunzatoare din cheia de testare inversata.
       # Pas 3: Se aduna toate produsele obtinute. Suma rezultata se inmulteste cu 10 si apoi se afla restul impartirii la 11.
       # Pas 4: Pentru un CUI valid cifra obtinuta, in urma operatiei MODULO 11, va trebui sa corespunda cu cifra de control a codului CUI initial .
-      class Cif
-        def self.valid?(cif)
-          return false if cif.nil?
-          return false if cif.size > 10 || cif.size < 2
-          return false unless (cif=~(/[^0-9]/)).nil?
-          rk = "235712357".freeze # reversed test key (753217532)
-          rc = cif.reverse.freeze
-          (1..(cif.size - 1)).inject(0) {|sum, n| sum += rk[n-1].chr.to_i * rc[n].chr.to_i}  * 10 % 11 % 10 == rc[0].chr.to_i
-        end
+      def valid?(cif)
+        return false unless well_formed?(cif)
+        rc = cif.reverse.freeze
+        (1..(cif.size - 1)).inject(0) {|sum, n| sum += TEST_KEY[n-1].chr.to_i * rc[n].chr.to_i}  * 10 % 11 % 10 == rc[0].chr.to_i
       end
-    end
 
+      private
+
+        def well_formed?(cif)
+          cif.present? && (2..10).include?(cif.size) && (cif=~(/[^0-9]/)).nil?
+        end
+
+    end
   end
 end

data/lib/active_model/validations/cnp_validator.rb

@@ -1,55 +1,50 @@
 module ActiveModel
   module Validations
-
     class CnpValidator < EachValidator
-      def validate_each(record, attribute, value)
-        allow_blank = options.fetch(:allow_blank, false)
-        allow_nil = options.fetch(:allow_nil, false)
-        message = options.fetch(:message, nil)
-        record.errors.add_on_empty(attribute) if value.nil? && !allow_nil
-        record.errors.add_on_blank(attribute) if value.blank? && !allow_blank
-        record.errors.add(attribute, message) unless Cnp.valid?(value)
-      end
+
+      TEST_KEY = "279146358279"
+
+      include ActiveModel::Validations::EmptyBlankEachValidator
 
       # Algoritm de validare CNP
-      # Pas preliminar: Se testeaza daca codul respecta formatul unui cod CNP. 
-      # Adica prima cifra sa fie cuprinsa in intervalul 1 - 6 sau sa fie 9 pentru straini. 
+      # Pas preliminar: Se testeaza daca codul respecta formatul unui cod CNP.
+      # Adica prima cifra sa fie cuprinsa in intervalul 1 - 6 sau sa fie 9 pentru straini.
       # Urmatoarele sase cifre trebuie sa constituie o data calendaristica valida in formatul AALLZZ.
       #
-      # Pas 1: 
-      # Se foloseste cheia de testare "279146358279". Primele douasprezece cifre se inmultesc pe rand de la 
+      # Pas 1:
+      # Se foloseste cheia de testare "279146358279". Primele douasprezece cifre se inmultesc pe rand de la
       # stanga spre dreapta cu cifra corespunzatoare din cheia de testare.
       #
-      # Pas 2: Cele douasprezece produse obtinute se aduna si suma obtinuta se imparte la 11. Restul impartirii 
-      # reprezinta cifra de control. Pentru un CNP valid acest rest va trebui sa coincida cu cifra de pe 
-      # pozitia treisprezece din CNP-ul initial. 
-      class Cnp
-        def self.valid?(cnp)
-          return false unless (cnp=~(/[^0-9]/)).nil? && cnp.size == 13
-          require 'date'
-          begin
-            year = case
-            when
-              cnp[0].chr == "1" || cnp[0].chr == "2" then "19"
-            when
-              cnp[0].chr == "3" || cnp[0].chr == "4" then "18"
-            when
-              cnp[0].chr == "5" || cnp[0].chr == "6" then "20"
-            when
-              cnp[0].chr == "9" then "19" # oare se sare peste un an bisect intre 1800-2099 ?
-            else return false;
-            end
-
-            year = (year + cnp[1..2]).to_i
-            return false unless Date.valid_civil?(year,cnp[3..4].to_i,cnp[5..6].to_i)
-          rescue ArgumentError
-            return false
-          end
-          test_key = "279146358279"
-           (0..11).inject(0){|sum, n| sum += test_key[n].chr.to_i * cnp[n].chr.to_i} % 11 == cnp[12].chr.to_i
-        end
+      # Pas 2: Cele douasprezece produse obtinute se aduna si suma obtinuta se imparte la 11. Restul impartirii
+      # reprezinta cifra de control. Pentru un CNP valid acest rest va trebui sa coincida cu cifra de pe
+      # pozitia treisprezece din CNP-ul initial.
+      def valid?(cnp)
+        return false unless well_formed?(cnp) && valid_birthdate?(cnp)
+
+        (0..11).inject(0){|sum, n| sum += TEST_KEY[n].chr.to_i * cnp[n].chr.to_i} % 11 == cnp[12].chr.to_i
       end
-    end
 
+      private
+
+        def well_formed?(cnp)
+          (cnp=~(/[^0-9]/)).nil? && cnp.size == 13
+        end
+
+        def valid_birthdate?(cnp)
+          year_code = cnp[0].chr.to_i
+          year = case year_code
+                 when 1..2 then "19"
+                 when 3..4 then "18"
+                 when 5..6 then "20"
+                 when 9    then "19" # oare se sare peste un an bisect intre 1800-2099 ?
+                 else return false
+                 end
+          year = (year + cnp[1..2]).to_i
+          Date.valid_civil?(year, cnp[3..4].to_i, cnp[5..6].to_i) ? true : false
+        rescue ArgumentError
+          return false
+        end
+
+    end
   end
 end

data/lib/active_model/validations/iban_validator.rb

@@ -1,30 +1,31 @@
 module ActiveModel
   module Validations
-
     class IbanValidator < EachValidator
-      def validate_each(record, attribute, value)
-        allow_blank = options.fetch(:allow_blank, false)
-        allow_nil = options.fetch(:allow_nil, false)
-        message = options.fetch(:message, nil)
-        record.errors.add_on_empty(attribute) if value.nil? && !allow_nil
-        record.errors.add_on_blank(attribute) if value.blank? && !allow_blank
-        record.errors.add(attribute, message) unless Iban.valid?(value)
-      end
+
+      # use ord for ruby >= 1.9
+      USE_ORD = "".respond_to?(:ord)
+
+      include ActiveModel::Validations::EmptyBlankEachValidator
 
       # Descrierea algoritmului:
       # http://www.bnr.ro/files/d/Legislatie/EN/Reg_IBAN.pdf
-      class Iban
-        def self.valid?(iban)
-          return false if iban.size < 3
-          use_ord = "".respond_to?(:ord) # Ruby 1.9
-          (iban.slice(4,iban.size) + iban[0..3]).upcase.gsub(/[A-Z]/) do |s|
-            use_ord ? (s[0].ord - 55).to_s : (s[0].to_i - 55).to_s
-          end.to_i % 97 == 1
-        rescue
-          false
-        end
+      def valid?(iban)
+        return false if iban.size < 3
+        transpose((iban.slice(4, iban.size) + iban[0..3])).to_i % 97 == 1
+      rescue
+        false
       end
-    end
 
+      private
+
+        # replace letters according to algorithm
+        # algorithm conversion maps chars to ASCII value - 55
+        def transpose(iban)
+          iban.upcase.gsub(/[A-Z]/) do |s|
+            USE_ORD ? (s[0].ord - 55).to_s : (s[0].to_i - 55).to_s
+          end
+        end
+
+    end
   end
 end

data/lib/romanianvalidators.rb

@@ -6,6 +6,17 @@ module ActiveModel
       %w(cif cnp iban bic)
     end
 
+    module EmptyBlankEachValidator
+      def validate_each(record, attribute, value)
+        allow_blank = options.fetch(:allow_blank, false)
+        allow_nil = options.fetch(:allow_nil, false)
+        message = options.fetch(:message, nil)
+        record.errors.add_on_empty(attribute) if value.nil? && !allow_nil
+        record.errors.add_on_blank(attribute) if value.blank? && !allow_blank
+        record.errors.add(attribute, message) unless valid?(value)
+      end
+    end
+
     romanianvalidators.each do |validator_name|
       require "active_model/validations/#{validator_name}_validator"
     end

data/romanianvalidators.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'romanianvalidators'
-  s.version     = '0.1.2'
+  s.version     = '0.1.4'
   s.authors     = ['Mihai Târnovan']
   s.email       = ['mihai.tarnovan@cubus.ro']
   s.homepage    = 'http://github.com/mtarnovan/romanianvalidators'

data/test/data/valid_ro_ibans.txt

@@ -1,9 +1,9 @@
 RO56TREZ0462107020101XXX
 RO75TREZ0462116020201XXX
-RO42TREZ04621030209XXXXX
+ro42TREZ04621030209XXXXX
 RO57TREZ04621080206XXXXX
 RO03TREZ0462107020201XXX
-RO98TREZ04621030230XXXXX
+RO98trez04621030230XXXXX
 RO24TREZ04621080230XXXXX
 RO46TREZ04621170230XXXXX
 RO43TREZ04621160250XXXXX

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: romanianvalidators
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Mihai Târnovan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler