From 14f2cf848131f2e88211d25ca1a35330f3c9bd26 Mon Sep 17 00:00:00 2001 From: Andrew Ageev Date: Mon, 5 Sep 2016 16:28:48 +1000 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=9A=D0=9F=D0=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/validators/kpp_format_validator.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/validators/kpp_format_validator.rb b/lib/validators/kpp_format_validator.rb index 50cca8d..eb64d5d 100644 --- a/lib/validators/kpp_format_validator.rb +++ b/lib/validators/kpp_format_validator.rb @@ -3,7 +3,6 @@ class KppFormatValidator < ValidatesRussian::Validator validates_using do |kpp| next false unless kpp.size == 9 next false unless ValidatesRussian::REGION_NUMBERS.include?(kpp[0..1]) - next false unless kpp =~ /^\d+$/ - next false unless kpp[5..6] != '00' + next false unless kpp =~ /^\d{4}([a-z]|\d){2}\d{3}$/i end end From 1a7e51476662af7a2eeb2467142a2bdc6dee6314 Mon Sep 17 00:00:00 2001 From: Andrew Ageev Date: Fri, 25 May 2018 10:53:51 +1000 Subject: [PATCH 2/2] Fix regions --- lib/validates_russian/region_numbers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/validates_russian/region_numbers.rb b/lib/validates_russian/region_numbers.rb index 50a58b8..4450349 100644 --- a/lib/validates_russian/region_numbers.rb +++ b/lib/validates_russian/region_numbers.rb @@ -1,3 +1,3 @@ module ValidatesRussian - REGION_NUMBERS = %w{01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 75 41 23 24 59 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 76 77 78 79 83 86 87 89 91 92} + REGION_NUMBERS = %w[01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 75 41 23 24 59 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 76 77 78 79 81 82 83 86 87 89 91 92 97 99].freeze end