valvat 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f03e6103f577ebcec25d3cbd5c4e2e13c914945c13a1767912f9f49380c9a6ae
-  data.tar.gz: db8423cf0d17a8c3a7a840d7d22ff887b6296442da31fc11931aa24aafd6c630
+  metadata.gz: bba8a39a51d9f779d9fbd875e7d7f18b21b0673d225f41af40f3cfd91da3b2c5
+  data.tar.gz: 79a970d53e4650d6031872bbd6bf6025635e53e8a408915192edf565986d515a
 SHA512:
-  metadata.gz: c9c92f073fc78fae74582d093bdf76f2747dab68aa44eb7f1106bb82bdc8f63b47a5236e8e1d766bc49a3e68b74f3723c45be6ff9e91f96548cfc526cad33ef1
-  data.tar.gz: 3127010ce2d38d7a75ebcb0688850414d8149cb9db5fe8f6f575c2d1bf0ff2bae0b68a39878df8f851654b5d6cea766b2d63c91639aca5d7696776ed01ed3042
+  metadata.gz: 9f6a27220bf6c54ce815f88843ada9765f7370fda92ce3960d9deae5ecefb9b0e31ebbefceee3c46616b83b5c7d72ec450496d78c29e961caf4b47b85f0d45f6
+  data.tar.gz: 3b4fc004f50bee6fcaadd4373a4392e4d2f9bc2605ef189c600e31d7cba42ff01005dc818818c345b03ebe4525c21109d19823fc44054fd75e854f5fb8d1edd0

data/.github/workflows/rubocop.yml

@@ -0,0 +1,17 @@
+name: RuboCop
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 3.2
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.2
+        bundler-cache: true
+    - name: Run RuboCop
+      run: bundle exec rubocop --parallel

data/.github/workflows/{ruby.yml → specs.yml}

@@ -20,6 +20,8 @@ jobs:
         ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', 'jruby-9.4.0.0']
         gemfile: [ 'standalone', 'activemodel-5', 'activemodel-6', 'activemodel-7' ]
         exclude:
+          - ruby-version: '3.3'
+            gemfile: 'activemodel-5'
           - ruby-version: '3.2'
             gemfile: 'activemodel-5'
           - ruby-version: '3.1'
@@ -34,7 +36,7 @@ jobs:
             gemfile: 'activemodel-5'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 AllCops:
     NewCops: enable
-    TargetRubyVersion: 2.5
+    TargetRubyVersion: 2.6
 
 Metrics/BlockLength:
   Exclude:

data/CHANGES.md

