validates_russian 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a9a6630d0d107ba996e35406d6e003de4c597c5
-  data.tar.gz: 72a174080a59d75f87e8fb108b976d05fa242d7a
+  metadata.gz: 6e97b119010d0a6820f7f31e6839104f2e2b005a
+  data.tar.gz: 37676d8a1f51e2d6dfc94723c36275e31e8879dd
 SHA512:
-  metadata.gz: bc04c67c11c4a8dc19578dcb604fc527042538e1bc92ad5ea26188e6b93d80d505525fb167279a9fe7f011e18501cfd08b6bcd2ff3c4c59515b09779a2aaafe8
-  data.tar.gz: 310ca0b03a83734c11944762c0a81ae1342769db515b6f4563d17000ae0cf4309a9af2cb099dfec0015a66240ed3c8e31227d35cd5f6516a96c2e6ab83f2764a
+  metadata.gz: 5b5da3c0ef4b177e0b48ac8818d9e9e59ab525f15448af1dda13ebb5df45f5ed1f91044a25eba0d25ad1ce2f71a9d74074b06d067e7c2162084419ca0cab511e
+  data.tar.gz: ae8fe525c3c6f952a03a70f843c6a9f852330b58bdd644364263f1c479fd985b4d6f9bed0e24aad1c77828c4f829701fe65888b34b2e9bad7bb7d8a215202b55

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.0.7
+
+* BikValidator
+* OkpoValidator fix for okpo ended with zero
+
 ### 0.0.6
 
 * PassportFormatValidator

data/CONTRIBUTING.md

@@ -0,0 +1,39 @@
+#Инструкции разработчикам
+
+Валидатор копируется с класса `ValidatesRussian::Validator`, а дальше используется блок `validates_using`. В том случае, если значение не должно подходить по условиям, то используется `next false condition`:
+
+```ruby
+class BiggerThanTwoValidator < ValidatesRussian::Validator # Больше двух
+  validates_using do |number|
+    next false unless number.to_i > 2
+  end
+end
+```
+
+Существует список номеров регионов, доступный под `ValidatesRussian::REGION_NUMBERS`. Его **нужно** использовать для подтверждения номеров регионов, например ИНН:
+
+```ruby
+print ValidatesRussian::REGION_NUMBERS # => ["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"]
+
+class InnValidator < ValidatesRussian::Validator
+  validates_using do |inn|
+    ...
+    next false unless ValidatesRussian::REGION_NUMBERS.include?(inn[0..1]) # станет невалидным, если нет кода региона РФ
+    ...
+  end
+end
+```
+
+Если хочешь удостовериться, что в строке только цифры, используй
+
+``` ruby
+  next false unless kpp =~ /^\d+$/
+```
+
+### Если есть желание помочь,
+то пиши любой код. Сообщество поможет.
+
+### Несколько полезных ссылок:
+
+1. http://dplabs.ru/blog/2009/jun/21/innkpp-code-decode/
+2. https://github.com/melervand/tax-info-validation

data/README.md

@@ -1,7 +1,7 @@
 # validates_russian
 
 [[english_doc](doc/english_readme.md)]
