valvat 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc72697b0c9176fc5204b1434efb9acb303e70f37ba894518a92ef964e22111b
-  data.tar.gz: 879918277a1fdee158ae2d45d5ba12c06ed9ce2f3a61143f8ae737cb079f4f8a
+  metadata.gz: d8adbca62e2ebbf198c817bfed2cf8dc2d375a24cb146dff52ce42a6dd59750d
+  data.tar.gz: 84949112505cff60333ff382583b54f4b4c20cb86e59bf5cbb1c16616c1c3ce7
 SHA512:
-  metadata.gz: fd117658d26b50836714888ddc58b0a1155b380d874887af56b299226120164a7730b44cf76599f281bc51ab87dc4ce535dada233dbf2a99b62f84502b418fe0
-  data.tar.gz: 7c452101dc8994424f4e3af668834f16e7fe1297b71f634f42e0ea4f25fe2678cafb33b154ca9d3ffa9de9b578cb20869fcb251464393f67aec98ac24543273c
+  metadata.gz: d2c2cb07112932730644124d140dc29a8e1ffc2e0b590d67ef1ff9f24dfb9c327fc72c189a8ebccdb983c04271c5cabebfa210bc20a61d8b9788c489135d58f9
+  data.tar.gz: 543a2f012caac4dfb874d9c5cca697b3cde38bbb16ca646ff87e66020d913f58094890ceed95d0ffa39637d4c538253358fe0f6ae4ea0a045fe6de4fd9f8585b

data/.github/workflows/ruby.yml

@@ -2,12 +2,12 @@ name: Specs
 
 on:
   push:
-    branches: [ master ]
     paths-ignore:
       - 'README.md'
       - 'CHANGES.md'
   pull_request:
-    branches: [ master ]
+  schedule:
+    - cron:  '52 8 * * *'
 
 jobs:
   test:
@@ -17,7 +17,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', 'truffleruby-head', 'jruby-9.3.2.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', 'jruby-9.3.2.0']
         gemfile: [ 'standalone', 'activemodel-5', 'activemodel-6', 'activemodel-7' ]
         exclude:
           - ruby-version: '3.0'

data/.rubocop.yml

@@ -9,7 +9,16 @@ Metrics/BlockLength:
     - spec/**/*_spec.rb
 
 Style/Documentation:
-    Enabled: false
+  Enabled: false
 
 RSpec/MultipleExpectations:
-    Enabled: false
+  Enabled: false
+
+Style/StringChars:
+    Enabled: false
+
+RSpec/NestedGroups:
+  Max: 4
+
+RSpec/ExampleLength:
+  Enabled: false

data/CHANGES.md

@@ -1,7 +1,24 @@
 
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v1.1.4...master)
+[full changelog](http://github.com/yolk/valvat/compare/v1.2.0...master)
+
+### 1.2.0 / 2022-09-30
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.5...v1.2.0)
+
+* Implemented lookup of VAT numbers from the UK (via HMRC api and only with :uk option set to true) (by [Adrien Rey-Jarthon](https://github.com/jarthod))
+* Remimplemented VIES lookup using only nethttp (removes dependency on savon)
+* Deprecate require 'valvat/local'. Please require 'valvat' directly.
+* Apply more rules to spanish VAT numbers on checksum validation #115 (by [Thomas Scalise](https://github.com/KirtashW17))
+
+### 1.1.5 / 2022-09-14
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.4...v1.1.5)
+
+* Fixed natural person VAT checksum validation for ES #114 (by [Thomas Scalise](https://github.com/KirtashW17))
+* Better (ruby) code blocks in README #113
+* Minor internal syntax changes / refactorings
 
 ### 1.1.4 / 2022-05-05
 
@@ -14,7 +31,7 @@
 
 [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.
+* Handle Savon::HTTPError and Savon::UnknownOperationError as LookupError and throw Valvat::HTTPError and Valvat::OperationUnknown instead.
 
 ### 1.1.2 / 2021-10-29
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Yolk Sebastian Munz & Julia Soergel GbR
+Copyright (c) 2011-2022 mite GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,7 +7,7 @@ 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.
+Valvat supports validating VAT-IDs from the UK by syntax, checksum and using the HMRC API (for backwards compatibility only with the `:uk` option set to true). Validation against the VIES web service stopped working early 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.
 
@@ -15,24 +15,24 @@ Northern Ireland received its own VAT number prefix - XI which is supported by V
 
 * Simple syntax verification
 * Lookup via the VIES web service
+* (Optional) lookup via the HMRC web service (for UK VAT numbers)
 * ActiveModel/Rails integration
 * Works standalone without ActiveModel
+* No runtime dependencies
 * 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 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).
+valvat is tested and works with ruby MRI 2.6/2.7/3.0/3.1, jruby 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
 
 Add it to your Gemfile:
 
-    gem 'valvat'
+```ruby
+gem 'valvat'
+```
 
-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'
-
-In any case run:
+And run:
 
     $ bundle
 
@@ -44,66 +44,96 @@ Or install it yourself as:
 
 To verify the syntax of a vat number:
 
-    Valvat.new("DE345789003").valid?
-    => true or false
+```ruby
+Valvat.new("DE345789003").valid?
+# => true or false
+```
 
 It is also possible to bypass initializing a Valvat instance and check the syntax of a vat number string directly with:
 
-    Valvat::Syntax.validate("DE345789003")
-    => true or false
+```ruby
+Valvat::Syntax.validate("DE345789003")
+# => true or false
+```
+
+## Validate against the VIES / HMRC web service
 
-## Validate agains the VIES web service
+To check if the given vat number exists via the VIES or HMRC web service:
 
-To check if the given vat number exists via the VIES web service:
+```ruby
+Valvat.new("DE345789003").exists?
+# => true or false or nil
+```
 
-    Valvat.new("DE345789003").exists?
-    => true or false or nil
+Or to lookup a vat number string directly:
 
-Or to lookup a vat number string directly via VIES web service:
+```ruby
+Valvat::Lookup.validate("DE345789003")
+# => true or false or nil
+```
 
-    Valvat::Lookup.validate("DE345789003")
-    => true or false or nil
+To keep backwards compatibility lookups of UK VAT numbers against the HMRC API are only performed with the option `:uk` set to true.
 
-*IMPORTANT* Keep in mind that the VIES web service might be offline at some time for all or some member states. If this happens `exists?` or `Valvat::Lookup.validate` will return `nil`. See *Handling of VIES maintenance errors* for further details.
+```ruby
+Valvat::Lookup.validate("GB553557881", uk: true)
+# => true or false or nil
+```
+
+Without this option the lookup of UK VAT number always returns `false`.
+
+*IMPORTANT* Keep in mind that the web service might be offline at some time for all or some member states. If this happens `exists?` or `Valvat::Lookup.validate` will return `nil`. See *Handling of maintenance errors* for further details.
 
 ### Details & request identifier
 
 If you need all details and not only if the VAT is valid, pass {detail: true} as second parameter to the lookup call.
 
-    Valvat.new("IE6388047V").exists?(detail: true)
-    => {
-      :country_code=>"IE", :vat_number => "6388047V", :valid => true,
-      :request_date => Date.today, :name=>"GOOGLE IRELAND LIMITED",
-      :address=>"1ST & 2ND FLOOR ,GORDON HOUSE ,BARROW STREET ,DUBLIN 4"
-    } or false or nil
+```ruby
+Valvat.new("IE6388047V").exists?(detail: true)
+=> {
+  :country_code=> "IE", :vat_number => "6388047V", :valid => true,
+  :request_date => Date.today, :name=> "GOOGLE IRELAND LIMITED",
+  :address=> "1ST & 2ND FLOOR ,GORDON HOUSE ,BARROW STREET ,DUBLIN 4"
+} or false or nil
+```
 
-According to EU law, or at least as Austria sees it, it's mandatory to verify the VAT number of every new customer, but also to check the VAT number periodicaly. To prove that you have checked the VAT number, the VIES Web service can return a `request_identifier`.
+According to EU law, or at least as Austria sees it, it's mandatory to verify the VAT number of every new customer, but also to check the VAT number periodicaly. To prove that you have checked the VAT number, the web service can return a `request_identifier`.
 
 To receive a `request_identifier` you need to pass your own VAT number in the options hash. In this example, Google (VAT IE6388047V) is checking the validity of eBays VAT number (LU21416127)
 
-    Valvat.new("LU21416127").exists?(requester: "IE6388047V")
-    => {
-      :country_code=>"LU", :vat_number => "21416127", :valid => true,
-      :request_date => Date.today, :name=>"EBAY EUROPE S.A R.L.",
-      :address => "22, BOULEVARD ROYAL\nL-2449  LUXEMBOURG",
-      :company_type => nil, :request_identifier => "some_uniq_string"
-    } or false or nil
+```ruby
+Valvat.new("LU21416127").exists?(requester: "IE6388047V")
+=> {
+  :country_code=>"LU", :vat_number => "21416127", :valid => true,
+  :request_date => Date.today, :name=>"EBAY EUROPE S.A R.L.",
+  :address => "22, BOULEVARD ROYAL\nL-2449  LUXEMBOURG",
+  :company_type => nil, :request_identifier => "some_uniq_string"
+} or false or nil
+```
 
 If the given `requester` is invalid, a `Valvat::InvalidRequester` error is thrown.
 
-### Handling of VIES maintenance errors
+When requesting a `request_identifier` for a GB VAT number, the requester must be your own GB number; a EU VAT number won't work.
+
+Note that when validating UK VAT numbers using the HMRC service, the detail output is modified to match the one from VIES more closely with slight differences remaining:
+
+1. The `request_date` will actually be a (more precise) `Time` instead of a `Date`
+2. The `address` string will join lines using `\n` instead of `,` so it's more acurate and can be displayed nicely.
+
+### Handling of maintenance errors
 
 From time to time the VIES web service for one or all member states is down for maintenance. To handle this kind of temporary errors, `Valvat::Lookup#validate` returns `nil` by default to indicate that there is no way at the moment to say if the given VAT is valid or not. You should revalidate the VAT later. If you prefer an error, use the `raise_error` option:
 
-    Valvat.new("IE6388047V").exists?(raise_error: true)
+```ruby
+Valvat.new("IE6388047V").exists?(raise_error: true)
+```
 
 This raises `Valvat::ServiceUnavailable` or `Valvat::MemberStateUnavailable` instead of returning `nil`.
 
 Visit [http://ec.europa.eu/taxation_customs/vies/viesspec.do](http://ec.europa.eu/taxation_customs/vies/viesspec.do) for more accurate information at what time the service for a specific member state will be down.
 
-### Handling of other VIES errors
+### Handling of other errors
 
-All other errors accuring while validating against the VIES web service are raised and must be handled by you. These include:
+All other errors accuring while validating against the web service are raised and must be handled by you. These include:
 
  * `Valvat::InvalidRequester`
  * `Valvat::BlockedError`
@@ -113,39 +143,45 @@ All other errors accuring while validating against the VIES web service are rais
 
 If you want to suppress all known error cases. Pass in the `raise_error` option set to `false`:
 
-    Valvat.new("IE6388047V").exists?(raise_error: false)
+```ruby
+Valvat.new("IE6388047V").exists?(raise_error: false)
+```
 
 This will return `nil` instead of raising a known error.
 
-### Set options for the savon client
-
-Use the `:savon` key to set options for the used savon SOAP client. For example to log all requests:
+### Set options for the Net::HTTP client
 
-    Valvat.new("IE6388047V").exists?(savon: {log: true})
+Use the `:http` key to set options for the http client. These options are directly passed to `Net::HTTP.start`.
 
-Or to use higher timeouts for the requests:
+For example to set timeouts:
 
-   Valvat.new("IE6388047V").exists?(savon: {open_timeout: 10, read_timeout: 10})
+```ruby
+Valvat.new("IE6388047V").exists?(http: { open_timeout: 10, read_timeout: 10 })
+```
 
 ### Skip local validation before lookup
 
-To prevent unnecessary requests, valvat performs a local syntax check before making the request to the VIES web service. If you want to skip this step (for any reason), set the `:skip_local_validation` option to `true`.
+To prevent unnecessary requests, valvat performs a local syntax check before making the request to the web service. If you want to skip this step (for any reason), set the `:skip_local_validation` option to `true`.
 
 ## Experimental checksum verification
 
 valvat allows to check vat numbers from AT, BE, BG, DE, DK, ES, FR, FI, GR, IE, IT, LU, NL, PL, PT, SE and SI against a checksum calculation. All other member states will fall back to a basic syntax check:
 
-    Valvat.new("DE345789003").valid_checksum?
-    => true or false
+```ruby
+Valvat.new("DE345789003").valid_checksum?
+# => true or false
+```
 
-These results are more valuable than a simple syntax check, but keep in mind: they can not replace a lookup via VIES.
+These results are more valuable than a simple syntax check, but keep in mind: they can not replace a lookup via VIES or HMRC.
 
 *IMPORTANT* This feature was tested against all vat numbers I could get my hand on, but it is still marked as *experimental* because these calculations are not documented and may return wrong results.
 
 To bypass initializing a Valvat instance:
 
-    Valvat::Checksum.validate("DE345789003")
-    => true or false
+```ruby
+Valvat::Checksum.validate("DE345789003")
+# => true or false
+```
 
 ## Usage with ActiveModel / Rails
 
@@ -153,7 +189,9 @@ To bypass initializing a Valvat instance:
 
 When the valvat gem is required and ActiveModel is already loaded, everything will work fine out of the box. If your load order differs just add
 
-    require 'active_model/validations/valvat_validator'
+```ruby
+require 'active_model/validations/valvat_validator'
+```
 
 after ActiveModel has been loaded.
 
@@ -161,35 +199,53 @@ after ActiveModel has been loaded.
 
 To validate the attribute `vat_number` add this to your model:
 
-    class MyModel < ActiveRecord::Base
-      validates :vat_number, valvat: true
-    end
+```ruby
+class MyModel < ActiveRecord::Base
+  validates :vat_number, valvat: true
+end
+```
 
 ### Additional lookup validation
 
-To additionally perform a lookup via VIES:
+To additionally perform an lookup via VIES:
+
+```ruby
+validates :vat_number, valvat: { lookup: true }
+```
+
+To also perform an lookup via HMRC for UK VAT numbers:
 
-    validates :vat_number, valvat: {lookup: true}
+```ruby
+validates :vat_number, valvat: { lookup: { uk: true } }
+```
 
-By default this will validate to true if the VIES web service is down. To fail in this case simply add the `:fail_if_down` option:
+By default this will validate to true if the web service is down. To fail in this case simply add the `:fail_if_down` option:
 
-    validates :vat_number, valvat: {lookup: {fail_if_down: true}}
+```ruby
+validates :vat_number, valvat: { lookup: { fail_if_down: true } }
+```
 
 You can pass in any options accepted by `Valvat::Lookup#validate`:
 
-    validates :vat_number, valvat: {lookup: {raise_error: true, savon: {log: true}}}
+```ruby
+validates :vat_number, valvat: { lookup: { raise_error: true, http: { read_timeout: 12 } } }
+```
 
 ### Additional (and experimental) checksum validation
 
 To additionally perform a checksum validation:
 
-    validates :vat_number, valvat: {checksum: true}
+```ruby
+validates :vat_number, valvat: { checksum: true }
+```
 
 ### Additional ISO country code validation
 
 If you want the vat number’s (ISO) country to match another country attribute, use the _match_country_ option:
 
-    validates :vat_number, valvat: {match_country: :country}
+```ruby
+validates :vat_number, valvat: { match_country: :country }
+```
 
 where it is supposed that your model has a method named _country_ which returns the country ISO code you want to match.
 
@@ -197,48 +253,62 @@ where it is supposed that your model has a method named _country_ which returns
 
 By default blank vat numbers validate to false. To change this add the `:allow_blank` option:
 
-    validates :vat_number, valvat: {allow_blank: true}
+```ruby
+validates :vat_number, valvat: { allow_blank: true }
+```
 
 ### Allow vat numbers outside of europe
 
 To allow vat numbers from outside of europe, add something like this to your model (country_code should return a upcase ISO country code):
 
-    class MyModel < ActiveRecord::Base
-      validates :vat_number, valvat: true, if: :eu?
+```ruby
+class MyModel < ActiveRecord::Base
+  validates :vat_number, valvat: true, if: :eu?
 
-      def eu?
-        Valvat::Utils::EU_MEMBER_STATES.include?(country_code)
-      end
-    end
+  def eu?
+    Valvat::Utils::EU_MEMBER_STATES.include?(country_code)
+  end
+end
+```
 
 ## Utilities
 
 To split a vat number into the country code and the remaining chars:
 
-    Valvat::Utils.split("ATU345789003")
-    => ["AT", "U345789003"]
+```ruby
+Valvat::Utils.split("ATU345789003")
+# => ["AT", "U345789003"]
+```
 
 or
 
-    Valvat.new("ATU345789003").to_a
-    => ["AT", "U345789003"]
+```ruby
+Valvat.new("ATU345789003").to_a
+# => ["AT", "U345789003"]
+```
 
 Both methods always return an array. If it can not detect the country or the given country is located outside of europe it returns `[nil, nil]`. Please note that this does not strictly return the ISO country code: for greek vat numbers this returns the ISO language code 'EL' instead of the ISO country code 'GR'.
 
 To extract the ISO country code of a given vat number:
 
-    Valvat.new("EL7345789003").iso_country_code
-    => "GR"
+```ruby
+Valvat.new("EL7345789003").iso_country_code
+# => "GR"
+```
 
 To extract the vat country code (first two chars in every european vat number):
 
-    Valvat.new("EL7345789003").vat_country_code
-    => "EL"
+```ruby
+Valvat.new("EL7345789003").vat_country_code
+# => "EL"
+```
 
 To normalize a vat number:
 
-    Valvat::Utils.normalize("atu345789003")
-    => "ATU345789003"
+```ruby
+Valvat::Utils.normalize("atu345789003")
+# => "ATU345789003"
+```
 
 This basically just removes trailing spaces and ensures all chars are uppercase.
 
@@ -249,6 +319,7 @@ There seems to be a problem when using the VIES service over IPv6. Sadly this is
 ## Links
 
 * [VIES web service](http://ec.europa.eu/taxation_customs/vies)
+* [HMRC web service](https://developer.service.hmrc.gov.uk/api-documentation/docs/api/service/vat-registered-companies-api/1.0)
 * [European vat number formats (german)](http://bzst.de/DE/Steuern_International/USt_Identifikationsnummer/Merkblaetter/Aufbau_USt_IdNr.html)
 * [European vat number formats on Wikipedia](http://en.wikipedia.org/wiki/European_Union_Value_Added_Tax)
 
@@ -258,7 +329,7 @@ https://github.com/yolk/valvat/graphs/contributors
 
 ## BlaBla
 
-Copyright (c) 2011-2022 Yolk Sebastian Munz & Julia Soergel GbR
+Copyright (c) 2011-2022 mite GmbH
 
 Beyond that, the implementation is licensed under the MIT License.
 

data/gemfiles/activemodel-6

@@ -3,5 +3,8 @@ source "https://rubygems.org"
 gem "activemodel", "~> 6.0"
 
 gem 'rack'
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
 
 gemspec path: "../"

data/gemfiles/activemodel-7

@@ -3,5 +3,8 @@ source "https://rubygems.org"
 gem "activemodel", "~> 7.0"
 
 gem 'rack'
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
 
 gemspec path: "../"

data/gemfiles/standalone

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
 
 gem 'rack', '< 2'
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
 
 gemspec path: "../"

data/lib/active_model/validations/valvat_validator.rb

@@ -74,7 +74,7 @@ module ActiveModel
                           message: options[:message],
                           country_adjective: I18n.translate(
                             :"valvat.country_adjectives.#{iso_country_code.downcase}",
-                            default: [:"valvat.country_adjectives.eu", 'european']
+                            default: [:'valvat.country_adjectives.eu', 'european']
                           ))
       end
 

data/lib/valvat/checksum/es.rb

@@ -4,32 +4,53 @@ 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].freeze
-      NATURAL_PERSON_EXP         = /\A(\d{8}[ABCDEFGHJKLMNPQRSTVWXYZ]|[KLMXYZ]\d{7}[ABCDEFGHJKLMNPQRSTVWXYZ])\Z/.freeze
+      NATURAL_PERSON_EXP         = /\A[KLMXYZ\d]/.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
+      GIVEN_CD_IS_A_LETTER_EXP = /[A-Z]\Z/.freeze
+      LEGAL_PERSON_EXP = /\A[ABCDEFGHJUVNPQRSW]/.freeze
+      CIF_MUST_BE_A_LETTER_EXP = /\A[NPQRSW]/.freeze
+      CIF_MUST_BE_A_NUMBER_EXP = /\A[HJUV]/.freeze
+      SPECIAL_NIF_EXP = /\A[KLM]/.freeze
 
-      def check_digit
-        natural_person? ? check_digit_natural_person : check_digit_legal_person
+      def validate
+        passes_special_validations? && possible_check_digits.include?(given_check_digit)
       end
 
-      def check_digit_natural_person
+      private
+
+      def passes_special_validations?
+        !(
+          # [KLM]: CD first two numerical digits must be between 01 and 56 (both inclusive)
+          (vat.to_s_wo_country =~ SPECIAL_NIF_EXP &&
+          vat.to_s_wo_country[1..2].to_i > 56) or vat.to_s_wo_country[1..2].to_i < 0o1 ||
+          # Exceptions: X0000000T, 00000001R, 00000000T, 99999999R are invalid.
+          %w[X0000000T 00000001R 00000000T 99999999R].include?(vat.to_s_wo_country)
+        )
+      end
+
+      def given_check_digit
+        given_cd_is_a_letter? ? str_wo_country[-1] : super
+      end
+
+      def possible_check_digits
+        natural_person? ? possible_cd_natural_person : possible_cds_legal_person
+      end
+
+      def possible_cd_natural_person
         letter = vat.to_s_wo_country[0]
         nie_digit = NIE_DIGIT_BY_LETTER.index(letter)
-        NATURAL_PERSON_CHARS["#{nie_digit}#{figures_str}".to_i.modulo(23)]
+        [NATURAL_PERSON_CHARS["#{nie_digit}#{figures_str}".to_i.modulo(23)]]
       end
 
-      def check_digit_legal_person
+      def possible_cds_legal_person
         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)
+        possible_check_digits = []
+        possible_check_digits << LEGAL_PERSON_CHARS[chk] if cd_can_be_a_letter?
+        if cd_can_be_a_num?
+          possible_check_digits << (chk == 10 ? 0 : chk)
         end
-      end
-
-      def given_check_digit
-        person? ? str_wo_country[-1] : super
+        possible_check_digits
       end
 
       def str_wo_country
@@ -46,7 +67,19 @@ class Valvat
       end
 
       def legal_foreign_person?
-        !!(vat.to_s_wo_country =~ LEGAL_PERSON_EXP)
+        !!(vat.to_s_wo_country =~ FOREIGN_LEGAL_PERSON_EXP)
+      end
+
+      def cd_can_be_a_letter?
+        vat.to_s_wo_country !~ CIF_MUST_BE_A_NUMBER_EXP
+      end
+
+      def cd_can_be_a_num?
+        vat.to_s_wo_country !~ CIF_MUST_BE_A_LETTER_EXP
+      end
+
+      def given_cd_is_a_letter?
+        !!(vat.to_s_wo_country =~ GIVEN_CD_IS_A_LETTER_EXP)
       end
     end
   end

data/lib/valvat/checksum/fr.rb

@@ -5,7 +5,7 @@ class Valvat
     class FR < Base
       def check_digit
         siren = str_wo_country[2..-1].to_i
-        (12 + (3 * siren) % 97) % 97
+        (12 + ((3 * siren) % 97)) % 97
       end
 
       def given_check_digit

data/lib/valvat/checksum/hr.rb

@@ -13,7 +13,7 @@ class Valvat
           product = (2 * sum) % 11
         end
 
-        (10 - (product - 1) % 10) % 10
+        (10 - ((product - 1) % 10)) % 10
       end
     end
   end

data/lib/valvat/checksum/hu.rb

@@ -10,7 +10,7 @@ class Valvat
           digit * multipliers[index]
         end
 
-        (10 - sum % 10) % 10
+        (10 - (sum % 10)) % 10
       end
     end
   end