valvat 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92de431f5777b0b5115169e30bac0233ce3d9047c1bc74b9d42fe02acb2b460d
-  data.tar.gz: 0146a80725a3dce432002a456b8e9f10e3a65ee5d36b27dac5c6d646dc48fa70
+  metadata.gz: 51672c127e1f949767059172b89bcadfc148888809889c8cd0b425031c002132
+  data.tar.gz: '04189c3b112baeff2001a6f5b6bdccb0de3052e66d05636e597fb6bde175e94c'
 SHA512:
-  metadata.gz: b6d08a4d98163bd195d861c83a837042e93bfebe13606c0fce10a703bf702296eb406f75d39349e46e7078289b74d2779f511b3d3a77a49e4d4fb5e585fb01cc
-  data.tar.gz: c2190c0f729188281e4894fb1d7e2b4b771171215da07329b0fc92fcda8806f5ac8fe3d7d1eb2d2c1f1e941a06b3d3c22a975369d5617589702a86d727166d4b
+  metadata.gz: f330e05a5c50652036ed2b445884e202c72708d10210fd09528b3f54d54afe5de3acf59d84af4bea66aba76d0f98ee4d7464ce9c0399c80644257368b4880472
+  data.tar.gz: b730f20e4c950324d99111cb73add8dc833d56587554bc62fd39e6576bd6a41a914c4e68e1666a6ed1ed7bdc2b36881fc6e69b48ca30d02a76bd9e01a6e8b446

data/.github/workflows/ruby.yml

@@ -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

@@ -12,4 +12,7 @@ Style/Documentation:
     Enabled: false
 
 RSpec/MultipleExpectations:
+    Enabled: false
+
+Style/StringChars:
     Enabled: false

data/CHANGES.md

