europe 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a55ae95d39dcab68a14a4de1d298819078e8298e9c9af5c39959c9a7b23ac0
-  data.tar.gz: 6f94ef270dba36c732cb01f3c59585207c7a1af85e2fd36943bdb8ae539a9a5d
+  metadata.gz: b8dfe84a1c050d715865f2f5878458f4f9708437770e629ee64564d59ff622d4
+  data.tar.gz: d59e3b667b741269bfb5db4dafeb6cc531a052fd79ccfcbe354e941c5976cb13
 SHA512:
-  metadata.gz: f9f0684d1dad36ef0dc571eb57e16fd5ca1906f6590a5e41b86524f6ed6b028dd2c7164225b667562e95415d1a400b0ab9a8ffbed3f914e40602d8f7181df055
-  data.tar.gz: 3360fac7092630a575698bde54dee4378de5d954a6fff06e2bd2d8111e22e5a66bf8d67baac1a498ecb0e4f52ee8b5b48b47bb960f38e994c637e0f0a7296d89
+  metadata.gz: 5da3ca3fc8579d8b55043b6f9af8da9ac1f69aa46ec9e4c9858a2318cae1222724679553ec45f61308928f65595bbd71682279aa219e46e698811eb3a27217a2
+  data.tar.gz: 3c5f1f99dab00df6e1e66acf202c4a12cf339fb0207566b5ef613d93c8ac262e61b243a05045e30c82dbc3b36667f89bc99345bb4b42456420951a5d7b889420

data/.pryrc

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # .pryrc
 require 'europe'
 

data/.rubocop.yml

@@ -1,3 +1,18 @@
 AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
   Exclude:
     - 'europe.gemspec'
+
+Style/SlicingWithRange:
+  Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+
+Style/CaseLikeIf:
+  Enabled: false

data/.travis.yml

@@ -6,3 +6,6 @@ rvm:
   - 2.4.0
   - 2.5.0
   - 2.5.1
+  - 2.6.0
+  - 2.6.2
+  - 2.6.3

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.0.14
+  - Fixed rubocop syntax issues
+  - Fixed issue with retrieving exchange rates when no valid JSON is returned
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.13...v0.0.14)
+
+## 0.0.13
+  - Fixed rubocop syntax issues
+  - Changed ExchangeRate source from XML to JSON
+  - Fixed date parsing and soap:fault handling in VAT validation
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.12...v0.0.13)
+
+## 0.0.12
+  - Fixed extracting vat validation data when it didn't exists
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.11...v0.0.12)
+
 ## 0.0.11
   - Removed print outout when fetching VAT rates
   - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.10...v0.0.11)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in europe.gemspec

data/README.md

@@ -1,5 +1,5 @@
 ![Europe gem logo](https://s3-eu-west-1.amazonaws.com/valorsis.s3-website-eu-west-1.amazonaws.com/static/logo256.png)
-# Europe
+# Europe :eu:
 
 This gem provides EU governmental data, extracted from various EU / EC websites. With this gem you can validate VAT numbers, retrieve VAT tax rates and currency exchange rates matched to the Euro. How to use this gem is pretty straightforward and written below.
 
@@ -179,7 +179,7 @@ This gem is tested with the following Ruby versions on Linux and Mac OS X:
 
 ## Contributing
 
-1. Fork it ( https://github.com/VvanGemert/europe/fork )
+1. Fork it ( https://github.com/gem-shards/europe.rb/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'europe/rake_task'

data/europe.gemspec

@@ -6,15 +6,15 @@ require 'europe/version'
 Gem::Specification.new do |spec|
   spec.name          = 'europe'
   spec.version       = Europe::VERSION
-  spec.authors       = ['VvanGemert']
-  spec.email         = ['vincent@floorplanner.com']
+  spec.authors       = ['Gem shards']
+  spec.email         = ['vincent@gemshards.com']
   spec.summary       = 'Europe is a gem for retrieving and validating ' \
                        'EU government data.'
   spec.description   = 'Europe is a simple library for retrieving ' \
                        'EU government data such as VAT information, ' \
                        'VAT validation, currency exchange rates and ' \
                        'country information.'
-  spec.homepage      = 'https://github.com/VvanGemert/europe'
+  spec.homepage      = 'https://github.com/gem-shards/europe.rb'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/europe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'europe/version'
 require 'europe/countries/countries'
 require 'europe/currency/currency'

data/lib/europe/countries/countries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Source: http://publications.europa.eu/code/pdf/370000en.htm
 
 require 'europe/countries/reversed'
@@ -79,7 +81,7 @@ module Europe
       SI: { name: 'Slovenia', source_name: 'Slovenija',
             official_name: 'Republic of Slovenia',
             tld: '.si', currency: :EUR, capital: 'Ljubljana' },
-      SK: { name: 'Slovak Republic', source_name: 'Slovensko',
+      SK: { name: 'Slovakia', source_name: 'Slovensko',
             official_name: 'Slovak Republic',
             tld: '.sk', currency: :EUR, capital: 'Bratislava' },
       FI: { name: 'Finland', source_name: 'Suomi',

data/lib/europe/countries/reversed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Europe
   # Countries
   module Countries

data/lib/europe/currency/currency.rb

@@ -1,4 +1,6 @@
 #!/bin/env ruby
+# frozen_string_literal: true
+
 # Source: Wikipedia
 require 'europe/currency/exchange_rates'
 

data/lib/europe/currency/exchange_rates.rb

@@ -1,4 +1,5 @@
-require 'rexml/document'
+# frozen_string_literal: true
+
 require 'net/http'
 require 'date'
 
@@ -8,7 +9,7 @@ module Europe
   module Currency
     # exchange rates
     module ExchangeRates
-      EXCHANGE_URL = 'https://www.floatrates.com/daily/eur.xml'.freeze
+      EXCHANGE_URL = 'https://www.floatrates.com/daily/eur.json'
 
       def self.retrieve
         resp = Net::HTTP.get_response(URI.parse(EXCHANGE_URL))
@@ -16,17 +17,19 @@ module Europe
       end
 
       def self.extract_rates(doc)
-        xml = REXML::Document.new(doc)
+        data = JSON.parse(doc)
 
-        rates = { date: Date.parse(xml.elements.first.elements[7].text),
+        rates = { date: Date.parse(data['usd']['date']),
                   rates: {} }
 
-        filter_rates(xml, rates)
+        filter_rates(data, rates)
+      rescue JSON::ParserError
+        :failed
       end
 
-      def self.filter_rates(xml, rates)
-        xml.elements.each('channel/item') do |item|
-          rates[:rates][item[13].text.to_sym] = item[17].text.delete(',').to_f
+      def self.filter_rates(data, rates)
+        data.each do |currency, object|
+          rates[:rates][currency.upcase.to_sym] = object['rate'].to_f
         end
         rates
       end

data/lib/europe/eurostat/eurostat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 require 'json'
@@ -8,7 +10,7 @@ module Europe
   module Eurostat
     # http://ec.europa.eu/eurostat/data/database
     STAT_URL = 'http://ec.europa.eu/eurostat/wdds' \
-               '/rest/data/v2.1/json/en/'.freeze
+               '/rest/data/v2.1/json/en/'
 
     def self.retrieve(dataset, filters)
       fetch_stats(dataset, filters)

data/lib/europe/postal/postal.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Europe Gem
 module Europe
   # VAT
   module Postal
-    # rubocop:disable LineLength
+    # rubocop:disable Layout/LineLength
     POSTAL_REGEX = {
       AT: /^\d{4}$/,
       BE: /^\d{4}$/,
@@ -33,10 +35,11 @@ module Europe
       SI: /^\d{4}$/,
       SK: /^\d{3}[ ]?\d{2}$/
     }.freeze
-    # rubocop:enable LineLength
+    # rubocop:enable Layout/LineLength
 
     def self.validate(country_code, postal_code)
-      return false unless POSTAL_REGEX.keys.include?(country_code.to_sym)
+      return false unless POSTAL_REGEX.key?(country_code.to_sym)
+
       match_postal_code(postal_code, country_code)
     end
 

data/lib/europe/rake_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Europe
   # RakeTask
   module RakeTask

data/lib/europe/tasks/eurostat.rake

@@ -1,14 +1,19 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 
 namespace :eurostat do
-  EUROSTAT_BULK_URL = 'http://ec.europa.eu/eurostat/' \
-                      'estat-navtree-portlet-prod/BulkDownloadListing' \
-                      '?sort=1&file='.freeze
-
   desc 'Download categories from Eurostat Bulk Facility'
   task :download_categories do
+    eurostat_bulk_url = 'http://ec.europa.eu/eurostat/' \
+                        'estat-navtree-portlet-prod/BulkDownloadListing' \
+                        '?sort=1&file='
+
+    data = Net::HTTP.get_response(
+      URI.parse("#{eurostat_bulk_url}table_of_contents_en.txt")
+    ).body
     File.open('cat.txt', 'w') do |f|
-      IO.copy_stream(open(EUROSTAT_BULK_URL + 'table_of_contents_en.txt'), f)
+      IO.copy_stream(data, f)
     end
   end
 end

data/lib/europe/vat/format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Europe Gem
 module Europe
   # VAT
@@ -38,7 +40,8 @@ module Europe
       def self.validate(number)
         country_code = number[0..1].to_sym
         number = sanitize_number(number, country_code)
-        return false unless VAT_REGEX.keys.include?(country_code)
+        return false unless VAT_REGEX.key?(country_code)
+
         match_vat_number(number, country_code)
       end
 

data/lib/europe/vat/rates.rb

@@ -1,14 +1,19 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 
 module Europe
   module Vat
     # Rates
     module Rates
-      RATES_URL = 'https://europa.eu/youreurope/business/taxation/' \
-                  'vat/vat-rules-rates/index_en.htm'.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
+
         extract_rates(resp)
       end
 
@@ -19,15 +24,17 @@ module Europe
         xml = REXML::Document.new("<root>#{data}</root>")
         xml.first.elements.each('tr') do |result|
           next if result[3].nil?
+
           rates = filter_rate(result, rates)
         end
         rates
       end
 
       def self.filter_rate(result, rates)
-        country = result[3].text
-        rate = result[5].text
-        rates[country.to_sym] = rate.to_f if country
+        country = result[0].text
+        rate = result[3].text
+        country_code = Europe::Countries::Reversed.generate(:name)[country]
+        rates[country_code] = rate.to_f if country_code
         rates
       end
 

data/lib/europe/vat/vat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'europe/vat/rates'
 require 'europe/vat/format'
 require 'uri'
@@ -10,13 +12,13 @@ module Europe
   # VAT
   module Vat
     WSDL = 'http://ec.europa.eu/taxation_customs/vies/' \
-           'services/checkVatService'.freeze
+           'services/checkVatService'
     HEADERS = {
       'Content-Type' => 'text/xml;charset=UTF-8',
       'SOAPAction' => ''
     }.freeze
 
-    BODY = <<-XML.freeze
+    BODY = <<-XML
       <soapenv:Envelope
       xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
       xmlns:urn="urn:ec.europa.eu:taxud:vies:services:checkVat:types">
@@ -33,11 +35,13 @@ module Europe
     def self.validate(number)
       response = send_request(number[0..1], number[2..-1])
       return :failed unless response.is_a? Net::HTTPSuccess
+      return :failed if response.body.include?('soap:Fault')
+
       setup_response(response)
     rescue Net::OpenTimeout
-      return :timeout
+      :timeout
     rescue Net::HTTPServerError
-      return :server_error
+      :server_error
     end
 
     def self.setup_response(response)
@@ -46,7 +50,7 @@ module Europe
         valid: extract_data(body, 4) == 'true',
         country_code: extract_data(body, 1),
         vat_number: extract_data(body, 2),
-        request_date: Date.parse(extract_data(body, 3)),
+        request_date: convert_date(extract_data(body, 3)),
         name: extract_data(body, 5),
         address: extract_data(body, 6)
       }
@@ -57,17 +61,24 @@ module Europe
       xml.first.elements.first.elements.first.elements
     end
 
+    def self.convert_date(date)
+      return unless date
+
+      Date.parse(date)
+    end
+
     def self.extract_data(body, position)
-      body[position].text
+      body[position]&.text
     end
 
     def self.charge_vat?(origin_country, number)
       return false if number.nil? || number.empty?
+
       if origin_country.to_sym == number[0..1].to_sym
         true
       else
         Europe::Countries::COUNTRIES
-          .keys.include?(number[0..1].to_sym)
+          .key?(number[0..1].to_sym)
       end
     end
 

data/lib/europe/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Europe version
 module Europe
-  VERSION = '0.0.11'.freeze
+  VERSION = '0.0.16'
 end

data/test/europe/countries/country_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/currency/currency_test.rb

@@ -1,4 +1,6 @@
 #!/bin/env ruby
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/currency/exchange_rates_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe
@@ -12,7 +14,7 @@ module Europe
 
       def test_retrieval_exchange_rates
         rates = Europe::Currency::ExchangeRates.retrieve
-        assert rates[:rates].keys.include?(:GBP)
+        assert rates[:rates].key?(:GBP)
       end
     end
   end

data/test/europe/eurostat/eurostat_test.rb

@@ -1,4 +1,6 @@
 #!/bin/env ruby
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/postal/format_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/vat/format_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/vat/rates_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/europe/vat/validation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Europe

data/test/test_helper.rb

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'europe'
 require 'minitest/autorun'
 require 'webmock/minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europe
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
-- VvanGemert
-autorequire: 
+- Gem shards
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -139,7 +139,7 @@ dependencies:
 description: Europe is a simple library for retrieving EU government data such as
   VAT information, VAT validation, currency exchange rates and country information.
 email:
-- vincent@floorplanner.com
+- vincent@gemshards.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -177,11 +177,11 @@ files:
 - test/europe/vat/rates_test.rb
 - test/europe/vat/validation_test.rb
 - test/test_helper.rb
-homepage: https://github.com/VvanGemert/europe
+homepage: https://github.com/gem-shards/europe.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Europe is a gem for retrieving and validating EU government data.
 test_files: