dockcheck 1.5.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7aaa0ca2abb56b55e0ff11c0b816ec17e4e7626ed22bdea52700d971383686
-  data.tar.gz: b5574801c3f3dc57dfa68d709c498eb0c1de1c8875bc8f501832f9d04dc1064f
+  metadata.gz: ed9065176dd1b7f5415c1aec2868487cfd32132596d12e293e14576ac70bb1ed
+  data.tar.gz: ad0d88dfa11855d9854a201c3382c0afc93dcb577f9c8456d917434f9d3a3b57
 SHA512:
-  metadata.gz: 365180ad497aaf40d805dfc377516e474cce8c0e041ef756372f3e929a3409bb0e6fa0c6d7ac705c0374f42c620c3c080108d433de0ee1cfd36020bed0117d09
-  data.tar.gz: b66ae04b7c81c9ddfd1a00359a3e3b861f5c2118b4a80dcf223b294617242a2997fd73fe91256bd39cff0ea85a4ff0fff8381d7afb1fc312d5df412c1cb05fcb
+  metadata.gz: ee4a9956d5790887cf7cbac5e5251e17344939d5ee52725a938ef19a1b18b7cb724eec900476d0fb49cf36f704efb7da5b4658784770f94d25cafd795ea97bc9
+  data.tar.gz: bb1d2dd63c048ccba919dc685485af9bdc3ee3a555d5940f3699d7097aa89e235080f6771d28bf9f112abb0b2538de86f49e9305a8748dbbe2aad9f6ea3ac5fc

data/lib/dockcheck.rb

@@ -1,37 +1,52 @@
 # frozen_string_literal: true
 
 class DockCheck
-  @current_checker
+  @checkers_map
 
-  def initialize(checker = :inn)
-    dispatch(checker)
+  def initialize()
+    @checkers_map = {inn: Inn, snils: Snils, bik: Bik, kpp: Kpp, ogrnip: Ogrnip, ogrn: Ogrn}
     self
   end
 
-  def check(numbers, *other_data)
-    @current_checker.check(numbers, *other_data)
+  def check(data)
+    document = DockHelper.prepare_doc(data)
+    check_doc(document)
   end
 
-  def change_checker(checker)
-    dispatch(checker)
-    self
+  def check_many(documents)
+    documents.each do |document|
+      doc = DockHelper.prepare_doc(document)
+      check_doc(doc)
+    end
   end
 
-  def current_checker
-    @current_checker.name()
+  def list_checkers
+    @checkers_map.map { |checker| checker.last.name }
   end
 
   private
-  def dispatch(checker)
-    checkers_map = {inn: Inn, snils: Snils, bik: Bik, kpp: Kpp, ogrnip: Ogrnip, ogrn: Ogrn}
 
-    if checkers_map.key?(checker.to_sym)
-      @current_checker = checkers_map[checker].new
+  def check_doc(doc)
+    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
-      raise 'Incorrect checker!'
+      result[:error] = 'Document type field required!'
     end
+
+    result
   end
+
 end
 
 Dir[File.join(__dir__, 'dockcheck', '*.rb')].each { |file| require file }
-

data/lib/dockcheck/bik.rb

@@ -1,23 +1,24 @@
 # frozen_string_literal: true
 
+require "#{__dir__}/dockhelper.rb"
+
 class DockCheck::Bik
 
-  def check(bik, _)
+  def self.check(document)
+    bik = document[:content]
+
     case bik.length
     when 9
-      bik_valid?(bik)
+      document[:correct] = DockHelper.only_digits?(bik)
     else
-      raise StandardError.new 'Incorrect bik numbers count!'
+      document[:error] = 'Incorrect bik numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :bik
   end
 
-  private
-
-  def bik_valid?(bik)
-    bik.scan(/\D/).empty?
-  end
 end

data/lib/dockcheck/dockhelper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class DockHelper
+
+  def self.numberize_document(numbers)
+    numbers.split('').map(&:to_i)
+  end
+
+  def self.only_digits?(document)
+    document.scan(/\D/).empty?
+  end
+
+  def self.prepare_doc(doc)
+    new_data = doc
+    new_data[:correct] = false
+    new_data[:error] = ""
+    new_data
+  end
+
+end

data/lib/dockcheck/inn.rb

@@ -1,49 +1,51 @@
 # frozen_string_literal: true
 
+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]
 
-  def check(numbers, _)
-    inn = prepare_inn(numbers)
+  def self.check(document)
+    inn = DockHelper.numberize_document(document[:content])
+
     case inn.count
     when 10
-      ten_digit_inn_valid?(inn)
+      document[:correct] = ten_digit_inn_valid?(inn)
     when 12
-      twelve_digit_inn_valid?(inn)
+      document[:correct] = twelve_digit_inn_valid?(inn)
     else
-      raise StandardError.new 'Incorrect inn numbers count!'
+      document[:error] = 'Incorrect inn numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :inn
   end
 
   private
-  def prepare_inn(numbers)
-    numbers.split('').map(&:to_i)
-  end
 
-  def control_sum_calc(inn, coefficients)
+  def self.control_sum_calc(inn, coefficients)
     inn
       .zip(coefficients)
       .filter { |(a, b)| !b.nil? }
       .reduce(0) { |acc, (a, b)| a * b + acc }
   end
 
-  def sum_div(number)
+  def self.sum_div(number)
     number % 11 % 10
   end
 
-  def ten_digit_inn_valid?(inn)
+  def self.ten_digit_inn_valid?(inn)
     last_number = inn.last
     control_sum = control_sum_calc(inn, @@ten_digits_map)
     last_number == sum_div(control_sum)
   end
 
-  def twelve_digit_inn_valid?(inn)
+  def self.twelve_digit_inn_valid?(inn)
     last_number = inn.last
     penult_number = inn.fetch(10)
 

data/lib/dockcheck/kpp.rb

@@ -2,22 +2,26 @@
 
 class DockCheck::Kpp
 
-  def check(kpp, _)
+  def self.check(document)
+    kpp = document[:content]
+
     case kpp.length
     when 9
-      kpp_valid?(kpp)
+      document[:correct] = kpp_valid?(kpp)
     else
-      raise StandardError.new 'Incorrect kpp numbers count!'
+      document[:error] = 'Incorrect kpp numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :kpp
   end
 
   private
 
-  def kpp_valid?(kpp)
+  def self.kpp_valid?(kpp)
     !!(kpp =~ /^[0-9]{4}[0-9A-Z]{2}[0-9]{3}$/)
   end
 end

data/lib/dockcheck/ogrn.rb

@@ -1,31 +1,34 @@
 # frozen_string_literal: true
 
+require "#{__dir__}/dockhelper.rb"
+
 class DockCheck::Ogrn
 
-  def check(ogrn, _)
+  def self.check(document)
+    ogrn = document[:content]
+
     case ogrn.length
     when 13
-      if only_digits?(ogrn)
-        ogrn_valid?(ogrn)
-      else
-        false
-      end
+      document[:correct] =
+        if DockHelper.only_digits?(ogrn)
+          ogrn_valid?(ogrn)
+        else
+          false
+        end
     else
-      raise StandardError.new 'Incorrect ogrn numbers count!'
+      document[:error] = 'Incorrect ogrn numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :ogrn
   end
 
   private
 
-  def only_digits?(ogrn)
-    ogrn.scan(/\D/).empty?
-  end
-
-  def ogrn_valid?(ogrn)
+  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

data/lib/dockcheck/ogrnip.rb

@@ -1,31 +1,34 @@
 # frozen_string_literal: true
 
+require "#{__dir__}/dockhelper.rb"
+
 class DockCheck::Ogrnip
 
-  def check(ogrnip, _)
+  def self.check(document)
+    ogrnip = document[:content]
+
     case ogrnip.length
     when 15
-      if only_digits?(ogrnip)
-        ogrnip_valid?(ogrnip)
-      else
-        false
-      end
+      document[:correct] =
+        if DockHelper.only_digits?(ogrnip)
+          ogrnip_valid?(ogrnip)
+        else
+          false
+        end
     else
-      raise StandardError.new 'Incorrect ogrnip numbers count!'
+      document[:error] = 'Incorrect ogrnip numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :ogrnip
   end
 
   private
 
-  def only_digits?(ogrnip)
-    ogrnip.scan(/\D/).empty?
-  end
-
-  def ogrnip_valid?(ogrnip)
+  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

data/lib/dockcheck/snils.rb

@@ -1,36 +1,38 @@
 # frozen_string_literal: true
 
+require "#{__dir__}/dockhelper.rb"
+
 class DockCheck::Snils
   @@coefficients_map = [9, 8, 7, 6, 5, 4, 3, 2, 1]
 
-  def check(numbers, _)
-    snils = prepare_snils(numbers)
+  def self.check(document)
+    snils = DockHelper.numberize_document(document[:content])
+
     case snils.count
     when 11
-      last_digits = numbers.slice(9, 10).to_i
-      snils_valid?(snils, last_digits)
+      last_digits = document[:content].slice(9, 10).to_i
+      document[:correct] = snils_valid?(snils, last_digits)
     else
-      raise StandardError.new 'Incorrect snils numbers count!'
+      document[:error] = 'Incorrect snils numbers count!'
     end
+
+    document
   end
 
-  def name
+  def self.name
     :snils
   end
 
   private
-  def prepare_snils(numbers)
-    numbers.split('').map(&:to_i)
-  end
 
-  def control_sum_calc(inn, coefficients)
+  def self.control_sum_calc(inn, coefficients)
     inn
       .zip(coefficients)
       .filter { |(a, b)| !b.nil? }
       .reduce(0) { |acc, (a, b)| a * b + acc }
   end
 
-  def check_control_sum(control_sum)
+  def self.check_control_sum(control_sum)
     if control_sum < 100
       control_sum
     elsif control_sum == 100
@@ -41,7 +43,7 @@ class DockCheck::Snils
     end
   end
 
-  def snils_valid?(snils, last_digits)
+  def self.snils_valid?(snils, last_digits)
     control_sum = control_sum_calc(snils, @@coefficients_map)
     last_digits == check_control_sum(control_sum)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockcheck
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Artem Solomatin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-27 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,6 +32,7 @@ extra_rdoc_files: []
 files:
 - lib/dockcheck.rb
 - lib/dockcheck/bik.rb
+- lib/dockcheck/dockhelper.rb
 - lib/dockcheck/inn.rb
 - lib/dockcheck/kpp.rb
 - lib/dockcheck/ogrn.rb
@@ -49,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="