validates_russian 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544d7bfc5a8515ea8c176c9672c92507b82b93d3
-  data.tar.gz: 943fc064b8196c5680c1b20b255e09638cbb28d3
+  metadata.gz: ee7c009be5b8e81ccbb4081ca49a4f37b3ed0bfa
+  data.tar.gz: 2a9f183c335bd7eb0709794332417a1d3d55efa5
 SHA512:
-  metadata.gz: 086bfd6f6337c324679e6c21a6cf44f012ecc3ca39b69cab572bdc616e24bfa61e15a86d9846e9ba472909f724a0805baa389fcf37f6a508945e2b476a74394a
-  data.tar.gz: 99c3142c879719be955df00975661ab7a61d4bf9ecd9cbc6271d5da2ad865773ff4cd3f6c63d89a533d4aaa7555d85f48ca063c6b08823189389e313c39319ec
+  metadata.gz: df80c2215dd8db4e37184336bd1376138b8d720c57e2a509835663e97bc44fcc8e3338373ddb7335598b997f89b9537424d5154dc6db7056b0bf2aece6f30634
+  data.tar.gz: 26ab5f70a442599280f2d9569bed082357a5635ab9244f339cb4b887db29263063c29edb06f33a3f6e650ef13c7bfced3636995389050b58046d9e1498768646

data/README.md