@@ -1,7 +1,21 @@
 
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v1.3.0...master)
+[full changelog](http://github.com/yolk/valvat/compare/v1.4.1...master)
+
+### 1.4.1 / 2024-01-08
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.4.0...v1.4.1)
+
+* Fixed incorrect variable usage in SOAP request body by [Jay Tabudlo](https://github.com/jaymoneybird))
+
+### 1.4.0 / 2023-07-20
+
+[full changelog](http://github.com/yolk/valvat/compare/v1.3.0...v1.4.0)
+
+* Valvat.configure: Allow global configuration
+* Update the Cyprus syntax regular expression by [Orien Madgwick](https://github.com/orien))
+* Valvat::Checksum::ES: Fixed issue with VAT ids starting with '*00' #124 / #115 (by [Thomas Scalise](https://github.com/KirtashW17))
 
 ### 1.3.0 / 2023-04-19
 

data/Gemfile

@@ -5,4 +5,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in valvat.gemspec
 gemspec
 
+gem 'activemodel', '>= 5.0'
 gem 'guard-rspec', '~>4.0'
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'rubocop', '~> 1.50'
+gem 'rubocop-rspec', '~> 2.19'
+gem 'webmock', '~> 3.0'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022 mite GmbH
+Copyright (c) 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

@@ -183,6 +183,20 @@ Valvat::Checksum.validate("DE345789003")
 # => true or false
 ```
 
+## Configuration
+
+Instead of passing in the same options again and again, Valvat allows to alter its default configuration. This feature is intended to be used when initializing your application (for example in a Rails initializer file).
+
+```ruby
+Valvat.configure(
+  uk: true,
+  raise_error: true,
+  http: { read_timeout: 5 }
+)
+```
+
+To see all options and the defaults, take a look at [valvat/configuration](https://github.com/yolk/valvat/blob/master/lib/valvat/configuration.rb#L25).
+
 ## Usage with ActiveModel / Rails
 
 ### Loading
@@ -329,8 +343,8 @@ https://github.com/yolk/valvat/graphs/contributors
 
 ## BlaBla
 
-Copyright (c) 2011-2022 mite GmbH
+Copyright (c) 2011-2023 mite GmbH
 
 Beyond that, the implementation is licensed under the MIT License.
 
-Code was originally extracted from our time tracking webapp [mite](https://mite.yo.lk/en/).
+Code was originally extracted from our time tracking webapp [mite](https://mite.de/en/).

data/gemfiles/activemodel-5

@@ -1,5 +1,8 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activemodel", "~> 5.0"
+gem 'activemodel', '~> 5.0'
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'webmock', '~> 3.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/activemodel-6

@@ -1,5 +1,8 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activemodel", "~> 6.0"
+gem 'activemodel', '~> 6.0'
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'webmock', '~> 3.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/activemodel-7

@@ -1,5 +1,8 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activemodel", "~> 7.0"
+gem 'activemodel', '~> 7.0'
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'webmock', '~> 3.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/standalone

@@ -1,3 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gemspec path: "../"
+gem 'rake'
+gem 'rspec', '~> 3.0'
+gem 'webmock', '~> 3.0'
+
+gemspec path: '../'

data/lib/valvat/checksum/at.rb

@@ -9,7 +9,7 @@ class Valvat
       end
 
       def str_wo_country
-        super[1..-1]
+        super[1..]
       end
     end
   end

data/lib/valvat/checksum/es.rb

@@ -23,9 +23,9 @@ class Valvat
         !(
           # [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)
+            (vat.to_s_wo_country[1..2].to_i > 56 || vat.to_s_wo_country[1..2].to_i < 1)) ||
+            # Exceptions: X0000000T, 00000001R, 00000000T & 99999999R are invalid.
+            %w[X0000000T 00000001R 00000000T 99999999R].include?(vat.to_s_wo_country)
         )
       end
 
@@ -55,7 +55,7 @@ class Valvat
 
       def str_wo_country
         str = super
-        str[0] =~ /\d/ ? str : str[1..-1]
+        str[0] =~ /\d/ ? str : str[1..]
       end
 
       def person?

data/lib/valvat/checksum/fr.rb

@@ -5,26 +5,33 @@ class Valvat
     class FR < Base
       # the valid characters for the first two digits (O and I are missing)
       ALPHABET = '0123456789ABCDEFGHJKLMNPQRSTUVWXYZ'
+      NUMERIC = /^\d+$/.freeze
 
       def validate
-        return super if str_wo_country[0..1] =~ /^\d+$/
+        return super if str_wo_country[0..1] =~ NUMERIC
 
-        numeric_start = str_wo_country[0] =~ /\d/
+        check = alt_check_digit
 
-        check = (ALPHABET.index(str_wo_country[0]) * (numeric_start ? 24 : 34)) +
-                ALPHABET.index(str_wo_country[1]) - (numeric_start ? 10 : 100)
-
-        (str_wo_country[2..-1].to_i + 1 + (check / 11)) % 11 == check % 11
+        (str_wo_country[2..].to_i + 1 + (check / 11)) % 11 == check % 11
       end
 
+      private
+
       def check_digit
-        siren = str_wo_country[2..-1].to_i
+        siren = str_wo_country[2..].to_i
         (12 + ((3 * siren) % 97)) % 97
       end
 
       def given_check_digit
         str_wo_country[0..1].to_i
       end
+
+      def alt_check_digit
+        first_is_numeric = str_wo_country[0] =~ NUMERIC
+
+        (ALPHABET.index(str_wo_country[0]) * (first_is_numeric ? 24 : 34)) +
+          ALPHABET.index(str_wo_country[1]) - (first_is_numeric ? 10 : 100)
+      end
     end
   end
 end

data/lib/valvat/checksum/se.rb

@@ -6,7 +6,7 @@ class Valvat
       check_digit_length 0
 
       def validate
-        vat.to_s_wo_country[-2..-1].to_i.positive? &&
+        vat.to_s_wo_country[-2..].to_i.positive? &&
           super
       end
 

data/lib/valvat/checksum.rb

@@ -21,7 +21,7 @@ class Valvat
       private
 
       def given_check_digit_str
-        str_wo_country[-self.class.check_digit_length..-1]
+        str_wo_country[-self.class.check_digit_length..]
       end
 
       def given_check_digit

data/lib/valvat/configuration.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+class Valvat
+  ##
+  # Configuration options should be set by passing a hash:
+  #
+  #   Valvat.configure(
+  #     uk: true
+  #   )
+  #
+  def self.configure(options)
+    Configuration.instance.configure(options) unless options.nil?
+  end
+
+  # Read-only access to config
+  def self.config
+    Configuration.instance
+  end
+
+  class Configuration
+    include Singleton
+
+    DEFAULTS = {
+      # Set to true to always raise error, even on temporary maintenance downtime errors,
+      # set to false to suppress all errors and return nil instead
+      raise_error: nil,
+
+      # Set options for the http client.
+      # These options are directly passed to `Net::HTTP.start`
+      http: {}.freeze,
+
+      # Return details hash on lookup instead of boolean
+      detail: false,
+
+      # Your own VAT number used on lookup
+      requester: nil,
+
+      # Skip local validation on lookup
+      skip_local_validation: false,
+
+      # Use lookup via HMRC for VAT numbers from the UK
+      # if set to false lookup will always return false for UK VAT numbers
+      uk: false
+    }.freeze
+
+    def self.initialize
+      instance.send(:initialize)
+    end
+
+    def [](key)
+      @data[key]
+    end
+
+    def configure(options)
+      @data = @data.merge(Utils.deep_symbolize_keys(options))
+    end
+
+    def initialize
+      @data = DEFAULTS.clone
+    end
+  end
+end

data/lib/valvat/lookup/base.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require 'net/http'
+require_relative '../options'
 
 class Valvat
   class Lookup
     class Base
       def initialize(vat, options = {})
         @vat = Valvat(vat)
-        @options = options
+        @options = Valvat::Options(options)
         @requester = @options[:requester] && Valvat(@options[:requester])
       end
 
@@ -59,14 +60,7 @@ class Valvat
       end
 
       def options_for(uri)
-        options = if @options.key?(:savon)
-                    puts 'DEPRECATED: The option :savon is deprecated. Use :http instead.'
-                    @options[:savon]
-                  else
-                    @options[:http]
-                  end || {}
-
-        options.merge({ use_ssl: URI::HTTPS === uri })
+        @options[:http].merge({ use_ssl: URI::HTTPS === uri })
       end
     end
   end

data/lib/valvat/lookup/hmrc.rb

@@ -15,7 +15,7 @@ class Valvat
       }.freeze
 
       def perform
-        return { valid: false } unless @options[:uk] == true
+        return { valid: false } unless @options[:uk]
 
         parse(fetch(endpoint_uri).body)
       end

data/lib/valvat/lookup/vies.rb

@@ -26,8 +26,8 @@ class Valvat
                 <urn:countryCode><%= @vat.vat_country_code %></urn:countryCode>
                 <urn:vatNumber><%= @vat.to_s_wo_country %></urn:vatNumber>
                 <% if @requester %>
-                <urn:requesterCountryCode><%= @vat.vat_country_code %></urn:requesterCountryCode>
-                <urn:requesterVatNumber><%= @vat.to_s_wo_country %></urn:requesterVatNumber>
+                <urn:requesterCountryCode><%= @requester.vat_country_code %></urn:requesterCountryCode>
+                <urn:requesterVatNumber><%= @requester.to_s_wo_country %></urn:requesterVatNumber>
                 <% end %>
             </urn:checkVat<%= 'Approx' if @requester %>>
           </soapenv:Body>

data/lib/valvat/lookup.rb

@@ -2,13 +2,13 @@
 
 require_relative 'lookup/vies'
 require_relative 'lookup/hmrc'
+require_relative 'options'
 
 class Valvat
   class Lookup
     def initialize(vat, options = {})
       @vat = Valvat(vat)
-      @options = options || {}
-      @options[:requester] ||= @options[:requester_vat]
+      @options = Valvat::Options(options)
     end
 
     def validate
@@ -26,20 +26,14 @@ class Valvat
 
     private
 
-    def valid?
-      response[:valid]
-    end
-
     def response
       @response ||= webservice.new(@vat, @options).perform
     end
 
     def webservice
-      case @vat.vat_country_code
-      when 'GB' then HMRC
-      else
-        VIES
-      end
+      return HMRC if @vat.vat_country_code == 'GB'
+
+      VIES
     end
 
     def show_details?

data/lib/valvat/options.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative 'configuration'
+
+class Valvat
+  class Options
+    DEPRECATED_KEYS = {
+      requester_vat: :requester,
+      savon: :http
+    }.freeze
+
+    def initialize(options, silence: false)
+      @options = options || {}
+
+      DEPRECATED_KEYS.each do |deprecated, key|
+        if @options.key?(deprecated)
+          puts "DEPRECATED: The option :#{deprecated} is deprecated. Use :#{key} instead." unless silence
+          @options[key] ||= @options[deprecated]
+        end
+      end
+    end
+
+    def [](key)
+      @options.key?(key) ? @options[key] : Valvat.config[key]
+    end
+  end
+
+  def self.Options(options)
+    options.is_a?(Valvat::Options) ? options : Valvat::Options.new(options)
+  end
+end

data/lib/valvat/syntax.rb

@@ -6,7 +6,7 @@ class Valvat
       'AT' => /\AATU[0-9]{8}\Z/,                                          # Austria
       '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
+      'CY' => /\ACY(?!12)[0-69][0-9]{7}[A-Z]\Z/,                          # Cyprus
       'CZ' => /\ACZ[0-9]{8,10}\Z/,                                        # Czech Republic
       'DE' => /\ADE[0-9]{9}\Z/,                                           # Germany
       'DK' => /\ADK[0-9]{8}\Z/,                                           # Denmark

data/lib/valvat/utils.rb

@@ -33,5 +33,17 @@ class Valvat
     def self.country_is_supported?(iso_country)
       SUPPORTED_STATES.include?(iso_country)
     end
+
+    def self.deep_symbolize_keys(value)
+      value = value.transform_keys do |key|
+        key.to_sym
+      rescue StandardError
+        key
+      end
+
+      value.transform_values! do |val|
+        val.is_a?(Hash) ? deep_symbolize_keys(val) : val
+      end
+    end
   end
 end

data/lib/valvat/version.rb

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

data/lib/valvat.rb

@@ -2,6 +2,8 @@
 
 require 'valvat/error'
 require 'valvat/utils'
+require 'valvat/options'
+require 'valvat/configuration'
 require 'valvat/syntax'
 require 'valvat/checksum'
 require 'valvat/version'
@@ -55,7 +57,7 @@ class Valvat
   def ==(other)
     raw == other.raw
   end
-  alias_method :eql?, :==
+  alias eql? ==
 
   def inspect
     "#<Valvat #{[raw, iso_country_code].compact.join(' ')}>"

data/spec/valvat/checksum/es_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Valvat::Checksum::ES do
   %w[ESA13585625 ESB83871236 ESE54507058 ES25139013J ESQ1518001A ESQ5018001G ESX4942978W ESX7676464F ESB10317980
-     ESY3860557K ESY2207765D ES28350472M ES41961720Z ESM1171170X ESK0928769Y].each do |valid_vat|
+     ESY3860557K ESY2207765D ES28350472M ES41961720Z ESM1171170X ESK0928769Y ES50095545G].each do |valid_vat|
     it "returns true on valid VAT #{valid_vat}" do
       expect(Valvat::Checksum.validate(valid_vat)).to be(true)
     end

data/spec/valvat/lookup/hmrc_spec.rb

@@ -7,6 +7,10 @@ describe Valvat::Lookup::HMRC do
     stub_const('Valvat::Lookup::HMRC::ENDPOINT_URL', 'https://test-api.service.hmrc.gov.uk/organisations/vat/check-vat-number/lookup')
   end
 
+  after do
+    Valvat.configure(uk: false)
+  end
+
   it 'returns hash with valid: true on success' do
     response = described_class.new('GB553557881', { uk: true }).perform
 
@@ -29,4 +33,26 @@ describe Valvat::Lookup::HMRC do
     response = described_class.new('GB553557881', {}).perform
     expect(response).to match({ valid: false })
   end
+
+  it 'returns valid: false when uk option is set to false' do
+    response = described_class.new('GB553557881', { uk: false }).perform
+    expect(response).to match({ valid: false })
+  end
+
+  it 'returns valid: false when uk option is not set' do
+    response = described_class.new('GB553557881').perform
+    expect(response).to match({ valid: false })
+  end
+
+  it 'respects global :uk setting' do
+    Valvat.configure(uk: true)
+    response = described_class.new('GB553557881').perform
+    expect(response).to include({ valid: true })
+  end
+
+  it 'overwrite global :uk setting' do
+    Valvat.configure(uk: true)
+    response = described_class.new('GB553557881', uk: false).perform
+    expect(response).to include({ valid: false })
+  end
 end

data/spec/valvat/lookup/vies_spec.rb

@@ -6,6 +6,8 @@ describe Valvat::Lookup::VIES do
   it 'returns hash with valid: true on success' do
     response = described_class.new('IE6388047V', {}).perform
 
+    skip 'VIES is down' if response[:error].is_a?(Valvat::MemberStateUnavailable)
+
     expect(response).to match({
                                 valid: true,
                                 address: '3RD FLOOR, GORDON HOUSE, BARROW STREET, DUBLIN 4',

data/spec/valvat/lookup_spec.rb

@@ -88,7 +88,7 @@ describe Valvat::Lookup do
 
     context 'with request identifier' do
       it 'returns hash of details instead of true' do
-        result = described_class.validate('IE6388047V', requester: 'IE6388047V')
+        result = described_class.validate('IE6388047V', requester: 'DE129415943')
 
         skip 'VIES is down' if result.nil?
 
@@ -107,6 +107,8 @@ describe Valvat::Lookup do
       it 'supports old :requester_vat option for backwards compatibility' do
         result = described_class.validate('IE6388047V', requester_vat: 'LU21416127')
 
+        skip 'VIES is down' if result.nil?
+
         expect(result).to match({
                                   request_date: kind_of(Date),
                                   request_identifier: /\A[\w\W]{16}\Z/,
@@ -150,6 +152,28 @@ describe Valvat::Lookup do
                              'INVALID_REQUEST (Invalid requesterVrn - Vrn parameters should be 9 or 12 digits)')
         end
       end
+
+      context 'when set in global config' do
+        before { Valvat.configure(requester: 'IE6388047V') }
+        after { Valvat.configure(requester: nil) }
+
+        it 'returns hash of details instead of true' do
+          result = described_class.validate('IE6388047V')
+
+          skip 'VIES is down' if result.nil?
+
+          expect(result).to match({
+                                    request_date: kind_of(Date),
+                                    request_identifier: /\A[\w\W]{16}\Z/,
+                                    country_code: 'IE',
+                                    vat_number: '6388047V',
+                                    name: 'GOOGLE IRELAND LIMITED',
+                                    company_type: nil,
+                                    address: '3RD FLOOR, GORDON HOUSE, BARROW STREET, DUBLIN 4',
+                                    valid: true
+                                  })
+        end
+      end
     end
   end
 
@@ -363,7 +387,7 @@ describe Valvat::Lookup do
 
     describe 'Error : MESSAGE_THROTTLED_OUT' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_return(
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_return(
           status: 429,
           body: '{"code":"MESSAGE_THROTTLED_OUT"}'
         )
@@ -380,7 +404,7 @@ describe Valvat::Lookup do
 
     describe 'Error : SCHEDULED_MAINTENANCE' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_return(
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_return(
           status: 503,
           body: '{"code":"SCHEDULED_MAINTENANCE"}'
         )
@@ -399,7 +423,7 @@ describe Valvat::Lookup do
 
     describe 'Error : SERVER_ERROR' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_return(
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_return(
           status: 503,
           body: '{"code":"SERVER_ERROR"}'
         )
@@ -418,7 +442,7 @@ describe Valvat::Lookup do
 
     describe 'Error : GATEWAY_TIMEOUT' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_return(
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_return(
           status: 504,
           body: '{"code":"GATEWAY_TIMEOUT"}'
         )
@@ -435,7 +459,7 @@ describe Valvat::Lookup do
 
     describe 'Network timeout' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_timeout
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_timeout
       end
 
       it 'raises error' do
@@ -451,7 +475,7 @@ describe Valvat::Lookup do
 
     describe 'Error : INTERNAL_SERVER_ERROR' do
       before do
-        stub_request(:get, /test-api.service.hmrc.gov.uk/).to_return(
+        stub_request(:get, /test-api\.service\.hmrc\.gov\.uk/).to_return(
           status: 500,
           body: '{"code":"INTERNAL_SERVER_ERROR"}'
         )

data/spec/valvat/options_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Valvat::Options do
+  describe '#[]' do
+    it 'returns global config by default' do
+      expect(described_class.new({})[:uk]).to be(false)
+    end
+
+    it 'returns option if set' do
+      expect(described_class.new({ uk: true })[:uk]).to be(true)
+    end
+
+    context 'when options contains deprecated key' do
+      let(:options) { described_class.new({ requester_vat: 'DE123' }, silence: true) }
+
+      it 'returns it on new key' do
+        expect(options[:requester]).to be('DE123')
+      end
+    end
+  end
+end

data/spec/valvat/syntax_spec.rb

@@ -21,7 +21,7 @@ describe Valvat::Syntax do
     it_validates(%w[ATU03458890], %w[ATU034588908 ATU0345908 ATU0345889Y])
     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[CY36579347A CY36579347C CY60000347C], %w[CY36579347 CY365793478 CY365793478A CY365793G])
     it_validates(%w[CZ56389267 CZ563892670 CZ5638926790], %w[CZ5638926 CZ56389268901])
     it_validates(%w[DE345889003], %w[DE34588900 DE3458890090 DE34588900C])
     it_validates(%w[DK67893463], %w[DK678934637 DK6789346 DK6789346H])

data/spec/valvat/utils_spec.rb

@@ -112,4 +112,14 @@ describe Valvat::Utils do
       end
     end
   end
+
+  describe '#deep_symbolize_keys' do
+    it 'symbolizes keys of flat hash' do
+      expect(described_class.deep_symbolize_keys({ 'a' => 1, :b => 2 })).to eql({ a: 1, b: 2 })
+    end
+
+    it 'symbolizes all hashes' do
+      expect(described_class.deep_symbolize_keys({ 'a' => 1, :b => { 'c' => 3 } })).to eql({ a: 1, b: { c: 3 } })
+    end
+  end
 end

data/spec/valvat_spec.rb

@@ -44,22 +44,22 @@ describe Valvat do
 
   describe 'object equality' do
     it 'returns true when the underlying number are the same' do
-      first = "DE259597697"
-      second = "DE259597697"
+      first = 'DE259597697'
+      second = 'DE259597697'
 
       expect(described_class.new(first)).to eql(described_class.new(second))
     end
 
     it 'returns true when the underlying number are the same when normalized' do
-      first = "DE259597697"
-      second = "DE  2595 9 7697    "
+      first = 'DE259597697'
+      second = 'DE  2595 9 7697    '
 
       expect(described_class.new(first)).to eql(described_class.new(second))
     end
 
     it 'returns false when the underlying number are different' do
-      first = "DE259597697"
-      second = "ATU458890031"
+      first = 'DE259597697'
+      second = 'ATU458890031'
 
       expect(described_class.new(first)).not_to eql(described_class.new(second))
     end
@@ -140,14 +140,6 @@ describe Valvat do
       end
     end
 
-    describe '#european?' do
-      it 'returns true' do
-        expect(de_vat).to be_european
-        expect(at_vat).to be_european
-        expect(gr_vat).to be_european
-      end
-    end
-
     describe '#to_s' do
       it 'returns full VAT number' do
         expect(de_vat.to_s).to eql('DE259597697')
@@ -206,13 +198,6 @@ describe Valvat do
       end
     end
 
-    describe '#european?' do
-      it 'returns false' do
-        expect(us_vat).not_to be_european
-        expect(ch_vat).not_to be_european
-      end
-    end
-
     describe '#to_s' do
       it 'returns full given VAT number' do
         expect(us_vat.to_s).to eql('US345889003')
@@ -270,15 +255,6 @@ describe Valvat do
       end
     end
 
-    describe '#european?' do
-      it 'returns false' do
-        expect(only_iso_vat).not_to be_european
-        expect(num_vat).not_to be_european
-        expect(empty_vat).not_to be_european
-        expect(nil_vat).not_to be_european
-      end
-    end
-
     describe '#to_s' do
       it 'returns full given VAT number' do
         expect(only_iso_vat.to_s).to eql('DE')

data/valvat.gemspec

@@ -4,27 +4,21 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'valvat/version'
 
 Gem::Specification.new do |s|
-  s.name          = 'valvat'
-  s.version       = Valvat::VERSION
-  s.platform      = Gem::Platform::RUBY
-  s.license       = 'MIT'
-  s.authors       = ['Sebastian Munz']
-  s.email         = ['sebastian@mite.de']
-  s.homepage      = 'https://github.com/yolk/valvat'
-  s.summary       = 'Validates european vat numbers. Standalone or as a ActiveModel validator.'
-  s.description   = 'Validates european vat numbers. Standalone or as a ActiveModel validator.'
-  s.files         = `git ls-files`.split("\n")
-  s.require_paths = ['lib']
-  s.cert_chain    = ['certs/mite.pem']
-  s.signing_key   = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME =~ /gem\z/
-  s.required_ruby_version = '>= 2.5.0'
+  s.name                              = 'valvat'
+  s.version                           = Valvat::VERSION
+  s.platform                          = Gem::Platform::RUBY
+  s.license                           = 'MIT'
+  s.authors                           = ['Sebastian Munz']
+  s.email                             = ['sebastian@mite.de']
+  s.homepage                          = 'https://github.com/yolk/valvat'
+  s.summary                           = 'Validates european vat numbers. Standalone or as a ActiveModel validator.'
+  s.description                       = 'Validates european vat numbers. Standalone or as a ActiveModel validator.'
+  s.files                             = `git ls-files`.split("\n")
+  s.require_paths                     = ['lib']
+  s.cert_chain                        = ['certs/mite.pem']
+  s.signing_key                       = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME =~ /gem\z/
+  s.metadata['rubygems_mfa_required'] = 'true'
+  s.required_ruby_version             = '>= 2.6.0'
 
   s.add_runtime_dependency('rexml', '>= 3.2', '< 4.0')
-
-  s.add_development_dependency 'activemodel', '>= 5.0'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'webmock', '~> 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.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sebastian Munz
@@ -35,7 +35,7 @@ cert_chain:
   O1ARwPz8pN+xIvxo8ex8Hz1sazm/iFgVBwHgaI3O3ctK7vF4+fAu6dlLcbEpij9z
   4QlUng62OJRSBV/ejaTTItcAOXBeh028ZFWC0QQR4r0=
   -----END CERTIFICATE-----
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -57,62 +57,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Validates european vat numbers. Standalone or as a ActiveModel validator.
 email:
 - sebastian@mite.de
@@ -121,7 +65,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/ruby.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/specs.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGES.md
@@ -131,7 +76,6 @@ files:
 - README.md
 - Rakefile
 - certs/mite.pem
-- certs/yolk.pem
 - gemfiles/activemodel-5
 - gemfiles/activemodel-6
 - gemfiles/activemodel-7
@@ -164,6 +108,7 @@ files:
 - lib/valvat/checksum/ro.rb
 - lib/valvat/checksum/se.rb
 - lib/valvat/checksum/si.rb
+- lib/valvat/configuration.rb
 - lib/valvat/error.rb
 - lib/valvat/local.rb
 - lib/valvat/locales/bg.yml
@@ -190,6 +135,7 @@ files:
 - lib/valvat/lookup/base.rb
 - lib/valvat/lookup/hmrc.rb
 - lib/valvat/lookup/vies.rb
+- lib/valvat/options.rb
 - lib/valvat/syntax.rb
 - lib/valvat/utils.rb
 - lib/valvat/version.rb
@@ -224,6 +170,7 @@ files:
 - spec/valvat/lookup/hmrc_spec.rb
 - spec/valvat/lookup/vies_spec.rb
 - spec/valvat/lookup_spec.rb
+- spec/valvat/options_spec.rb
 - spec/valvat/syntax_spec.rb
 - spec/valvat/utils_spec.rb
 - spec/valvat_spec.rb
@@ -241,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Validates european vat numbers. Standalone or as a ActiveModel validator.

data/certs/yolk.pem

@@ -1,26 +0,0 @@
------BEGIN 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-----