@@ -1,7 +1,22 @@
 
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v1.1.3...master)
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.5...master)
+
+### 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
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.1.3...v1.1.4)
+
+* Support BE 1-series format (by [Cashaca](https://github.com/Cashaca))
+* Removed duplication on french error messages (by [Sunny Ripert](https://github.com/sunny))
 
 ### 1.1.3 / 2022-01-26
 

data/README.md

@@ -20,17 +20,21 @@ Northern Ireland received its own VAT number prefix - XI which is supported by V
 * 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'
+```ruby
+gem 'valvat', require: 'valvat/local'
+```
 
 In any case run:
 
@@ -44,25 +48,33 @@ 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 agains the VIES web service
+## Validate against the VIES web service
 
 To check if the given vat number exists via the VIES web service:
 
-    Valvat.new("DE345789003").exists?
-    => true or false or nil
+```ruby
+Valvat.new("DE345789003").exists?
+# => true or false or nil
+```
 
 Or to lookup a vat number string directly via VIES web service:
 
-    Valvat::Lookup.validate("DE345789003")
-    => true or false or nil
+```ruby
+Valvat::Lookup.validate("DE345789003")
+# => true or false or nil
+```
 
 *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.
 
@@ -70,24 +82,28 @@ Or to lookup a vat number string directly via VIES web service:
 
 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`.
 
 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.
 
@@ -95,7 +111,9 @@ If the given `requester` is invalid, a `Valvat::InvalidRequester` error is throw
 
 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`.
 
@@ -113,7 +131,9 @@ 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.
 
@@ -121,11 +141,15 @@ This will return `nil` instead of raising a known error.
 
 Use the `:savon` key to set options for the used savon SOAP client. For example to log all requests:
 
-    Valvat.new("IE6388047V").exists?(savon: {log: true})
+```ruby
+Valvat.new("IE6388047V").exists?(savon: { log: true })
+```
 
 Or to use higher timeouts for the requests:
 
-   Valvat.new("IE6388047V").exists?(savon: {open_timeout: 10, read_timeout: 10})
+```ruby
+Valvat.new("IE6388047V").exists?(savon: {open_timeout: 10, read_timeout: 10})
+```
 
 ### Skip local validation before lookup
 
@@ -135,8 +159,10 @@ To prevent unnecessary requests, valvat performs a local syntax check before mak
 
 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.
 
@@ -144,8 +170,10 @@ These results are more valuable than a simple syntax check, but keep in mind: th
 
 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 +181,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 +191,47 @@ 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:
 
-    validates :vat_number, valvat: {lookup: true}
+```ruby
+validates :vat_number, valvat: { lookup: 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:
 
-    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, savon: { log: true } } }
+```
 
 ### 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 +239,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.
 

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,7 +4,7 @@ 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

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

data/lib/valvat/locales/fr.yml

@@ -1,7 +1,7 @@
 fr:
   errors:
     messages:
-      invalid_vat: "Numéro de TVA %{country_adjective} invalide"
+      invalid_vat: "n’est pas un numéro de TVA %{country_adjective} valide"
       vies_down: "Impossible de valider votre numéro de TVA : le service de validation VIES est indisponible. Merci de réessayer ultérieurement."
   valvat:
     country_adjectives:

data/lib/valvat/lookup/fault.rb

@@ -5,20 +5,13 @@ class Valvat
     class Fault < Response
       def to_hash
         @to_hash ||= case @raw
-        when Savon::HTTPError
-          { error: HTTPError.new(nil, @raw) }
-        when Savon::UnknownOperationError
-          { error: OperationUnknown.new(nil, @raw) }
-        else
-          fault = @raw.to_hash[:fault][:faultstring]
-
-          if fault == 'INVALID_INPUT'
-            { valid: false }
-          else
-            error = (FAULTS[fault] || UnknownViesError).new(fault)
-            { error: error }
-          end
-        end
+                     when Savon::HTTPError
+                       { error: HTTPError.new(nil, @raw) }
+                     when Savon::UnknownOperationError
+                       { error: OperationUnknown.new(nil, @raw) }
+                     else
+                       soap_fault
+                     end
       end
 
       FAULTS = {
@@ -33,6 +26,19 @@ class Valvat
         'MS_MAX_CONCURRENT_REQ' => RateLimitError,
         'MS_MAX_CONCURRENT_REQ_TIME' => RateLimitError
       }.freeze
+
+      private
+
+      def soap_fault
+        fault = @raw.to_hash[:fault][:faultstring]
+
+        if fault == 'INVALID_INPUT'
+          { valid: false }
+        else
+          error = (FAULTS[fault] || UnknownViesError).new(fault)
+          { error: error }
+        end
+      end
     end
   end
 end

data/lib/valvat/lookup/response.rb

@@ -19,7 +19,7 @@ class Valvat
         (
           hash[:check_vat_approx_response] || hash[:check_vat_response] || {}
         ).each_with_object({}) do |(key, value), result|
-          result[cleanup_key(key)] = cleanup_value(value) unless key == :"@xmlns"
+          result[cleanup_key(key)] = cleanup_value(value) unless key == :@xmlns
         end
       end
 

data/lib/valvat/syntax.rb

@@ -4,7 +4,7 @@ class Valvat
   module Syntax
     VAT_PATTERNS = {
       'AT' => /\AATU[0-9]{8}\Z/,                                          # Austria
-      'BE' => /\ABE0[0-9]{9}\Z/,                                          # Belgium
+      'BE' => /\ABE[0-1][0-9]{9}\Z/,                                      # Belgium
       'BG' => /\ABG[0-9]{9,10}\Z/,                                        # Bulgaria
       'CY' => /\ACY(?!12)[0-59][0-9]{7}[A-Z]\Z/,                          # Cyprus
       'CZ' => /\ACZ[0-9]{8,10}\Z/,                                        # Czech Republic

data/lib/valvat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Valvat
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 end

data/spec/valvat/checksum/es_spec.rb

@@ -15,4 +15,11 @@ describe Valvat::Checksum::ES do
       expect(Valvat::Checksum.validate(invalid_vat)).to be(false)
     end
   end
+
+  describe 'if starts with [KLMXYZ\\d], is always a natural person' do
+    invalid_vat = 'ESX65474207'
+    it "returns false on invalid VAT #{invalid_vat}" do
+      expect(Valvat::Checksum.validate(invalid_vat)).to be(false)
+    end
+  end
 end

data/spec/valvat/lookup/request_spec.rb

@@ -19,12 +19,12 @@ describe Valvat::Lookup::Request do
 
   context 'when Savon::UnknownOperationError is (wrongly) thrown' do
     before do
-      dbl = double(Savon::Client)
+      dbl = instance_double(Savon::Client)
       allow(Savon::Client).to receive(:new).and_return(dbl)
       allow(dbl).to receive(:call).and_raise(Savon::UnknownOperationError.new('from stub'))
     end
 
-    it "does handle it like vies down" do
+    it 'does handle it like vies down' do
       response = described_class.new('IE6388047V', {}).perform
       expect(response.to_hash[:error]).to be_a(Valvat::OperationUnknown)
     end

data/spec/valvat/lookup_spec.rb

@@ -36,6 +36,7 @@ describe Valvat::Lookup do
     context 'with details' do
       let(:details) do
         {
+          '@xmlns:ns2': 'urn:ec.europa.eu:taxud:vies:services:checkVat:types',
           country_code: 'IE',
           vat_number: '6388047V',
           name: 'GOOGLE IRELAND LIMITED',
@@ -64,6 +65,7 @@ describe Valvat::Lookup do
       let(:response) { described_class.validate('IE6388047V', requester: 'IE6388047V') }
       let(:details) do
         {
+          '@xmlns:ns2': 'urn:ec.europa.eu:taxud:vies:services:checkVat:types',
           country_code: 'IE',
           vat_number: '6388047V',
           name: 'GOOGLE IRELAND LIMITED',
@@ -132,7 +134,7 @@ describe Valvat::Lookup do
       subject(:result) { described_class.validate('DE300', options) }
 
       it 'returns nil' do
-        expect(result).to be(nil)
+        expect(result).to be_nil
       end
 
       it 'raises error with raise_error: true' do
@@ -146,7 +148,7 @@ describe Valvat::Lookup do
       subject(:result) { described_class.validate('DE301', options) }
 
       it 'returns nil' do
-        expect(result).to be(nil)
+        expect(result).to be_nil
       end
 
       it 'raises error with raise_error: true' do
@@ -164,7 +166,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE302', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE302', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -176,7 +178,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE400', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE400', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -188,7 +190,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE401', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE401', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -200,7 +202,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE500', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE500', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -212,7 +214,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE501', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE501', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -224,7 +226,7 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE600', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE600', options.merge(raise_error: false))).to be_nil
       end
     end
 
@@ -236,41 +238,43 @@ describe Valvat::Lookup do
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be_nil
       end
     end
 
     describe 'Error : Savon::UnknownOperationError' do
+      subject(:result) { described_class.validate('DE601', options) }
+
       before do
-        dbl = double(Savon::Client)
+        dbl = instance_double(Savon::Client)
         allow(Savon::Client).to receive(:new).and_return(dbl)
         allow(dbl).to receive(:call).and_raise(Savon::UnknownOperationError.new('from stub'))
       end
-      subject(:result) { described_class.validate('DE601', options) }
 
       it 'raises error' do
         expect { result }.to raise_error(Valvat::OperationUnknown, /#<Savon::UnknownOperationError: from stub>/)
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be_nil
       end
     end
 
     describe 'Error : Savon::HTTPError' do
+      subject(:result) { described_class.validate('DE601', options) }
+
       before do
-        dbl = double(Savon::Client)
+        dbl = instance_double(Savon::Client)
         allow(Savon::Client).to receive(:new).and_return(dbl)
         allow(dbl).to receive(:call).and_raise(Savon::HTTPError.new(Struct.new(:code, :body).new(403, 'from stub')))
       end
-      subject(:result) { described_class.validate('DE601', options) }
 
       it 'raises error' do
         expect { result }.to raise_error(Valvat::HTTPError, /#<Savon::HTTPError: HTTP error \(403\): from stub>/)
       end
 
       it 'returns nil with raise_error set to false' do
-        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be(nil)
+        expect(described_class.validate('DE601', options.merge(raise_error: false))).to be_nil
       end
     end
   end

data/spec/valvat/syntax_spec.rb

@@ -19,7 +19,7 @@ end
 describe Valvat::Syntax do
   describe '#validate' do
     it_validates(%w[ATU03458890], %w[ATU034588908 ATU0345908 ATU0345889Y])
-    it_validates(%w[BE0817331995], %w[BE081733199 BE08173319944 BE081733199H BE1817331999])
+    it_validates(%w[BE0817331995 BE1817331999], %w[BE081733199 BE08173319944 BE081733199H BE2817331999])
     it_validates(%w[BG468134789 BG4681347897], %w[BG46813478979 BG4681347897C BG46813478G BG46813478])
     it_validates(%w[CY36579347A CY36579347C], %w[CY36579347 CY365793478 CY365793478A CY365793G])
     it_validates(%w[CZ56389267 CZ563892670 CZ5638926790], %w[CZ5638926 CZ56389268901])

data/spec/valvat/utils_spec.rb

@@ -56,7 +56,7 @@ describe Valvat::Utils do
     it 'removes special chars' do
       expect(described_class.normalize('DE.345-889_00:3,;')).to eql('DE345889003')
       expect(described_class.normalize("→ DE·Ö34588 9003\0 ☺")).to eql(
-        RUBY_ENGINE == 'truffleruby' ? 'DEÖ345889003' : '→DEÖ345889003☺'
+        '→DEÖ345889003☺'
       )
     end
   end

data/spec/valvat_spec.rb

@@ -171,15 +171,15 @@ describe Valvat do
 
     describe '#iso_country_code' do
       it 'returns nil' do
-        expect(us_vat.iso_country_code).to be(nil)
-        expect(ch_vat.iso_country_code).to be(nil)
+        expect(us_vat.iso_country_code).to be_nil
+        expect(ch_vat.iso_country_code).to be_nil
       end
     end
 
     describe '#vat_country_code' do
       it 'returns nil' do
-        expect(us_vat.vat_country_code).to be(nil)
-        expect(ch_vat.vat_country_code).to be(nil)
+        expect(us_vat.vat_country_code).to be_nil
+        expect(ch_vat.vat_country_code).to be_nil
       end
     end
 
@@ -231,19 +231,19 @@ describe Valvat do
 
     describe '#iso_country_code' do
       it 'returns nil' do
-        expect(only_iso_vat.iso_country_code).to be(nil)
-        expect(num_vat.iso_country_code).to be(nil)
-        expect(empty_vat.iso_country_code).to be(nil)
-        expect(nil_vat.iso_country_code).to be(nil)
+        expect(only_iso_vat.iso_country_code).to be_nil
+        expect(num_vat.iso_country_code).to be_nil
+        expect(empty_vat.iso_country_code).to be_nil
+        expect(nil_vat.iso_country_code).to be_nil
       end
     end
 
     describe '#vat_country_code' do
       it 'returns nil' do
-        expect(only_iso_vat.vat_country_code).to be(nil)
-        expect(num_vat.vat_country_code).to be(nil)
-        expect(empty_vat.vat_country_code).to be(nil)
-        expect(nil_vat.vat_country_code).to be(nil)
+        expect(only_iso_vat.vat_country_code).to be_nil
+        expect(num_vat.vat_country_code).to be_nil
+        expect(empty_vat.vat_country_code).to be_nil
+        expect(nil_vat.vat_country_code).to be_nil
       end
     end
 

data/valvat.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'activemodel', '>= 5.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.0'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valvat
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Sebastian Munz
@@ -35,7 +35,7 @@ cert_chain:
   BUdT7mtr41GgvWnIjaGWAldSuabxx5H+PKS5FzjNDMHThRZWuvYp/nP2RXDh4gIa
   7hV09P+XxvS96G+petG5KmC/lev8VqKu
   -----END CERTIFICATE-----
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -211,7 +211,8 @@ files:
 homepage: https://github.com/yolk/valvat
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: