valvat 0.9.1 → 1.1.1

data/gemfiles/activemodel-5

@@ -1,8 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
-gem "activemodel", "~> 5.0.2"
+gem "activemodel", "~> 5.0"
 
-gem 'rspec', '~> 3.0'
 gem 'rack'
-gem 'rake'
+
+gemspec path: "../"

data/gemfiles/activemodel-6

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 6.0"
+
+gem 'rack'
+
+gemspec path: "../"

data/gemfiles/standalone

@@ -1,7 +1,5 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
-
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../"

data/lib/active_model/validations/valvat_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'valvat/syntax'
 require 'valvat/lookup'
@@ -5,47 +7,93 @@ require 'valvat/lookup'
 module ActiveModel
   module Validations
     class ValvatValidator < EachValidator
+      def initialize(options)
+        normalize_options(options)
+        super
+      end
+
       def validate_each(record, attribute, value)
         vat = Valvat(value)
         iso_country_code = vat.iso_country_code
 
-        if country_does_not_match?(record, iso_country_code)
-          iso_country_code = iso_country_code_of(record)
-        elsif vat.valid? && valid_checksum?(vat) && vat_exists?(vat)
-          return
-        end
+        is_valid = if country_does_not_match?(record, iso_country_code)
+                     iso_country_code = iso_country_code_of(record)
+                     false
+                   else
+                     vat_valid?(vat)
+                   end
 
-        iso_country_code = "eu" if iso_country_code.blank?
-        record.errors.add(attribute, :invalid_vat,
-          :message => options[:message],
-          :country_adjective => I18n.t(
-            :"valvat.country_adjectives.#{iso_country_code.downcase}",
-            :default => [:"valvat.country_adjectives.eu", "european"]
-          )
-        )
+        iso_country_code = 'eu' if iso_country_code.blank?
+
+        add_error(is_valid, record, attribute, iso_country_code)
       end
 
       private
 
+      def vat_valid?(vat)
+        vat.valid? && valid_checksum?(vat) && vat_exists?(vat)
+      end
+
+      def valid_checksum?(vat)
+        return true unless options[:checksum]
+
+        vat.valid_checksum?
+      end
+
+      def vat_exists?(vat)
+        return true unless options[:lookup]
+
+        exists = vat.exists?(options[:lookup])
+
+        return true if exists.nil? && !options[:lookup][:fail_if_down]
+
+        exists
+      end
+
       def country_does_not_match?(record, iso_country_code)
         return false unless options[:match_country]
+
         iso_country_code_of(record) != iso_country_code
       end
 
       def iso_country_code_of(record)
-        (record.send(options[:match_country]) || "").upcase
+        (record.send(options[:match_country]) || '').upcase
       end
 
-      def valid_checksum?(vat)
-        return true unless options[:checksum]
-        vat.valid_checksum?
+      def add_error(is_valid, record, attribute, iso_country_code)
+        case is_valid
+        when false
+          add_invalid_vat_error(record, attribute, iso_country_code)
+        when nil
+          add_vies_down_error(record, attribute)
+        end
       end
 
-      def vat_exists?(vat)
-        return true unless options[:lookup]
-        is_valid = vat.exists?
-        return is_valid unless is_valid.nil?
-        options[:lookup] != :fail_if_down
+      def add_invalid_vat_error(record, attribute, iso_country_code)
+        record.errors.add(attribute, :invalid_vat,
+                          message: options[:message],
+                          country_adjective: I18n.t(
+                            :"valvat.country_adjectives.#{iso_country_code.downcase}",
+                            default: [:"valvat.country_adjectives.eu", 'european']
+                          ))
+      end
+
+      def add_vies_down_error(record, attribute)
+        record.errors.add(attribute, :vies_down,
+                          message: options[:vies_down_message])
+      end
+
+      def normalize_options(options)
+        return unless options[:lookup]
+
+        options[:lookup] = case options[:lookup]
+                           when :fail_if_down
+                             { fail_if_down: true }
+                           when Hash
+                             options[:lookup]
+                           else
+                             {}
+                           end
       end
     end
   end

data/lib/valvat.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
+require 'valvat/error'
 require 'valvat/local'
 require 'valvat/lookup'
 require 'valvat/lookup/request'
-require 'valvat/lookup/request_with_id'
+require 'valvat/lookup/response'
+require 'valvat/lookup/fault'
 require 'active_model/validations/valvat_validator' if defined?(ActiveModel)
 
 class Valvat
-  def exists?(options={})
+  def exists?(options = {})
     Valvat::Lookup.validate(self, options)
   end
-  alias_method :exist?, :exists?
+  alias exist? exists?
 end

data/lib/valvat/checksum.rb

@@ -1,21 +1,11 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
-    ALGORITHMS = {}
-
-    def self.validate(vat)
-      vat = Valvat(vat)
-      algo = ALGORITHMS[vat.iso_country_code]
-      Valvat::Syntax.validate(vat) && !!(algo.nil? || algo.new(vat).validate)
-    end
-
     class Base
-      def self.inherited(klass)
-        ALGORITHMS[klass.name.split(/::/).last] = klass
-      end
-
       attr_reader :vat
 
-      def self.check_digit_length(len=nil)
+      def self.check_digit_length(len = nil)
         @check_digit_length = len if len
         @check_digit_length || 1
       end
@@ -39,44 +29,50 @@ class Valvat
       end
 
       def figures_str
-        str_wo_country[0..-(self.class.check_digit_length+1)]
+        str_wo_country[0..-(self.class.check_digit_length + 1)]
       end
 
       def figures
-        figures_str.split("").map(&:to_i)
+        figures_str.split('').map(&:to_i)
       end
 
       def str_wo_country
         vat.to_s_wo_country
       end
 
-      def sum_figures_by
-        figures.reverse.each_with_index.map do |fig, i|
-          yield(fig, i)
-        end.inject(:+)
+      def sum_figures_by(&block)
+        figures.reverse.each_with_index.map(&block).inject(:+)
       end
 
       def sum_of_squares(num)
-        num.to_s.split("").map(&:to_i).inject(:+)
+        num.to_s.split('').map(&:to_i).inject(:+)
       end
 
-      def sum_of_figures_for_at_es_it_se(reverse_ints=false)
+      def sum_of_figures_for_at_es_it_se(reverse_ints: false)
         ints = reverse_ints ? [2, 1] : [1, 2]
         sum_figures_by do |fig, i|
-          sum_of_squares(fig*(i.modulo(2) == 0 ? ints[0] : ints[1]))
+          sum_of_squares(fig * (i.modulo(2).zero? ? ints[0] : ints[1]))
         end
       end
 
       def sum_of_figues_for_pt_si
         11 - sum_figures_by do |fig, i|
-          fig*(i+2)
+          fig * (i + 2)
         end.modulo(11)
       end
     end
+
+    def self.validate(vat)
+      vat = Valvat(vat)
+      algo = ALGORITHMS[vat.iso_country_code]
+      Valvat::Syntax.validate(vat) && !!(algo.nil? || algo.new(vat).validate)
+    end
+
+    ALGORITHMS = Dir[File.join(__dir__, 'checksum', '*.rb')].each_with_object({}) do |path, algos|
+      require path.gsub(/\.rb$/, '')
+
+      classname = File.basename(path, '.rb').upcase
+      algos[classname] = ['Valvat', 'Checksum', classname].inject(Object, :const_get)
+    end.freeze
   end
 end
-
-Dir[File.join(File.dirname(__FILE__), 'checksum', '*.rb')].each do |path|
-  # On Ruby 2.1.0 ActiveSupport goes mad if you pass it paths with .rb at the end
-  require path.gsub(/\.rb$/, '')
-end

data/lib/valvat/checksum/at.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class AT < Base
@@ -11,4 +13,4 @@ class Valvat
       end
     end
   end
-end
+end

data/lib/valvat/checksum/be.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class BE < Base
@@ -8,4 +10,4 @@ class Valvat
       end
     end
   end
-end
+end

data/lib/valvat/checksum/bg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class BG < Base
@@ -9,6 +11,7 @@ class Valvat
         local_person_chk = check_digit_local_natural_person
 
         return local_person_chk if given_check_digit == local_person_chk
+
         check_digit_foreign_natural_person
       end
 
@@ -19,43 +22,40 @@ class Valvat
         end.inject(:+).modulo(11)
 
         return chk if chk < 10
-        return 0
+
+        0
       end
 
       def check_digit_foreign_natural_person
         weight = [21, 19, 17, 13, 11, 9, 7, 3, 1]
 