-[[инструкции разработчикам](https://github.com/asiniy/validates_russian/wiki/Инструкции-разработчикам)]
+[[инструкции разработчикам](CONTRIBUTING.md)]
 [![Gem Version](https://badge.fury.io/rb/validates_russian.png)](http://badge.fury.io/rb/validates_russian)
 [![Build Status](https://travis-ci.org/asiniy/validates_russian.png?branch=master)](https://travis-ci.org/asiniy/validates_russian)
 [![Code Climate](https://codeclimate.com/github/asiniy/validates_russian.png)](https://codeclimate.com/github/asiniy/validates_russian)
@@ -17,6 +17,7 @@
 * [OKATO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_объектов_административно-территориального_деления) (OkatoFormatValidator)
 * [СНИЛС](http://ru.wikipedia.org/wiki/Страховой_номер_индивидуального_лицевого_счёта) (SnilsFormatValidator)
 * [Значение паспорта](http://ru.wikipedia.org/wiki/Паспорт_гражданина_Российской_Федерации) (PassportFormatValidator)
+* [БИК](http://ru.wikipedia.org/wiki/БИК) (BikFormatValidator)
 
 ## Установка
 

data/doc/english_readme.md

@@ -1,6 +1,6 @@
 # validates_russian
 
-[[по-русски](README.md)]
+[[по-русски](../README.md)]
 [![Gem Version](https://badge.fury.io/rb/validates_russian.png)](http://badge.fury.io/rb/validates_russian)
 [![Build Status](https://travis-ci.org/asiniy/validates_russian.png?branch=master)](https://travis-ci.org/asiniy/validates_russian)
 [![Code Climate](https://codeclimate.com/github/asiniy/validates_russian.png)](https://codeclimate.com/github/asiniy/validates_russian)
@@ -16,6 +16,7 @@ Russian specific values validation:
 * [OKATO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_объектов_административно-территориального_деления) (OkatoFormatValidator)
 * [SNILS](http://ru.wikipedia.org/wiki/Страховой_номер_индивидуального_лицевого_счёта) (SnilsFormatValidator)
 * [Passport Value](http://ru.wikipedia.org/wiki/Паспорт_гражданина_Российской_Федерации) (PassportFormatValidator)
+* [BIK](http://ru.wikipedia.org/wiki/БИК) (BikFormatValidator) Bank Identification Number
 
 ## Installation
 

data/lib/validates_russian/okato_region_numbers.rb

@@ -1,3 +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
+  OKATO_REGION_NUMBERS = %w{01 03 04 05 07 08 11 12 14 15 17 19 20 22 24 25 26 27 28 29 32 33 34 36 37 38 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 72 73 74 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}
+end

data/lib/validates_russian/version.rb

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

data/lib/validators/bik_format_validator.rb

@@ -0,0 +1,7 @@
+class BikFormatValidator < ValidatesRussian::Validator
+  validates_using do |bik|
+    next false unless bik =~ /^\d+$/
+    next false unless bik[0..1] == '04'
+    next false unless ValidatesRussian::OKATO_REGION_NUMBERS.include?(bik[2..3])
+  end
+end

data/lib/validators/inn_format_validator.rb

@@ -2,19 +2,19 @@ class InnFormatValidator < ValidatesRussian::Validator
   validates_using do |inn|
     next false unless ValidatesRussian::REGION_NUMBERS.include?(inn[0..1])
     next false unless inn =~ /^\d+$/
-    next false if inn.size != 10 && inn.size != 12
 
     inn = inn.split(//).map(&:to_i)
 
-    if inn.size == 10
+    case inn.size
+    when 10
       n10 = calc(P10, inn)
       next false unless n10 == inn[9]
-    end
-
-    if inn.size == 12
+    when 12
       n11 = calc(P11, inn)
       n12 = calc(P12, inn)
       next false unless n11 == inn[10] && n12 == inn[11]
+    else
+      next false
     end
   end
 

data/lib/validators/ogrn_format_validator.rb

@@ -1,14 +1,11 @@
 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
+    case ogrn.size
+    when 13 then next false unless (ogrn[0..-2].to_i % 11 % 10) == ogrn[-1].to_i
+    when 15 then next false unless (ogrn[0..-2].to_i % 13 % 10) == ogrn[-1].to_i
+    else next false
     end
   end
-end
+end

data/lib/validators/okpo_format_validator.rb

@@ -11,6 +11,6 @@ class OkpoFormatValidator < ValidatesRussian::Validator
   private
 
   def self.calc(okpo)
-    okpo[0..-2].each_with_index.inject(0){ |s, p| s + p[0] * (p[1] + 1) } % 11
+    okpo[0..-2].each_with_index.inject(0){ |s, p| s + p[0] * (p[1] + 1) } % 11 % 10
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,10 @@ Dir[File.dirname(__FILE__) + '/support/*.rb'].each { |f| require f }
 
 RSpec.configure do |config|
   config.order = 'random'
-  config.color_enabled = true
+  config.color = true
   config.formatter     = 'documentation'
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

data/spec/support/test_model.rb

@@ -2,4 +2,10 @@ class TestModel
   include ActiveModel::Validations
 
   attr_accessor :field
+
+  def initialize(options = {})
+    options.each do |key, value|
+      self.send("#{key}=", value)
+    end
+  end
 end

data/spec/validators/bik_format_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe BikFormatValidator do
+  before(:all) do
+    TestModel.reset_callbacks(:validate)
+    TestModel.validates(:field, bik_format: true)
+  end
+
+  it 'should be valid for valid values' do
+    valid_biks = %w{
+      044525957
+      044525225
+      044030811
+      042520849
+      044525593
+      044652323
+      044525202
+      049205770
+    }
+
+    valid_biks.each do |bik|
+      expect(TestModel.new(field: bik)).to be_valid
+    end
+  end
+
+  it 'should not be valid for invalid values' do
+    invalid_biks = %w(
+      040205770
+      549205770
+      #ffff
+      orange-duck
+      eee
+      xxx
+      epics
+      1234567890
+      123456789101
+    ).push('', ' ', nil)
+
+    invalid_biks.each do |bik|
+      expect(TestModel.new(field: bik)).to_not be_valid
+    end
+  end
+end

data/spec/validators/inn_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe InnFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, inn_format: true)
   end
@@ -22,9 +22,7 @@ describe InnFormatValidator do
     }
 
     valid_inns.each do |inn|
-      model = TestModel.new
-      model.field = inn
-      model.should be_valid
+      expect(TestModel.new(field: inn)).to be_valid
     end
   end
 
@@ -40,9 +38,7 @@ describe InnFormatValidator do
     ).push('', ' ', nil)
 
     invalid_inns.each do |inn|
-      model = TestModel.new
-      model.field = inn
-      model.should_not be_valid
+      expect(TestModel.new(field: inn)).to_not be_valid
     end
   end
 end

data/spec/validators/kpp_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe KppFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, kpp_format: true)
   end
@@ -14,9 +14,7 @@ describe KppFormatValidator do
     }
 
     valid_kpps.each do |kpp|
-      model = TestModel.new
-      model.field = kpp
-      model.should be_valid
+      expect(TestModel.new(field: kpp)).to be_valid
     end
   end
 
@@ -30,9 +28,7 @@ describe KppFormatValidator do
     }.push('', ' ', nil, [], {})
 
     valid_kpps.each do |kpp|
-      model = TestModel.new
-      model.field = kpp
-      model.should_not be_valid
+      expect(TestModel.new(field: kpp)).to_not be_valid
     end
   end
 end

data/spec/validators/ks_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe KsFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, ks_format: true)
   end
@@ -14,9 +14,7 @@ describe KsFormatValidator do
     }
 
     valid_kss.each do |ks|
-      model = TestModel.new
-      model.field = ks
-      model.should be_valid
+      expect(TestModel.new(field: ks)).to be_valid
     end
   end
 
@@ -29,9 +27,7 @@ describe KsFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_kss.each do |ks|
-      model = TestModel.new
-      model.field = ks
-      model.should_not be_valid
+      expect(TestModel.new(field: ks)).to_not be_valid
     end
   end
-end
+end

data/spec/validators/ogrn_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe OgrnFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, ogrn_format: true)
   end
@@ -15,9 +15,7 @@ describe OgrnFormatValidator do
     }
 
     valid_ogrns.each do |ogrn|
-      model = TestModel.new
-      model.field = ogrn
-      model.should be_valid
+      expect(TestModel.new(field: ogrn)).to be_valid
     end
   end
 
@@ -30,9 +28,7 @@ describe OgrnFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_ogrns.each do |ogrn|
-      model = TestModel.new
-      model.field = ogrn
-      model.should_not be_valid
+      expect(TestModel.new(field: ogrn)).to be_invalid
     end
   end
 end

data/spec/validators/okato_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe OkatoFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, okato_format: true)
   end
@@ -15,9 +15,7 @@ describe OkatoFormatValidator do
     }
 
     valid_okatos.each do |okato|
-      model = TestModel.new
-      model.field = okato
-      model.should be_valid
+      expect(TestModel.new(field: okato)).to be_valid
     end
   end
 
@@ -30,9 +28,7 @@ describe OkatoFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_okatos.each do |okato|
-      model = TestModel.new
-      model.field = okato
-      model.should_not be_valid
+      expect(TestModel.new(field: okato)).to_not be_valid
     end
   end
-end
+end

data/spec/validators/okpo_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe OkpoFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, okpo_format: true)
   end
@@ -10,13 +10,15 @@ describe OkpoFormatValidator do
     valid_okpos = %w{
       57972160
       13410254
+      74917270
+      99874891
+      75249303
+      99874891
       0060621966
     }
 
     valid_okpos.each do |okpo|
-      model = TestModel.new
-      model.field = okpo
-      model.should be_valid
+      expect(TestModel.new(field: okpo)).to be_valid
     end
   end
 
@@ -29,9 +31,7 @@ describe OkpoFormatValidator do
     }.push('', ' ', nil, [], {})
 
     valid_okpos.each do |okpo|
-      model = TestModel.new
-      model.field = okpo
-      model.should_not be_valid
+      expect(TestModel.new(field: okpo)).to_not be_valid
     end
   end
 end

data/spec/validators/passport_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe PassportFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, passport_format: true)
   end
@@ -15,9 +15,7 @@ describe PassportFormatValidator do
     }
 
     valid_passports.each do |passport|
-      model = TestModel.new
-      model.field = passport
-      model.should be_valid
+      expect(TestModel.new(field: passport)).to be_valid
     end
   end
 
@@ -30,9 +28,7 @@ describe PassportFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_passports.each do |passport|
-      model = TestModel.new
-      model.field = passport
-      model.should_not be_valid
+      expect(TestModel.new(field: passport)).to_not be_valid
     end
   end
-end
+end

data/spec/validators/rs_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RsFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, rs_format: true)
   end
@@ -14,9 +14,7 @@ describe RsFormatValidator do
     }
 
     valid_rss.each do |rs|
-      model = TestModel.new
-      model.field = rs
-      model.should be_valid
+      expect(TestModel.new(field: rs)).to be_valid
     end
   end
 
@@ -30,9 +28,7 @@ describe RsFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_rss.each do |rs|
-      model = TestModel.new
-      model.field = rs
-      model.should_not be_valid
+      expect(TestModel.new(field: rs)).to_not be_valid
     end
   end
-end
+end

data/spec/validators/snils_format_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SnilsFormatValidator do
-  before(:each) do
+  before(:all) do
     TestModel.reset_callbacks(:validate)
     TestModel.validates(:field, snils_format: true)
   end
@@ -15,9 +15,7 @@ describe SnilsFormatValidator do
     }
 
     valid_snilses.each do |snils|
-      model = TestModel.new
-      model.field = snils
-      model.should be_valid
+      expect(TestModel.new(field: snils)).to be_valid
     end
   end
 
@@ -31,9 +29,7 @@ describe SnilsFormatValidator do
     }.push('', ' ', nil, [], {})
 
     invalid_snilses.each do |snils|
-      model = TestModel.new
-      model.field = snils
-      model.should_not be_valid
+      expect(TestModel.new(field: snils)).to be_invalid
     end
   end
-end
+end

data/validates_russian.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~>1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: validates_russian
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alex Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: validates specific russian values
 email:
 - kaburbundokel11g@inbox.ru
@@ -73,9 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -89,6 +90,7 @@ files:
 - lib/validates_russian/region_numbers.rb
 - lib/validates_russian/validator.rb
 - lib/validates_russian/version.rb
+- lib/validators/bik_format_validator.rb
 - lib/validators/inn_format_validator.rb
 - lib/validators/kpp_format_validator.rb
 - lib/validators/ks_format_validator.rb
@@ -100,6 +102,7 @@ files:
 - lib/validators/snils_format_validator.rb
 - spec/spec_helper.rb
 - spec/support/test_model.rb
+- spec/validators/bik_format_spec.rb
 - spec/validators/inn_format_validator_spec.rb
 - spec/validators/kpp_format_validator_spec.rb
 - spec/validators/ks_format_validator_spec.rb
@@ -120,23 +123,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: validates specific russian values
 test_files:
 - spec/spec_helper.rb
 - spec/support/test_model.rb
+- spec/validators/bik_format_spec.rb
 - spec/validators/inn_format_validator_spec.rb
 - spec/validators/kpp_format_validator_spec.rb
 - spec/validators/ks_format_validator_spec.rb