dockcheck 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed9065176dd1b7f5415c1aec2868487cfd32132596d12e293e14576ac70bb1ed
-  data.tar.gz: ad0d88dfa11855d9854a201c3382c0afc93dcb577f9c8456d917434f9d3a3b57
+  metadata.gz: 16925d52a82de3e76d124db3c4e1ada4ccac3b5808c6f87c4ee09440544d3346
+  data.tar.gz: 17c529dcc327c32d75a60a3b1a3effb8446061cfe43fa6cc408ba637feb750d6
 SHA512:
-  metadata.gz: ee4a9956d5790887cf7cbac5e5251e17344939d5ee52725a938ef19a1b18b7cb724eec900476d0fb49cf36f704efb7da5b4658784770f94d25cafd795ea97bc9
-  data.tar.gz: bb1d2dd63c048ccba919dc685485af9bdc3ee3a555d5940f3699d7097aa89e235080f6771d28bf9f112abb0b2538de86f49e9305a8748dbbe2aad9f6ea3ac5fc
+  metadata.gz: 77d35ed631c258e118419b95a5438077fdcf6742fc88a623774412a1f56d7ffe74eabc0a35b97b6d3adf22494892f390676e83b0fdb237b35277d6c3489a0253
+  data.tar.gz: 3f3adaf5d388d4ca2a13f43ffbd631ec3fce57424dee1a4c698c8efd721488d05c9ce5cdd94c9e9e0cd612939009b34b48d7e25051acbf95cc2a1e6990fcefeb

data/lib/dockcheck/bik.rb

@@ -3,7 +3,6 @@
 require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Bik
-
   def self.check(document)
     bik = document[:content]
 
@@ -20,5 +19,4 @@ class DockCheck::Bik
   def self.name
     :bik
   end
-
 end

data/lib/dockcheck/dockhelper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class DockHelper
-
   def self.numberize_document(numbers)
     numbers.split('').map(&:to_i)
   end
@@ -13,8 +12,7 @@ class DockHelper
   def self.prepare_doc(doc)
     new_data = doc
     new_data[:correct] = false
-    new_data[:error] = ""
+    new_data[:error] = ''
     new_data
   end
-
 end

data/lib/dockcheck/inn.rb

@@ -3,9 +3,9 @@
 require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Inn