-        chk = figures.map do |fig|
+        figures.map do |fig|
           fig * weight.shift
         end.inject(:+).modulo(10)
-
-        chk
       end
 
       def check_digit_legal_person
-        prod = 0
-        figures.each_with_index do |fig, index|
-          prod += (index + 1) * fig.to_i
-        end
-
-        chk = prod % 11
+        chk = build_prod % 11
 
         if chk == 10
-          prod = 0
-          figures.each_with_index do |fig, index|
-            prod += (index + 3) * fig.to_i
-          end
-
-          chk = prod % 11
+          chk = build_prod(3) % 11
           chk = 0 if chk == 10
         end
 
         chk
       end
 
+      def build_prod(add = 1)
+        prod = 0
+        figures.each_with_index do |fig, index|
+          prod += (index + add) * fig.to_i
+        end
+        prod
+      end
+
       def natural_person?
         vat.to_s_wo_country.length == 10
       end
     end
   end
-end
+end

data/lib/valvat/checksum/cy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class CY < Base

data/lib/valvat/checksum/de.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class DE < Base
@@ -8,12 +10,12 @@ class Valvat
         prod = M
         figures.each do |fig|
           sum = (prod + fig).modulo(M)
-          sum = M if sum == 0
-          prod = (2*sum).modulo(N)
+          sum = M if sum.zero?
+          prod = (2 * sum).modulo(N)
         end
         chk = N - prod
         chk == 10 ? 0 : chk
       end
     end
   end
-end
+end

data/lib/valvat/checksum/dk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class DK < Base
@@ -15,4 +17,4 @@ class Valvat
       end
     end
   end
-end
+end

data/lib/valvat/checksum/ee.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class EE < Base

data/lib/valvat/checksum/es.rb

@@ -1,33 +1,31 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class ES < Base
-      NATURAL_PERSON_CHARS       = %w(T R W A G M Y F P D X B N J Z S Q V H L C K E)
-      NATURAL_PERSON_EXP         = /\A([\d]{8}[ABCDEFGHJKLMNPQRSTVWXYZ]|[KLMXYZ][\d]{7}[ABCDEFGHJKLMNPQRSTVWXYZ])\Z/
-      LEGAL_PERSON_CHARS = [false] + %w(A B C D E F G H I J)
-      LEGAL_PERSON_EXP   = /\A[NPQRSW][\d]{7}[ABCDEFGHIJ]\Z/
+      NATURAL_PERSON_CHARS       = %w[T R W A G M Y F P D X B N J Z S Q V H L C K E].freeze
+      NATURAL_PERSON_EXP         = /\A(\d{8}[ABCDEFGHJKLMNPQRSTVWXYZ]|[KLMXYZ]\d{7}[ABCDEFGHJKLMNPQRSTVWXYZ])\Z/.freeze
+      LEGAL_PERSON_CHARS = [false] + %w[A B C D E F G H I J]
+      LEGAL_PERSON_EXP   = /\A[NPQRSW]\d{7}[ABCDEFGHIJ]\Z/.freeze
+      NIE_DIGIT_BY_LETTER = %w[X Y Z].freeze
 
       def check_digit
         natural_person? ? check_digit_natural_person : check_digit_legal_person
       end
 
       def check_digit_natural_person
-        nie_digit = nil
         letter = vat.to_s_wo_country[0]
-        if letter == 'X'
-          nie_digit = 0
-        elsif letter == 'Y'
-          nie_digit = 1
-        elsif letter == 'Z'
-          nie_digit = 2
-        end
+        nie_digit = NIE_DIGIT_BY_LETTER.index(letter)
         NATURAL_PERSON_CHARS["#{nie_digit}#{figures_str}".to_i.modulo(23)]
       end
 
       def check_digit_legal_person
-        chk = 10 - sum_of_figures_for_at_es_it_se(true).modulo(10)
-        legal_foreign_person? ?
-          LEGAL_PERSON_CHARS[chk] :
+        chk = 10 - sum_of_figures_for_at_es_it_se(reverse_ints: true).modulo(10)
+        if legal_foreign_person?
+          LEGAL_PERSON_CHARS[chk]
+        else
           (chk == 10 ? 0 : chk)
+        end
       end
 
       def given_check_digit
@@ -52,4 +50,4 @@ class Valvat
       end
     end
   end
-end
+end