validates_russian 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e3af0d1808ab847f2cd084325c33418232028b
-  data.tar.gz: 1f6e04ec2815f26f13c71d754b2f5f66f0cdd147
+  metadata.gz: 895f186530e57b3009037436810f6f832baeb63c
+  data.tar.gz: 3828f4bae242c267b5ccf8a0ef6e0538afd267c4
 SHA512:
-  metadata.gz: f650d9ee7f675c3367d40e3ab7ec4d7719cd600575529f975f2e9b93333dd9fe095b1fec03d9d21c8df852646164870136209d5b9c8a10865954bc32c4701b09
-  data.tar.gz: 5dddeaa8ca84b76d4c79ad90be8715d880e61d1410cc0ed71ff9e6990f12296302fa9db960d3e1abc122c792c667d1d52730379b3631b7a0371790bc82476e1b
+  metadata.gz: aae5bd3478e863d862037eca35fcb3311d76772a4db021b804f03a1fdd116d44cad5b978bae26d673d3f5dd9807219e6af612a127db9b10947e3bb8a097b0671
+  data.tar.gz: bc282cb216daba3c485c3fdd41e476a4ff352fe8774e23c44f8c3cdc522ce725a7a9612b3744e5069fe110c7b0ce2e4682ab35812bdca2d0321e571e840cc7bd

data/.gitignore

@@ -14,3 +14,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.ruby-gemset

data/lib/validates_russian/version.rb

@@ -1,3 +1,3 @@
 module ValidatesRussian
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/validators/okpo_format_validator.rb

@@ -11,6 +11,17 @@ 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 % 10
+    nums = okpo[0..-2]
+    check_digit = weight(nums, 1) % 11
+    check_digit = weight(nums, 3) % 11 if check_digit == 10
+    check_digit == 10 ? 0 : check_digit
+  end
+
+  def self.weight(nums, shift)
+    nums.each_with_index.inject(0) { |a, e| a + e[0] * calc_weight(e[1] + shift) }
+  end
+
+  def self.calc_weight(num)
+    num == 11 ? 1 : num
   end
 end

data/spec/validators/okpo_format_validator_spec.rb

@@ -10,11 +10,14 @@ describe OkpoFormatValidator do
     valid_okpos = %w{
       57972160
       13410254
-      74917270
+      74917277
+      00002810
       99874891
       75249303
       99874891
+      20557396
       0060621966
+      0174266916
     }
 
     valid_okpos.each do |okpo|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_russian
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alex Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: validates specific russian values