validates_russian 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2b00dcc3e4d96d2aa480758a7b855f78b2bf4d
-  data.tar.gz: 94936f7e5ee9d384638e7fa1816df07302346cf1
+  metadata.gz: 544d7bfc5a8515ea8c176c9672c92507b82b93d3
+  data.tar.gz: 943fc064b8196c5680c1b20b255e09638cbb28d3
 SHA512:
-  metadata.gz: 81e4d3fd1e5ab4c44fd1a1d3bf31eb9bd591fc265b1c5902a50f37a1518f2b63a2f76321bd7b836e46f681dea27cdb6a220fe65e50f00d7a34a5ff4fc49bd941
-  data.tar.gz: 8cf34eff30779459c739445e6dddc1fe9ef8e7835bd8dcf864f688f50047bc812410c1ebefb90ca7e831f8ee81d3aa848bf26fff02f98c5c21ce86e53ccbd9e2
+  metadata.gz: 086bfd6f6337c324679e6c21a6cf44f012ecc3ca39b69cab572bdc616e24bfa61e15a86d9846e9ba472909f724a0805baa389fcf37f6a508945e2b476a74394a
+  data.tar.gz: 99c3142c879719be955df00975661ab7a61d4bf9ecd9cbc6271d5da2ad865773ff4cd3f6c63d89a533d4aaa7555d85f48ca063c6b08823189389e313c39319ec

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+### 0.0.4
+
+* Added OkpoFormatValidator
+* InnValidator and KppValidator were renamed to InnFormat and KppFormat validators
+
+### 0.0.3
+
+* InnValidator added
+
+### 0.0.2
+
+* KppValidator added

data/README.md

@@ -8,10 +8,10 @@
 
 Валидация русских значений:
 