-  @@ten_digits_map = [2, 4, 10, 3, 5, 9, 4, 6, 8]
-  @@twelve_digits_first_map = [7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
-  @@twelve_digits_second_map = [3, 7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
+  @ten_digits_map = [2, 4, 10, 3, 5, 9, 4, 6, 8]
+  @twelve_digits_first_map = [7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
+  @twelve_digits_second_map = [3, 7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
 
   def self.check(document)
     inn = DockHelper.numberize_document(document[:content])
@@ -26,12 +26,10 @@ class DockCheck::Inn
     :inn
   end
 
-  private
-
   def self.control_sum_calc(inn, coefficients)
     inn
       .zip(coefficients)
-      .filter { |(a, b)| !b.nil? }
+      .filter { |(_a, b)| !b.nil? }
       .reduce(0) { |acc, (a, b)| a * b + acc }
   end
 
@@ -41,7 +39,7 @@ class DockCheck::Inn
 
   def self.ten_digit_inn_valid?(inn)
     last_number = inn.last
-    control_sum = control_sum_calc(inn, @@ten_digits_map)
+    control_sum = control_sum_calc(inn, @ten_digits_map)
     last_number == sum_div(control_sum)
   end
 
@@ -49,8 +47,8 @@ class DockCheck::Inn
     last_number = inn.last
     penult_number = inn.fetch(10)
 
-    first_sum = control_sum_calc(inn, @@twelve_digits_first_map)
-    second_sum = control_sum_calc(inn, @@twelve_digits_second_map)
+    first_sum = control_sum_calc(inn, @twelve_digits_first_map)
+    second_sum = control_sum_calc(inn, @twelve_digits_second_map)
 
     penult_number == sum_div(first_sum) && last_number == sum_div(second_sum)
   end

data/lib/dockcheck/kpp.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class DockCheck::Kpp
-
   def self.check(document)
     kpp = document[:content]
 
@@ -19,8 +18,6 @@ class DockCheck::Kpp
     :kpp
   end
 
-  private
-
   def self.kpp_valid?(kpp)
     !!(kpp =~ /^[0-9]{4}[0-9A-Z]{2}[0-9]{3}$/)
   end

data/lib/dockcheck/ogrn.rb

@@ -3,18 +3,12 @@
 require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Ogrn
-
   def self.check(document)
     ogrn = document[:content]
 
     case ogrn.length
     when 13
-      document[:correct] =
-        if DockHelper.only_digits?(ogrn)
-          ogrn_valid?(ogrn)
-        else
-          false
-        end
+      document[:correct] = DockHelper.only_digits?(ogrn) ? ogrn_valid?(ogrn) : false
     else
       document[:error] = 'Incorrect ogrn numbers count!'
     end
@@ -26,11 +20,10 @@ class DockCheck::Ogrn
     :ogrn
   end
 
-  private
-
   def self.ogrn_valid?(ogrn)
     first_code = ogrn[0..12].to_i
     second_code = (first_code / 11).floor * 11
+    
     result_sum = (first_code - second_code) % 10
     result_sum == ogrn[13].to_i
   end

data/lib/dockcheck/ogrnip.rb

@@ -3,22 +3,8 @@
 require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Ogrnip
-
   def self.check(document)
-    ogrnip = document[:content]
-
-    case ogrnip.length
-    when 15
-      document[:correct] =
-        if DockHelper.only_digits?(ogrnip)
-          ogrnip_valid?(ogrnip)
-        else
-          false
-        end
-    else
-      document[:error] = 'Incorrect ogrnip numbers count!'
-    end
-
+    validate_ogrnip(document)
     document
   end
 
@@ -26,12 +12,21 @@ class DockCheck::Ogrnip
     :ogrnip
   end
 
-  private
-
   def self.ogrnip_valid?(ogrnip)
     first_code = ogrnip[0..13].to_i
     second_code = (first_code / 13).floor * 13
-    result_sum = (first_code - second_code) % 10
-    result_sum == ogrnip[14].to_i
+    
+    sum = (first_code - second_code) % 10
+    sum == ogrnip[14].to_i
+  end
+
+  def self.validate_ogrnip(data)
+    ogrnip = data[:content]
+    case ogrnip.length
+    when 15
+      data[:correct] = DockHelper.only_digits?(ogrnip) ? ogrnip_valid?(ogrnip) : false
+    else
+      data[:error] = 'Incorrect ogrnip numbers count!'
+    end
   end
 end

data/lib/dockcheck/snils.rb

@@ -3,7 +3,7 @@
 require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Snils
-  @@coefficients_map = [9, 8, 7, 6, 5, 4, 3, 2, 1]
+  @coefficients_map = [9, 8, 7, 6, 5, 4, 3, 2, 1]
 
   def self.check(document)
     snils = DockHelper.numberize_document(document[:content])
@@ -23,28 +23,23 @@ class DockCheck::Snils
     :snils
   end
 
-  private
-
   def self.control_sum_calc(inn, coefficients)
     inn
       .zip(coefficients)
-      .filter { |(a, b)| !b.nil? }
+      .filter { |(_a, b)| !b.nil? }
       .reduce(0) { |acc, (a, b)| a * b + acc }
   end
 
   def self.check_control_sum(control_sum)
-    if control_sum < 100
-      control_sum
-    elsif control_sum == 100
-      0
-    else
-      rem = control_sum % 101
-      rem == 100 ? 0 : rem
-    end
+    return control_sum if control_sum < 100
+    return 0 if control_sum == 100
+
+    rem = control_sum % 101
+    rem == 100 ? 0 : rem
   end
 
   def self.snils_valid?(snils, last_digits)
-    control_sum = control_sum_calc(snils, @@coefficients_map)
+    control_sum = control_sum_calc(snils, @coefficients_map)
     last_digits == check_control_sum(control_sum)
   end
 end

data/lib/dockcheck.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
 class DockCheck
-  @checkers_map
-
-  def initialize()
-    @checkers_map = {inn: Inn, snils: Snils, bik: Bik, kpp: Kpp, ogrnip: Ogrnip, ogrn: Ogrn}
-    self
+  def initialize
+    @checkers_map = { inn: Inn, snils: Snils, bik: Bik, kpp: Kpp, ogrnip: Ogrnip, ogrn: Ogrn }
   end
 
   def check(data)
@@ -30,23 +27,28 @@ class DockCheck
     checker = doc[:type]
     result = doc
 
-    if checker
-      if @checkers_map.key?(checker.to_sym)
-        if doc[:content]
-          result = @checkers_map[checker].check(doc)
-        else
-          result[:error] = 'Content field required!'
-        end
-      else
-        result[:error] = 'Incorrect checker!'
-      end
-    else
+    unless checker
       result[:error] = 'Document type field required!'
+      return result
+    end
+
+    if @checkers_map.key?(checker.to_sym)
+      result = check_control_sum(result)
+    else
+      result[:error] = 'Incorrect checker!'
     end
 
     result
   end
 
+  def check_control_sum(data)
+    if data[:content]
+      @checkers_map[data[:type]].check(data)
+    else
+      data[:error] = 'Content field required!'
+      data
+    end
+  end
 end
 
-Dir[File.join(__dir__, 'dockcheck', '*.rb')].each { |file| require file }
+Dir[File.join(__dir__, 'dockcheck', '*.rb')].sort.each { |file| require file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockcheck
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Artem Solomatin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2022-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec