valvat 1.0.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c35eea0081e4df97219ee215ea3321c8add02bc130c5b28488f1dca676765dc
-  data.tar.gz: 4ba7b89f223d26d1ac9d967944d6c2e0dbea74c3c6066f1d69d0e2f42ba204c8
+  metadata.gz: 92de431f5777b0b5115169e30bac0233ce3d9047c1bc74b9d42fe02acb2b460d
+  data.tar.gz: 0146a80725a3dce432002a456b8e9f10e3a65ee5d36b27dac5c6d646dc48fa70
 SHA512:
-  metadata.gz: ab9623bd1d680546ca7978751b6536b626d2d5cb9ae35240b5152d4e7c9512e99e025481bf0a844254e6ad14d3f1f320dbf54ab6901387e354b7682c45cb3c3c
-  data.tar.gz: 79a69d5d148b86282f609d66bf053a1b14d4bd86621d7277a5f17d1d1df6c6fd5c9731cff4eca8c8bb9dde9f1265eef7ea03c60d2d66876b0f255d97a9596a6b
+  metadata.gz: b6d08a4d98163bd195d861c83a837042e93bfebe13606c0fce10a703bf702296eb406f75d39349e46e7078289b74d2779f511b3d3a77a49e4d4fb5e585fb01cc
+  data.tar.gz: c2190c0f729188281e4894fb1d7e2b4b771171215da07329b0fc92fcda8806f5ac8fe3d7d1eb2d2c1f1e941a06b3d3c22a975369d5617589702a86d727166d4b

data/.github/workflows/ruby.yml

@@ -0,0 +1,41 @@
+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.6', '2.7', '3.0', '3.1', 'truffleruby-head', 'jruby-9.3.2.0']
+        gemfile: [ 'standalone', 'activemodel-5', 'activemodel-6', 'activemodel-7' ]
+        exclude:
+          - ruby-version: '3.0'
+            gemfile: 'activemodel-5'
+          - ruby-version: '3.1'
+            gemfile: 'activemodel-5'
+          - ruby-version: '2.6'
+            gemfile: 'activemodel-7'
+          - ruby-version: 'jruby-9.3.2.0'
+            gemfile: 'activemodel-7'
+
+    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,33 @@
 
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v1.0.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.3...master)
+
+### 1.1.3 / 2022-01-26
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.2...v1.1.3)
+
+* Handle Savon::HTTPError and Savon::UnknownOperationError as ViesError and throw Valvat::HTTPError and Valvat::OperationUnknown instead.
+
+### 1.1.2 / 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.1 / 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
 

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,7 +1,7 @@
 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.
 
@@ -9,6 +9,8 @@ Validates european vat numbers. Standalone or as a ActiveModel validator.
 
 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
@@ -18,7 +20,7 @@ Valvat supports validating VAT-IDs from the UK by syntax & checksum for now. Val
 * 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.6/2.7/3.0/3.1, jruby, truffleruby-head and ActiveModel 5/6/7. 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
 
@@ -26,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'
 
@@ -256,7 +258,7 @@ https://github.com/yolk/valvat/graphs/contributors
 
 ## BlaBla
 
-Copyright (c) 2011-2020 Yolk Sebastian Munz & Julia Soergel GbR
+Copyright (c) 2011-2022 Yolk Sebastian Munz & Julia Soergel GbR
 
 Beyond that, the implementation is licensed under the MIT License.
 

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,26 @@
 -----BEGIN CERTIFICATE-----
-MIIELDCCApSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVzZWJh
-c3RpYW4vREM9eW8vREM9bGswHhcNMjEwMTA2MTAzMDU3WhcNMjIwMTA2MTAzMDU3
-WjAgMR4wHAYDVQQDDBVzZWJhc3RpYW4vREM9eW8vREM9bGswggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQC1KB7VOGa6pr926eaL2xCrnbnTxadpjq+6JoFj
-6rvDpmgD8wkdfU7aFTwBiEK9JKzhqCoW86Rt/8wOrEJRMXz1QBbpMBSrubtMB+0/
-N59hKPLwgBkhbxY7BwGnujxnTICgiGzkhjlgBe/MisoabfK5Tn84GWVk5e0/LUp1
-qTRkSgcaDlnKs2/dAUo1lXHa13TJeemgz76TYx4p4J2w7VGh7WS2ax5SNWKw+J+q
-HVSHT2Chc+a7As2cJyU/r2jX0oqSfvyg09CmF0inUBykeiuB9aeP/Me29hvg13/D
-r1gaQ3/Vyfuqjs8lrwIZCWLU607g5q3+UM884WWpvApsZwzajNM2+9l5jay7Dnan
-m05PcDtMYbPHiMyvuN9Vp4YIRqSBXP/DPGMnIYXbpzAQgtZymPQ8I3k8doj9q4+E
-2Cf+x/nqvF09r/+gJj4ybzNW23zU6mhZ+xzBTDWrWBDetz+Y3wdbU5X6j08jLuEg
-mMHmtgFdr/4VQxeaon7kHPR3DUsCAwEAAaNxMG8wCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBLAwHQYDVR0OBBYEFG8VE8+yijOldghb3w0MpSQnrslxMBoGA1UdEQQTMBGB
-D3NlYmFzdGlhbkB5by5sazAaBgNVHRIEEzARgQ9zZWJhc3RpYW5AeW8ubGswDQYJ
-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-----
+MIIEZDCCAsygAwIBAgIBATANBgkqhkiG9w0BAQsFADA8MRIwEAYDVQQDDAlzZWJh
+c3RpYW4xEjAQBgoJkiaJk/IsZAEZFgJ5bzESMBAGCgmSJomT8ixkARkWAmxrMB4X
+DTIyMDEyNjE4MjIxNFoXDTIzMDEyNjE4MjIxNFowPDESMBAGA1UEAwwJc2ViYXN0
+aWFuMRIwEAYKCZImiZPyLGQBGRYCeW8xEjAQBgoJkiaJk/IsZAEZFgJsazCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM8Gdm81LvuqMyJr9sO+KtJz+PhM
+x75w6uc5q3J8sTHGhOtWJlXiBFf8gbBkxUsQwDMEEbJ+WV63oqq9InVBrMHg9FxH
+415dC0UlCv5IjKij4N5OVRnUTZDoxXczVVscNFyQcRhJO1TqORw6uOF8gd/MVWl4
+6gJapzkLBMTIaqRUVbX3hTJpiGc1RV2zJmLkkvBtJ+lzqza0bklXh52LLs2UpTc1
+e5ADVoq9K09G5QXES/GlFMYerQbtdXl0KpUQugXtRFAOoOrFKQFLETZSDq80lC7p
++zN+wNOEAuHtJP7EZVk/gU8hEkSDMexW5NRndgeQb+N/JH8DIRBbhOytZbAo19Pq
+LEZBucHheI0xstLWuIP+ktwa/rIWv5v4gv3JZ/4H3q6tGPHigLKneRmaXo3e6jna
+RFDxQLXbJgI37qusk4Qyl/iBVSBZ+TABBvA/jPXnHdd29qkuMTXvWLIiBDM6H0+2
+SUabsieR1CqNZs/6YLO7nQHwFudHqzo8OB4+3QIDAQABo3EwbzAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUfC99QRDzqEe0tw1Da+XR9u4dmjEwGgYD
+VR0RBBMwEYEPc2ViYXN0aWFuQHlvLmxrMBoGA1UdEgQTMBGBD3NlYmFzdGlhbkB5
+by5sazANBgkqhkiG9w0BAQsFAAOCAYEAwYCyAFFXgYXWgaO8vQEZoQSjp5v6g1v/
+t9TcO8JmX6UqEgoRHsdxPEyCK9RroYIv7X5GDyJ12ZdiGpzCqJiBIC9Gz3cCWAbp
+LtnkhO8SQbz5B0NMOvo4o6XnbAr+rhVihuJmf0zXInnm1KZW/Yi+4JNAebPqwF1S
+VZ/2Dz2BtTuTFhqlHOGxV2NxcnZjFff9kfUOLwl/oNUKgBecsMP5aW74zSOmc2fO
+3sykOkKf5mWSY/KSuaCmAP1Ou3UUXOQmxiPUW9SDAzhYGKS63yPMkzJAziDP9ewI
+zmOE2OJr0NuCmH9ykqlJZU4wnmloCnE1+8kHCl4+76cgBnN5gnYnzUb4RDM3J4EI
+Jdm7+JxQbgAP/HJ2C2ara+uwc9jwhw2s1b2+TPnVCZdh9uBttHWfk0wgDoeFwky1
+BUdT7mtr41GgvWnIjaGWAldSuabxx5H+PKS5FzjNDMHThRZWuvYp/nP2RXDh4gIa
+7hV09P+XxvS96G+petG5KmC/lev8VqKu
+-----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/gemfiles/{activemodel-3-2 → activemodel-7}

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "activemodel", "~> 3.2"
+gem "activemodel", "~> 7.0"
 
-gem 'rack', '< 2'
+gem 'rack'
 
 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'
@@ -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.translate(
+                            :"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