europe 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794ad55570cf9ea7535ce493786274121a6c3617f64211b8676c70f877a5a113
-  data.tar.gz: 699800827413a40143516a78211edd1bb542efd868c9d8cf0bfa740d19b2f2d1
+  metadata.gz: 55a8a248cfae6ade9980da4ea2e6b47938c5aa75c8936c8f010e35a50b6f2b86
+  data.tar.gz: 23920666bd00770ab722cfb8d6edc5e17b416f9d6d81c8ecb1ebfc9112d65338
 SHA512:
-  metadata.gz: 2bccf16590f7a26f30512c63d350e53ef3ed1978357e70584e3c08d7d16cdcb072f25b09d537782ca03b8e74399299f4c20b7cafe35a128829a2d7b2707a944e
-  data.tar.gz: 8227b36d84d9d131f27e286ffd7d29a0d132753da1a55989735ce4a4754125022af87381e4cb95d05b7bf1c93cf15f6860f7a57bd7797f2cb1186eb52700ecad
+  metadata.gz: cd703d1d1d8e534dc8ad46bb1051aa2cfe871e807215c0a417286bac7d23814bf7aba5d0f8f4bdb49fb88f1ed49992f5b6e24a30416c0f769f06d051970b9c78
+  data.tar.gz: ce9d7fd212fb5905a71598ab7545eb3ad80823a095e97af46101426c214ec592e3d4eacaf429bfaa21a7f2417072a5154c2e97a2b024f642d4fe9a346322f967

data/.github/workflows/ruby.yml

@@ -20,13 +20,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1.1
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   SuggestExtensions: false
   Exclude:
     - 'europe.gemspec'

data/.travis.yml

@@ -9,3 +9,4 @@ rvm:
   - 2.6.0
   - 2.6.2
   - 2.6.3
+  - 3.1.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
+## 0.0.20
+  - Added fallback VAT rates in case the EU website is down or unresponsive
+  - [Full Changelog](https://github.com/gem-shards/europe.rb/compare/v0.0.19...v0.0.20)
+## 0.0.19
+  - Fixed VAT validation call because XML response was updated
+  - [Full Changelog](https://github.com/gem-shards/europe.rb/compare/v0.0.18...v0.0.19)
 ## 0.0.18
   - Added Estonia and Lithuania to eurozone
   - [Full Changelog](https://github.com/gem-shards/europe.rb/compare/v0.0.17...v0.0.18)

data/lib/europe/vat/rates.rb

@@ -6,21 +6,33 @@ module Europe
   module Vat
     # Rates
     module Rates
+      FALLBACK_RATES = {
+        AT: 20.0, BE: 21.0, BG: 20.0, CY: 19.0, CZ: 21.0, DE: 19.0, DK: 25.0, EE: 20.0,
+        EL: 24.0, ES: 21.0, FI: 24.0, FR: 20.0, UK: 20.0, HR: 25.0, HU: 27.0, IE: 23.0,
+        IT: 22.0, LT: 21.0, LU: 17.0, LV: 21.0, MT: 18.0, NL: 21.0, PL: 23.0, PT: 23.0,
+        RO: 19.0, SE: 25.0, SI: 22.0, SK: 20.0
+      }.freeze
       RATES_URL = 'https://ec.europa.eu/taxation_customs/' \
                   'business/vat/telecommunications-broadcasting' \
                   '-electronic-services/vat-rates_en'
 
       def self.retrieve
         resp = fetch_rates
-        return resp if resp == :failed
+        return FALLBACK_RATES if resp.nil?
 
         extract_rates(resp)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def self.extract_rates(resp)
         rates = {}
 
-        data = resp.scan(%r{\<tbody\>(.*)\<\/tbody\>}m).first.first.strip
+        begin
+          data = resp.scan(%r{\<tbody\>(.*)\<\/tbody\>}m).first.first.strip
+        rescue NoMethodError
+          return FALLBACK_RATES
+        end
+
         xml = REXML::Document.new("<root>#{data}</root>")
         xml.first.elements.each('tr') do |result|
           next if result[3].nil?
@@ -29,6 +41,7 @@ module Europe
         end
         rates
       end
+      # rubocop:enable Metrics/MethodLength
 
       def self.filter_rate(result, rates)
         country = result[0].text
@@ -40,7 +53,7 @@ module Europe
 
       def self.fetch_rates
         resp = Net::HTTP.get_response(URI.parse(RATES_URL))
-        resp.code.to_i == 200 ? resp.body : :failed
+        resp.code.to_i == 200 ? resp.body : nil
       end
     end
   end

data/lib/europe/vat/vat.rb

@@ -47,18 +47,18 @@ module Europe
     def self.setup_response(response)
       body = response_xml(response)
       {
-        valid: extract_data(body, 4) == 'true',
-        country_code: extract_data(body, 1),
-        vat_number: extract_data(body, 2),
-        request_date: convert_date(extract_data(body, 3)),
-        name: extract_data(body, 5),
-        address: extract_data(body, 6)
+        valid: extract_data(body, 3) == 'true',
+        country_code: extract_data(body, 0),
+        vat_number: extract_data(body, 1),
+        request_date: convert_date(extract_data(body, 2)),
+        name: extract_data(body, 4),
+        address: extract_data(body, 5)
       }
     end
 
     def self.response_xml(response)
       xml = REXML::Document.new(response.body)
-      xml.first.elements.first.elements.first.elements
+      xml.elements.first.elements[2].elements[1]
     end
 
     def self.convert_date(date)

data/lib/europe/version.rb

@@ -2,5 +2,5 @@
 
 # Europe version
 module Europe
-  VERSION = '0.0.18'
+  VERSION = '0.0.20'
 end

data/test/europe/vat/rates_test.rb

@@ -14,11 +14,9 @@ module Europe
 
       def test_retrieval_of_vat_rates
         rates = Europe::Vat::Rates.retrieve
-        if rates == :failed
-          rates = { NL: 17, DE: 19, ES: 18 }
-        else
-          assert_equal rates.count, Europe::Countries::COUNTRIES.count
-        end
+
+        assert_equal rates.count, Europe::Countries::COUNTRIES.count
+
         assert rates[:NL]
         assert rates[:DE]
         assert rates[:ES]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europe
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Gem shards
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Europe is a gem for retrieving and validating EU government data.