valvat 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b64b4bcee899d80f3c9205b541eeaf7123df7560e47528368bedc0e06d85f85
-  data.tar.gz: 31f18a7bf075a71c719002e3b34dd4a057da7ba85aeaf7283385d7ffc98f7dcb
+  metadata.gz: c16a7d36925ce61bf367e4770331dff3e41b76b5cfe21699f04379086e73d55b
+  data.tar.gz: bd011d1f238122ffe21ebfc882707e54de6e56a9fb97c90a2836d4e5d20ee189
 SHA512:
-  metadata.gz: 2b419833c23922a653f932995541e25300a8897529cd3bfdea2078de762f5829451e35c1a658510cfbd64978f0f6165471d1331e1673d381ef5c0ecd6ca6380a
-  data.tar.gz: e595829c058d7b2b89a644b779c4ea95c66eb9d416e395a4b32cf4d28f73bcb717f55c720fe51dd8d027092c94ae04b3c094cd1e7fbf1fe95d833330851a37d5
+  metadata.gz: 45c3632f628083f4113e90eef117cef893cc4a9742fbbfaacdffa2106c6585964949143af2591d0ad13c81a7657222d591a67119a3b4a1cc3c9e61a17765607a
+  data.tar.gz: 2ef6fe227f4726abbd3952befeabb82abffad26ce8f70e30da394956d14818208e45bd05a42870c68fc9d17b716c112fa304a16fbec12f9cf53fc7331d29c05d

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+name: Specs
+
+on:
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGES.md'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    runs-on: ubuntu-latest
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', 'jruby-head', 'truffleruby-head']
+        gemfile: [ 'standalone', 'activemodel-5', 'activemodel-6' ]
+        exclude:
+          - ruby-version: '3.0'
+            gemfile: 'activemodel-5'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run specs
+      run: |
+        bundle exec rspec

data/.gitignore

@@ -6,3 +6,4 @@ gemfiles/*.lock
 tmp
 .rbenv-*
 .ruby-version
+.ruby-gemset

data/.rubocop.yml

@@ -0,0 +1,15 @@
+require: rubocop-rspec
+AllCops:
+    NewCops: enable
+    TargetRubyVersion: 2.5
+
+Metrics/BlockLength:
+  Exclude:
+    - valvat.gemspec
+    - spec/**/*_spec.rb
+
+Style/Documentation:
+    Enabled: false
+
+RSpec/MultipleExpectations:
+    Enabled: false

data/CHANGES.md

@@ -1,7 +1,35 @@
 
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.9.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.2...master)
+
+### 1.1.0 / 2021-10-29
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.1...v1.1.2)
+
+* Fixed SOAPAction error (#105) (by [Ľubo ](https://github.com/lubosch))
+
+### 1.1.0 / 2021-07-15
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.0...v1.1.1)
+
+* Added support for italian VAT numbers with special province part (#104)
+
+### 1.1.0 / 2021-01-15
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.0.1...v1.1.0)
+
+* Added support for Northern Ireland XI prefixed VAT numbers (by [Avatar Ignacy Kasperowicz](https://github.com/kspe))
+* ActiveModel: Return specific error message if VIES is down and fail_if_down is set to true (by [Arkadiy Zabazhanov](https://github.com/pyromaniac))
+* Removed support for EOL rubies (all before 2.5) and ActiveModel before 5.0
+
+### 1.0.1 / 2020-12-06
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.0.0...v1.0.1)
+
+* Added missing spaces to malformatted portuegese locale file
+* Removed GB from EU_COUNTRIES / EU_MEMBER_STATES but kept support
+* Fixed typo in error message: UNK(N)OWN (by [Igor Gonchar](https://github.com/gigorok))
 
 ### 1.0.0 / 2020-11-06
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in valvat.gemspec

data/Guardfile

@@ -1,5 +1,7 @@
-guard :rspec, cmd: "bundle exec rspec --color" do
-  watch(/^spec\/(.*)_spec.rb/)
-  watch(/^lib\/(.*)\.rb/)          { |m| "spec/#{m[1]}_spec.rb" }
-  watch(/^spec\/spec_helper.rb/)   { "spec" }
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec --color' do
+  watch(%r{^spec/(.*)_spec.rb})
+  watch(%r{^lib/(.*)\.rb})          { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^spec/spec_helper.rb})   { 'spec' }
 end

data/README.md

@@ -1,10 +1,16 @@
 valvat
 ===========
 
-[![Gem Version](https://badge.fury.io/rb/valvat.svg)](http://badge.fury.io/rb/valvat) [![Build Status](https://travis-ci.org/yolk/valvat.svg)](https://travis-ci.org/yolk/valvat) [![Code Climate](https://codeclimate.com/github/yolk/valvat.svg)](https://codeclimate.com/github/yolk/valvat)
+[![rubygems](https://badgen.net/rubygems/v/valvat)](https://rubygems.org/gems/valvat) [![Specs](https://github.com/yolk/valvat/workflows/Specs/badge.svg)](https://github.com/yolk/valvat/actions?query=workflow%3ASpecs)
 
 Validates european vat numbers. Standalone or as a ActiveModel validator.
 
+## A note on Brexit
+
+Valvat supports validating VAT-IDs from the UK by syntax & checksum for now. Validation against the VIES web service will probably stop working (and return `false`) in 2021.
+
+Northern Ireland received its own VAT number prefix - XI which is supported by VIES web service so any XI-prefixed VAT numbers should be validated as any EU VAT number.
+
 ## Features
 
 * Simple syntax verification
@@ -14,7 +20,7 @@ Validates european vat numbers. Standalone or as a ActiveModel validator.
 * I18n locales for language specific error messages in English, German, French, Spanish, Italian, Portuguese, Polish, Swedish, Dutch, Danish, Czech, Slovakian, Hungarian, Bulgarian, Romanian, Latvian, Catalan, Norwegian, and Finnish.
 * *Experimental* checksum verification
 
-valvat is tested and works with ruby MRI 1.9.3/2.0/2.1/2.2/2.3/2.4/2.5/2.6/2.7, jruby (including 1.9 mode) and ActiveModel 3/4/5/6
+valvat is tested and works with ruby MRI 2.5/2.6/2.7/3.0, jruby-head, truffleruby-head and ActiveModel 5/6. If you need support for ruby down to 1.9.3 and ActiveModel 3 and 4 use [v1.0.1](https://github.com/yolk/valvat/tree/v1.0.1).
 
 ## Installation
 
@@ -22,7 +28,7 @@ Add it to your Gemfile:
 
     gem 'valvat'
 
-To use less memory (~3.5 mb vs. ~0.5 mb) and load only the local verification functionality – and not the remote lookup with VIES – add it like this instead:
+To use less memory (~0.5 mb vs. ~3.5 mb) and load only the local verification functionality – and not the remote lookup with VIES – add it like this instead:
 
     gem 'valvat', require: 'valvat/local'
 
@@ -201,7 +207,7 @@ To allow vat numbers from outside of europe, add something like this to your mod
       validates :vat_number, valvat: true, if: :eu?
 
       def eu?
-        Valvat::Utils::EU_COUNTRIES.include?(country_code)
+        Valvat::Utils::EU_MEMBER_STATES.include?(country_code)
       end
     end
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -5,4 +7,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/certs/yolk.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 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
-c3RpYW4vREM9eW8vREM9bGswHhcNMTkxMTE1MTIzMzUwWhcNMjAxMTE0MTIzMzUw
+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
-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
+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
-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
-9vbf6JSKzQPa/HeBoU0s1Q==
------END CERTIFICATE-----
+KoZIhvcNAQELBQADggGBAIky67U9hnB8d4qMKwXHGb3Ne7JLvEigtEhjqGlDVecb
+C94vQ8Jg7lYB3kKVjvFN2drptq/JUpxmAxPQIqfx39gKcKyv0BjkroVFE8MS1324
+khMOZFOoSPMd9pkpm7oJ1M+sCYcUM+tPKnU8Ojq6r9j5b5XrbxG8YSpwahva3Vap
+1g0+3KzuWPpFjFen1VbS/Sb1cyE5uQtUj7lVcdhF3EFvzXkUMUUtJ4xsk114znFO
+986sKab5AjlJ7TnsmPphCv/UXans7rAVB2lnozlt/kw6dcct5JD4kz1tD6AmO5Qd
+jWRuKNZs66GBglRvseKoypXz1XDCCu1m/uI1IGmKnq8Ry+IeRq9RnlvbfPvSxRIx
+9aowoL79T9plhcEcEX/KYRp8ht1z+3Vyk2UVZP8Xl5x+K44co5xdhljYi1gtw0w8
+KzzULF0bF9oNpXwBEamlH2myNb19u1W8ijobQ7Y19ca8UFHr5LI32ZW5Zlmep8je
+vb+o07oLRx3t2T/EO4DZ1w==
+-----END CERTIFICATE-----

data/gemfiles/activemodel-5

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "activemodel", "~> 5.2.0"
+gem "activemodel", "~> 5.0"
 
 gem 'rack'
 

data/gemfiles/activemodel-6

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "activemodel", "~> 6.0.0"
+gem "activemodel", "~> 6.0"
 
 gem 'rack'
 

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'
@@ -6,16 +8,7 @@ module ActiveModel
   module Validations
     class ValvatValidator < EachValidator
       def initialize(options)
-        if options[:lookup]
-          options[:lookup] = if options[:lookup] == :fail_if_down
-            {fail_if_down: true}
-          elsif options[:lookup].is_a?(Hash)
-            options[:lookup]
-          else
-            {}
-          end
-        end
-
+        normalize_options(options)
         super
       end
 
@@ -23,44 +16,84 @@ module ActiveModel
         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]
+      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]
 
-        is_valid = vat.exists?(options[:lookup])
-        return is_valid unless is_valid.nil?
-        !options[:lookup][:fail_if_down]
+        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/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

data/lib/valvat/checksum/fi.rb

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

data/lib/valvat/checksum/fr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Valvat
   module Checksum
     class FR < Base
@@ -5,10 +7,10 @@ class Valvat
         siren = str_wo_country[2..-1].to_i
         (12 + (3 * siren) % 97) % 97
       end
-      
+
       def given_check_digit
         str_wo_country[0..1].to_i
       end
     end
   end
-end
+end