dockcheck 1.4.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f352a253bbf5db4f908e1136c37ad48e9af3d70793624b936ca90cd6fb24004
-  data.tar.gz: bfbdfc0a4aca33ddc9e50434c7c8fbbbbea3ce678cbeb34f690c8bfe42b0c163
+  metadata.gz: 9d079d9a1588386ff41c27fec9604711f1afb293ea54b7fd0755bb0528fb9568
+  data.tar.gz: 402db0e63b940b2ee0285398cddf8e9341e9d96f11289220ea11ef9318e78ee2
 SHA512:
-  metadata.gz: fb97d053b3c4fdb07dd6f31540b4f41d5739b77d32217730915ec22c94ac0eeed77a8cd25e55a5898cd17678e5f9d13098ac97f6ee852139cee167c172cbf519
-  data.tar.gz: 6637e74d46a31c5e9b665f8317dfff98d15a9a0d462e7a5a48e06e3dfe2fc529f1c6e4420d7b720a62e96d913d0065be939d25ac08db47db490fe9f06cfe52e5
+  metadata.gz: 35d62aca6f77b83db8e46e48016a146e7a060c40884c5f3ff3ea9131d771831a10afa065d8756512334049a40efb0e17397164957b1b205f5b4d36b629d6976c
+  data.tar.gz: 43ed21a504636aac79806bc62a9f94c4ad4dd93e0d7331f91cab92a30eade881d66e0689c09bc4501d6fa184de5ccff2ccbec6a51bf5f9dc176505ecdd1bde82

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}
 
-    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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+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
+    else
+      document[:error] = 'Incorrect ogrn numbers count!'
+    end
+
+    document
+  end
+
+  def self.name
+    :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
+end

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.4.0
+  version: 2.0.2
 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,8 +32,10 @@ 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
 - lib/dockcheck/ogrnip.rb
 - lib/dockcheck/snils.rb
 homepage: https://rubygems.org/gems/dockcheck
@@ -48,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="