dockcheck 1.5.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db77327141c60927c497dac9420f9f054810d1812cee41565a7a0bb5ce1524a
-  data.tar.gz: cb28c66b5914807ae53ed9509068a7d269285ff76c9350d0852b6021e194befc
+  metadata.gz: 0334f4fff36db9957de8703cfb0a729fadf92677bff5e26cd2639dd14d0bf335
+  data.tar.gz: bf5fd6c357a00f436a0c75ed75d5e0a67b1166c4ad7d8aab4f85efdb97a2f16e
 SHA512:
-  metadata.gz: 94e25d852a60b6dc4518fb98aa07da7ef09f1ab636204d79d1397df48cf69f2d516ec74e200eef076e8d5843533cdf3b46e4324cca8271519e4fda28b2e93964
-  data.tar.gz: b5ce4d3d479da2c0fbcdea780686dc67fbb40f8b40473669142c5809e0ddf885f2718b80a878c936e2702dadc1224249c15942946a7b9bdc35c50518728e9c97
+  metadata.gz: bb1ff933ac9370992f3ee5ad68ff4adf25deb0d442fffcf2442556922b7939ce2ac8a2dafe6450b59a61129ec4a4f547107fc61dca74eaf119b3e2e02930520a
+  data.tar.gz: 44fc73683518fb66e17e9a12d649db25887c0f3765e446db8970a622c895bfbdfcbdb87a0ef821ad546ab69df93d6bd99d17f44c53abb7a61b6fb25f2aec9168

data/lib/dockcheck.rb

@@ -1,45 +1,35 @@
 # frozen_string_literal: true
 
 class DockCheck
-  @current_checker
   @checkers_map
 
-  def initialize(checker = :inn)
+  def initialize()
     @checkers_map = {inn: Inn, snils: Snils, bik: Bik, kpp: Kpp, ogrnip: Ogrnip, ogrn: Ogrn}
-    dispatch(checker)
     self
   end
 
-  def check(numbers, *other_data)
-    @current_checker.check(numbers, *other_data)
+  def check(data)
+    doc = DockHelper.prepare_doc(data)
+    checker = doc[:type]
+    if @checkers_map.key?(checker.to_sym)
+      @checkers_map[checker].check(doc)
+    else
+      raise 'Incorrect checker!'
+    end
   end
 
   def check_many(documents)
     documents.each do |document|
       checker = document[:type]
-      doc = document[:content]
-      extra = document[:extra]
-      document[:correct] = @checkers_map[checker].new.check(doc, extra)
+      doc = DockHelper.prepare_doc(document)
+      @checkers_map[checker].check(doc)
     end
   end
 
-  def change_checker(checker)
-    dispatch(checker)
-    self
-  end
-
-  def current_checker
-    @current_checker.name()
+  def list_checkers
+    @checkers_map.map { |checker| checker.last.name }
   end
 
-  private
-  def dispatch(checker)
-    if @checkers_map.key?(checker.to_sym)
-      @current_checker = @checkers_map[checker].new
-    else
-      raise 'Incorrect checker!'
-    end
-  end
 end
 
 Dir[File.join(__dir__, 'dockcheck', '*.rb')].each { |file| require file }

data/lib/dockcheck/bik.rb

@@ -4,16 +4,20 @@ require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Bik
 
-  def check(bik, _)
+  def self.check(document)
+    bik = document[:content]
+
     case bik.length
     when 9
-      DockHelper.only_digits?(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
 

data/lib/dockcheck/dockhelper.rb

@@ -10,4 +10,11 @@ class DockHelper
     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

@@ -7,42 +7,45 @@ class DockCheck::Inn
   @@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 = DockHelper.numberize_document(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 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

@@ -4,26 +4,31 @@ require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Ogrn
 
-  def check(ogrn, _)
+  def self.check(document)
+    ogrn = document[:content]
+
     case ogrn.length
     when 13
-      if DockHelper.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 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

@@ -4,26 +4,31 @@ require "#{__dir__}/dockhelper.rb"
 
 class DockCheck::Ogrnip
 
-  def check(ogrnip, _)
+  def self.check(document)
+    ogrnip = document[:content]
+
     case ogrnip.length
     when 15
-      if DockHelper.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 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

@@ -5,31 +5,34 @@ require "#{__dir__}/dockhelper.rb"
 class DockCheck::Snils
   @@coefficients_map = [9, 8, 7, 6, 5, 4, 3, 2, 1]
 
-  def check(numbers, _)
-    snils = DockHelper.numberize_document(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 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
@@ -40,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.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Artem Solomatin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,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:
   - - ">="