@@ -10,11 +10,13 @@
 
 * [ИНН](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (InnFormatValidator)
 * [ОКПО](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (OkpoFormatValidator)
-* ОКАТО (TODO)
 * [КПП](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (KppFormatValidator)
-* ОГРН (TODO)
-* Корреспондентский счёт (TODO)
-* Рассчётный счёт (TODO)
+* [ОГРН](http://ru.wikipedia.org/wiki/Основной_государственный_регистрационный_номер) (OgrnFormatValidator)
+* [Корреспондентский счёт] (http://ru.wikipedia.org/wiki/Корреспондентский_счёт) (KsFormatValidator)
+* [Рассчётный счёт] (http://ru.wikipedia.org/wiki/Расчётный_счёт) (RsFormatValidator)
+* ОКАТО (TODO v0.0.6)
+* СНИЛС (TODO v0.0.6)
+* Значение паспорта (TODO v0.0.6)
 
 ## Установка
 

data/doc/english_readme.md

@@ -11,9 +11,9 @@ Russian specific values validation:
 * [OKPO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (OkpoFormatValidator) Legal code
 * OKATO (TODO)
 * [KPP](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (KppFormatValidator) Code of reason for registration
-* OGRN (TODO)
-* Correspondent Account Value (TODO)
-* Bank Account Value (TODO)
+* [OGRN](http://ru.wikipedia.org/wiki/Основной_государственный_регистрационный_номер) (OgrnFormatValidator) Main state registration number
+* [Correspondent Account Value] (http://ru.wikipedia.org/wiki/Корреспондентский_счёт) (KsFormatValidator)
+* [Bank Account Value] (http://ru.wikipedia.org/wiki/Расчётный_счёт) (RsFormatValidator)
 
 ## Installation
 

data/lib/validates_russian/okv.rb

@@ -0,0 +1,3 @@
+module ValidatesRussian
+  OKV = %w{388 728 156 230 132 144 756 752 152 203 191 238 826 654 646 953 952 950 174 262 348 608 940 858 860 478 800 949 788 496 398 834 882 050 968 938 972 706 417 760 702 941 690 408 960 682 222 710 462 360 643 116 072 446 586 776 512 578 934 901 604 946 376 554 532 524 064 232 566 498 943 484 504 458 969 480 426 440 748 434 422 430 694 340 008 428 981 104 414 192 188 976 931 977 170 418 598 320 404 454 973 634 124 886 352 364 368 400 356 392 558 985 967 970 818 978 704 214 242 780 840 090 136 516 932 678 784 807 208 270 332 600 980 344 292 324 936 328 951 410 548 108 096 986 068 937 975 060 974 084 048 764 052 590 044 971 533 051 032 012 944 036 810}
+end

data/lib/validates_russian/version.rb

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

data/lib/validators/ks_format_validator.rb

@@ -0,0 +1,8 @@
+class KsFormatValidator < ValidatesRussian::Validator
+  # see format here: http://ru.wikipedia.org/wiki/Корреспондентский_счёт
+  validates_using do |ks|
+    next false unless ks.size == 20
+    next false unless ks =~ /^\d+$/
+    next false unless ks[0..2] == '301'
+  end
+end

data/lib/validators/ogrn_format_validator.rb

@@ -0,0 +1,14 @@
+class OgrnFormatValidator < ValidatesRussian::Validator
+  validates_using do |ogrn|
+    next false unless ogrn =~ /^\d+$/
+    next false if ogrn.size != 13 && ogrn.size != 15
+
+    if ogrn.size == 13
+      next false unless (ogrn[0..-2].to_i % 11 % 10) == ogrn[-1].to_i
+    end
+
+    if ogrn.size == 15
+      next false unless (ogrn[0..-2].to_i % 13 % 10) == ogrn[-1].to_i
+    end
+  end
+end

data/lib/validators/rs_format_validator.rb

@@ -0,0 +1,8 @@
+class RsFormatValidator < ValidatesRussian::Validator
+  # see format here: http://ru.wikipedia.org/wiki/Расчётный_счёт
+  validates_using do |rs|
+    next false unless rs.size == 20
+    next false unless ValidatesRussian::OKV.include?(rs[5..7])
+    next false unless rs =~ /^\d+$/
+  end
+end

data/spec/validators/ks_format_validator_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe KsFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, ks_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_kss =  %w{
+       30101810642400000957
+       30106772134600000957
+       30143788710000000057
+    }
+
+    valid_kss.each do |ks|
+      model = TestModel.new
+      model.field = ks
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_kss =  %w{
+       77150100
+       78fffffff
+       3010181064240000095
+       31101810642400000957
+    }.push('', ' ', nil, [], {})
+
+    invalid_kss.each do |ks|
+      model = TestModel.new
+      model.field = ks
+      model.should_not be_valid
+    end
+  end
+end

data/spec/validators/ogrn_format_validator_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe OgrnFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, ogrn_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_ogrns =  %w{
+       1025004701402
+       1047796885861
+       5077746887312
+       1077604011935
+    }
+
+    valid_ogrns.each do |ogrn|
+      model = TestModel.new
+      model.field = ogrn
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_ogrns =  %w{
+       secret
+       507774688731
+       8934422763457
+       1345345523664
+    }.push('', ' ', nil, [], {})
+
+    invalid_ogrns.each do |ogrn|
+      model = TestModel.new
+      model.field = ogrn
+      model.should_not be_valid
+    end
+  end
+end

data/spec/validators/okpo_format_validator_spec.rb

@@ -7,33 +7,31 @@ describe OkpoFormatValidator do
   end
 
   it 'should be valid for valid values' do
-    valid_okpos =  %w{
-       57972160
-       13410254
-       0060621966
-       02372510
+    valid_okpos = %w{
+      57972160
+      13410254
+      0060621966
     }
 
     valid_okpos.each do |okpo|
       model = TestModel.new
       model.field = okpo
-      puts okpo
       model.should be_valid
     end
   end
 
-#  it 'should not be valid for invalid values' do
-#    invalid_okpos =  %w{
-#       57972163
-#       579721634
-#       secret
-#       78fffffff
-#    }.push('', ' ', nil, [], {})
+  it 'should not be valid for invalid values' do
+    valid_okpos = %w{
+      57972163
+      579721634
+      secret
+      78fffffff
+    }.push('', ' ', nil, [], {})
 
-#    invalid_okpos.each do |okpo|
-#      model = TestModel.new
-#      model.field = okpo
-#      model.should_not be_valid
-#    end
-#  end
+    valid_okpos.each do |okpo|
+      model = TestModel.new
+      model.field = okpo
+      model.should_not be_valid
+    end
+  end
 end

data/spec/validators/rs_format_validator_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe RsFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, rs_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_rss =  %w{
+       58187404448375647329
+       77252937461205123501
+       52534060468985601001
+    }
+
+    valid_rss.each do |rs|
+      model = TestModel.new
+      model.field = rs
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_rss =  %w{
+       77150100
+       gsDASsda
+       lol
+       52531406168985601001
+       7725234016120512350
+    }.push('', ' ', nil, [], {})
+
+    invalid_rss.each do |rs|
+      model = TestModel.new
+      model.field = rs
+      model.should_not be_valid
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_russian
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -84,17 +84,24 @@ files:
 - gemfiles/Gemfile.activemodel-3.0
 - gemfiles/Gemfile.activemodel-4.0
 - lib/validates_russian.rb
+- lib/validates_russian/okv.rb
 - lib/validates_russian/region_numbers.rb
 - lib/validates_russian/validator.rb
 - lib/validates_russian/version.rb
 - lib/validators/inn_format_validator.rb
 - lib/validators/kpp_format_validator.rb
+- lib/validators/ks_format_validator.rb
+- lib/validators/ogrn_format_validator.rb
 - lib/validators/okpo_format_validator.rb
+- lib/validators/rs_format_validator.rb
 - spec/spec_helper.rb
 - spec/support/test_model.rb
 - spec/validators/inn_format_validator_spec.rb
 - spec/validators/kpp_format_validator_spec.rb
+- spec/validators/ks_format_validator_spec.rb
+- spec/validators/ogrn_format_validator_spec.rb
 - spec/validators/okpo_format_validator_spec.rb
+- spec/validators/rs_format_validator_spec.rb
 - validates_russian.gemspec
 homepage: http://github.com/asiniy/validates_russian
 licenses:
@@ -125,4 +132,7 @@ test_files:
 - spec/support/test_model.rb
 - spec/validators/inn_format_validator_spec.rb
 - spec/validators/kpp_format_validator_spec.rb
+- spec/validators/ks_format_validator_spec.rb
+- spec/validators/ogrn_format_validator_spec.rb
 - spec/validators/okpo_format_validator_spec.rb
+- spec/validators/rs_format_validator_spec.rb