validates_russian 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee7c009be5b8e81ccbb4081ca49a4f37b3ed0bfa
-  data.tar.gz: 2a9f183c335bd7eb0709794332417a1d3d55efa5
+  metadata.gz: 2a9a6630d0d107ba996e35406d6e003de4c597c5
+  data.tar.gz: 72a174080a59d75f87e8fb108b976d05fa242d7a
 SHA512:
-  metadata.gz: df80c2215dd8db4e37184336bd1376138b8d720c57e2a509835663e97bc44fcc8e3338373ddb7335598b997f89b9537424d5154dc6db7056b0bf2aece6f30634
-  data.tar.gz: 26ab5f70a442599280f2d9569bed082357a5635ab9244f339cb4b887db29263063c29edb06f33a3f6e650ef13c7bfced3636995389050b58046d9e1498768646
+  metadata.gz: bc04c67c11c4a8dc19578dcb604fc527042538e1bc92ad5ea26188e6b93d80d505525fb167279a9fe7f011e18501cfd08b6bcd2ff3c4c59515b09779a2aaafe8
+  data.tar.gz: 310ca0b03a83734c11944762c0a81ae1342769db515b6f4563d17000ae0cf4309a9af2cb099dfec0015a66240ed3c8e31227d35cd5f6516a96c2e6ab83f2764a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 0.0.6
+
+* PassportFormatValidator
+* OkatoFormatValidator
+* SnilsFormatValidator
+
+### 0.0.5
+
+* Added OgrnValidator
+
 ### 0.0.4
 
 * Added OkpoFormatValidator

data/README.md

@@ -14,9 +14,9 @@
 * [ОГРН](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)
+* [OKATO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_объектов_административно-территориального_деления) (OkatoFormatValidator)
+* [СНИЛС](http://ru.wikipedia.org/wiki/Страховой_номер_индивидуального_лицевого_счёта) (SnilsFormatValidator)
+* [Значение паспорта](http://ru.wikipedia.org/wiki/Паспорт_гражданина_Российской_Федерации) (PassportFormatValidator)
 
 ## Установка
 

data/doc/english_readme.md

@@ -9,11 +9,13 @@ Russian specific values validation:
 
 * [INN](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (InnFormatValidator) Russian analogue of VAT identification number
 * [OKPO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (OkpoFormatValidator) Legal code
-* OKATO (TODO)
 * [KPP](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (KppFormatValidator) Code of reason for registration
 * [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)
+* [OKATO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_объектов_административно-территориального_деления) (OkatoFormatValidator)
+* [SNILS](http://ru.wikipedia.org/wiki/Страховой_номер_индивидуального_лицевого_счёта) (SnilsFormatValidator)
+* [Passport Value](http://ru.wikipedia.org/wiki/Паспорт_гражданина_Российской_Федерации) (PassportFormatValidator)
 
 ## Installation
 

data/lib/validates_russian/okato_region_numbers.rb

@@ -0,0 +1,3 @@
+module ValidatesRussian
+  OKATO_REGION_NUMBERS = %w{79 84 80 81 82 26 83 85 91 86 87 88 89 98 90 92 93 94 95 96 97 01 03 04 05 07 08 11 12 14 15 17 19 20 24 25 27 29 20 32 33 34 37 38 41 42 44 46 47 22 49 50 52 53 54 56 57 58 60 61 36 63 64 65 66 68 28 69 73 75 76 78 45 40 99 43 48 51 55 59 62 67 77 72 74}
+end

data/lib/validates_russian/version.rb

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

data/lib/validators/okato_format_validator.rb

@@ -0,0 +1,20 @@
+class OkatoFormatValidator < ValidatesRussian::Validator
+  validates_using do |okato|
+    next false unless okato =~ /^\d+$/
+
+    okato = okato.split(//).map(&:to_i)
+
+    next false unless [3, 6, 9].include?(okato.size)
+    next false unless calc(okato) == okato.last
+  end
+
+  private
+
+  def self.calc(okato)
+    [1, 3].each do |i|
+      code = okato[0..-2].each_with_index.inject(0){ |s, p| s + p[0] * (p[1] + i) } % 11
+      return code if code < 10
+    end
+    0
+  end
+end

data/lib/validators/passport_format_validator.rb

@@ -0,0 +1,8 @@
+class PassportFormatValidator < ValidatesRussian::Validator
+  # see format here: http://ru.wikipedia.org/wiki/Паспорт_гражданина_Российской_Федерации
+  validates_using do |passport|
+    next false unless passport =~ /^\d+$/
+    next false unless ValidatesRussian::OKATO_REGION_NUMBERS.include?(passport[0..1])
+    next false unless passport.size == 10
+  end
+end

data/lib/validators/snils_format_validator.rb

@@ -0,0 +1,20 @@
+class SnilsFormatValidator < ValidatesRussian::Validator
+  validates_using do |snils|
+    next false unless snils =~ /^\d+$/
+
+    case snils.size
+    when 11 then next false unless calc(snils) == snils[-2..-1]
+    when 9 then next false unless snils.to_i <= 1001998
+    else next false
+    end
+  end
+
+  private
+
+  def self.calc(snils)
+    snils = snils.split(//).map(&:to_i)
+    code = snils[0..-3].each_with_index
+             .inject(0){ |s, p| s + p[0] * (9 - p[1]) } % 101 % 100
+    code = (code < 10 ? code = '0' + code.to_s : code.to_s)
+  end
+end

data/spec/validators/inn_format_validator_spec.rb

@@ -13,6 +13,7 @@ describe InnFormatValidator do
       470313747100
       471900124013
       503102384852
+      0274062111
       7706633181
       7715805253
       7714698320

data/spec/validators/okato_format_validator_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe OkatoFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, okato_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_okatos =  %w{
+       794038
+       457892
+       729267
+       729255
+    }
+
+    valid_okatos.each do |okato|
+      model = TestModel.new
+      model.field = okato
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_okatos =  %w{
+       794033
+       794032
+       77150100
+       78fffffff
+    }.push('', ' ', nil, [], {})
+
+    invalid_okatos.each do |okato|
+      model = TestModel.new
+      model.field = okato
+      model.should_not be_valid
+    end
+  end
+end

data/spec/validators/passport_format_validator_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe PassportFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, passport_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_passports =  %w{
+      6184729864
+      4023841230
+      0110019981
+      5710019971
+    }
+
+    valid_passports.each do |passport|
+      model = TestModel.new
+      model.field = passport
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_passports =  %w{
+      1
+      231
+      77150100
+      78fffffff
+    }.push('', ' ', nil, [], {})
+
+    invalid_passports.each do |passport|
+      model = TestModel.new
+      model.field = passport
+      model.should_not be_valid
+    end
+  end
+end

data/spec/validators/snils_format_validator_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe SnilsFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, snils_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_snilses =  %w{
+      11223344595
+      67238412306
+      001001998
+      001001997
+    }
+
+    valid_snilses.each do |snils|
+      model = TestModel.new
+      model.field = snils
+      model.should be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_snilses =  %w{
+       77150100
+       67237412306
+       67238412307
+       11223344594
+       78fffffff
+    }.push('', ' ', nil, [], {})
+
+    invalid_snilses.each do |snils|
+      model = TestModel.new
+      model.field = snils
+      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.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alex Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -84,6 +84,7 @@ files:
 - gemfiles/Gemfile.activemodel-3.0
 - gemfiles/Gemfile.activemodel-4.0
 - lib/validates_russian.rb
+- lib/validates_russian/okato_region_numbers.rb
 - lib/validates_russian/okv.rb
 - lib/validates_russian/region_numbers.rb
 - lib/validates_russian/validator.rb
@@ -92,16 +93,22 @@ files:
 - lib/validators/kpp_format_validator.rb
 - lib/validators/ks_format_validator.rb
 - lib/validators/ogrn_format_validator.rb
+- lib/validators/okato_format_validator.rb
 - lib/validators/okpo_format_validator.rb
+- lib/validators/passport_format_validator.rb
 - lib/validators/rs_format_validator.rb
+- lib/validators/snils_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/okato_format_validator_spec.rb
 - spec/validators/okpo_format_validator_spec.rb
+- spec/validators/passport_format_validator_spec.rb
 - spec/validators/rs_format_validator_spec.rb
+- spec/validators/snils_format_validator_spec.rb
 - validates_russian.gemspec
 homepage: http://github.com/asiniy/validates_russian
 licenses:
@@ -134,5 +141,8 @@ test_files:
 - spec/validators/kpp_format_validator_spec.rb
 - spec/validators/ks_format_validator_spec.rb
 - spec/validators/ogrn_format_validator_spec.rb
+- spec/validators/okato_format_validator_spec.rb
 - spec/validators/okpo_format_validator_spec.rb
+- spec/validators/passport_format_validator_spec.rb
 - spec/validators/rs_format_validator_spec.rb
+- spec/validators/snils_format_validator_spec.rb