-* [ИНН](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика)
-* ОКПО (TODO)
+* [ИНН](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (InnFormatValidator)
+* [ОКПО](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (OkpoFormatValidator)
 * ОКАТО (TODO)
-* [КПП](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт)
+* [КПП](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (KppFormatValidator)
 * ОГРН (TODO)
 * Корреспондентский счёт (TODO)
 * Рассчётный счёт (TODO)
@@ -24,9 +24,17 @@
 
 ## Использование
 
+Используй валидаторы в своей модели
+
+```ruby
+validates :attribute, <validator_underscore>: true
+```
+
+где `<validator_underscore>` это название валидатора
+
 ```ruby
 class Legal < ActiveRecord::Base
-  validates :kpp, kpp: true
+  validates :kpp, kpp_format: true
 end
 
 # legal = Legal.new

data/doc/english_readme.md

@@ -7,10 +7,10 @@
 
 Russian specific values validation:
 
-* [INN](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (Russian analogue of VAT identification number)
-* OKPO (TODO)
+* [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/Код_причины_постановки_на_учёт) (Code of reason for registration)
+* [KPP](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (KppFormatValidator) Code of reason for registration
 * OGRN (TODO)
 * Correspondent Account Value (TODO)
 * Bank Account Value (TODO)
@@ -23,9 +23,17 @@ Add to Gemfile
 
 ## Usage
 
+For most of the validators you just want to add this line to your model:
+
+```ruby
+validates :attribute, <validator_underscore>: true
+```
+
+where `<validator_underscore>` is an underscored, lowercase form from the validator's name (see the example section below).
+
 ```ruby
 class Legal < ActiveRecord::Base
-  validates :kpp, kpp: true
+  validates :kpp, kpp_format: true
 end
 
 # legal = Legal.new

data/lib/validates_russian/region_numbers.rb

@@ -1,3 +1,3 @@
 module ValidatesRussian
-  REGION_NUMBERS = %w{01 03 04 05 07 08 10 11 11 12 14 15 17 18 19 20 22 24 25 26 27 28 29 30 32 33 34 36 37 38 40 41 42 44 45 46 47 49 50 52 53 56 57 57 58 60 61 63 64 65 66 68 69 70 71 71 71 73 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99}
+  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}
 end

data/lib/validates_russian/version.rb

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

data/lib/validators/{inn_validator.rb → inn_format_validator.rb}

@@ -1,4 +1,4 @@
-class InnValidator < ValidatesRussian::Validator
+class InnFormatValidator < ValidatesRussian::Validator
   validates_using do |inn|
     next false unless ValidatesRussian::REGION_NUMBERS.include?(inn[0..1])
     next false unless inn =~ /^\d+$/

data/lib/validators/{kpp_validator.rb → kpp_format_validator.rb}

@@ -1,5 +1,5 @@
-# http://vipiskaegrul.ru/slovar-terminov/kod-prichiny-postanovki-kpp.html
-class KppValidator < ValidatesRussian::Validator
+class KppFormatValidator < ValidatesRussian::Validator
+  # see format here: http://vipiskaegrul.ru/slovar-terminov/kod-prichiny-postanovki-kpp.html
   validates_using do |kpp|
     next false unless kpp.size == 9
     next false unless ValidatesRussian::REGION_NUMBERS.include?(kpp[0..1])

data/lib/validators/okpo_format_validator.rb

@@ -0,0 +1,16 @@
+class OkpoFormatValidator < ValidatesRussian::Validator
+  validates_using do |okpo|
+    next false unless okpo =~ /^\d+$/
+
+    okpo = okpo.split(//).map(&:to_i)
+
+    next false unless okpo.size == 8 || okpo.size == 10
+    next false unless calc(okpo) == okpo.last
+  end
+
+  private
+
+  def self.calc(okpo)
+    okpo[0..-2].each_with_index.inject(0){ |s, p| s + p[0] * (p[1] + 1) } % 11
+  end
+end

data/spec/validators/{inn_validator_spec.rb → inn_format_validator_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe InnValidator do
+describe InnFormatValidator do
   before(:each) do
     TestModel.reset_callbacks(:validate)
-    TestModel.validates(:field, inn: true)
+    TestModel.validates(:field, inn_format: true)
   end
 
   it 'should be valid for valid values' do

data/spec/validators/{kpp_validator_spec.rb → kpp_format_validator_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe KppValidator do
+describe KppFormatValidator do
   before(:each) do
     TestModel.reset_callbacks(:validate)
-    TestModel.validates(:field, kpp: true)
+    TestModel.validates(:field, kpp_format: true)
   end
 
   it 'should be valid for valid values' do

data/spec/validators/okpo_format_validator_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe OkpoFormatValidator do
+  before(:each) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, okpo_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_okpos =  %w{
+       57972160
+       13410254
+       0060621966
+       02372510
+    }
+
+    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, [], {})
+
+#    invalid_okpos.each do |okpo|
+#      model = TestModel.new
+#      model.field = okpo
+#      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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,12 +87,14 @@ files:
 - lib/validates_russian/region_numbers.rb
 - lib/validates_russian/validator.rb
 - lib/validates_russian/version.rb
-- lib/validators/inn_validator.rb
-- lib/validators/kpp_validator.rb
+- lib/validators/inn_format_validator.rb
+- lib/validators/kpp_format_validator.rb
+- lib/validators/okpo_format_validator.rb
 - spec/spec_helper.rb
 - spec/support/test_model.rb
-- spec/validators/inn_validator_spec.rb
-- spec/validators/kpp_validator_spec.rb
+- spec/validators/inn_format_validator_spec.rb
+- spec/validators/kpp_format_validator_spec.rb
+- spec/validators/okpo_format_validator_spec.rb
 - validates_russian.gemspec
 homepage: http://github.com/asiniy/validates_russian
 licenses:
@@ -120,5 +123,6 @@ summary: validates specific russian values
 test_files:
 - spec/spec_helper.rb
 - spec/support/test_model.rb
-- spec/validators/inn_validator_spec.rb
-- spec/validators/kpp_validator_spec.rb
+- spec/validators/inn_format_validator_spec.rb
+- spec/validators/kpp_format_validator_spec.rb
+- spec/validators/okpo_format_validator_spec.rb