europe 0.0.12 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa46dc40ecd90942490472823d2557a6cffaed5467a8147a589323a3cfe81bc4
-  data.tar.gz: 150097042834342df620e01663afad133e10ee7263a6740356ec108a7ff10e9e
+  metadata.gz: 2a51fd47c777826d6b43e650779d56da1dd6cade5cef5fbccdba86f9f0f1dbb5
+  data.tar.gz: aaf979e70a5e3dc6799824614c6d5c6d83c0ccd21d08960f66e6aee3d56006fa
 SHA512:
-  metadata.gz: cf1c063eaa959b37e9202a0b962335c4479eab908210e4d5562c0ea7b667be366a20018f0334128a55ed51f2f31e9f6c3f13e108a62155d5d9f9ed3195d62d0a
-  data.tar.gz: 8fd71a389816b6a02178419b975e00a9017e6c713be070ad365fe067e269dfcb18c4c2e881903b2b0111f2f0f89f3a6a57485d8ce3ed2a71321dfc25d75df69b
+  metadata.gz: e5473553fd2039a96277d7086dbc6d9e8b5a70891a70fb94361822ac1ce486000f1f18cde78796bb7d0eba35a443c47c5c6371d0497768bfcb4f8c81ad3d3c8a
+  data.tar.gz: 6f08b6079cf1bf521533e97d663b88779393fcddc4adda55860eb4329d99a22db2b610e3e106a2a798490e28301dbb3a5928a9b6b21be7b3e649d25f7f8fdfa0

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    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
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ mkmf.log
 .DS_Store
 coverage
 .byebug_history
+*.gem

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,32 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.0.17
+  - Removed all UK VAT logic
+  - Updated development dependencies
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.15...v0.0.16)
+
+## 0.0.16
+  - Changed Slovak Republic to Slovakia in country names
+  - Updated outdated endpoint for VAT rates, thanks to @firstpromoter
+  - Fixed a couple of rubocop issues
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.15...v0.0.16)
+## 0.0.15
+  - Checked library on Ruby 2.7
+  - Moved repository to gem-shards
+  - [Full Changelog](https://github.com/VvanGemert/europe/compare/v0.0.14...v0.0.15)
+
+## 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)

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.
 
@@ -43,16 +43,16 @@ where this gem can be used for.
 ** Updated: Parameter now consists of one value.**
 Call to validate VAT number (always starts with country code as specified in VIES)
 ```ruby
-Europe::Vat.validate('GB440627467')
+Europe::Vat.validate('NL009291477B01')
 ```
 Response
 ```ruby
-{ :country_code=>"GB",
-  :vat_number=>"440627467",
-  :request_date=>#<Date: 2015-12-15 ((2457372j,0s,0n),+0s,2299161j)>,
-  :valid=>true,
-  :name=>"SKY PLC",
-  :address=>"6 CENTAURS BUSINESS PARK\nGRANT WAY\nISLEWORTH\nMIDDLESEX\n\nTW7 5QD" }
+{ :country_code => "NL",
+  :vat_number => "009291477B01",
+  :request_date => #<Date: 2015-12-15 ((2457372j,0s,0n),+0s,2299161j)>,
+  :valid => true,
+  :name => "KONINKLIJKE POSTNL B.V.",
+  :address => nil }
 ```
 
 ### Validate VAT number format
@@ -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
@@ -17,7 +19,6 @@ module Europe
         ES: /^ES([A-Z0-9]\d{7}[A-Z0-9])$/,
         FI: /^FI\d{8}$/,
         FR: /^FR[A-Z0-9][A-Z0-9] \d{9}$/,
-        GB: [/^GB(\d{3} \d{4} \d{2}( \d{3}5)?)$/, /^GB(HA|GD)\d{3}(6|7)$/],
         HR: /^HR\d{11}$/,
         HU: /^HU\d{8}$/,
         IE: /^IE\d[A-Z0-9\+\*|\d]\d{5}([A-Z]|WI)$/,
@@ -38,12 +39,13 @@ 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
 
       def self.sanitize_number(number, country_code)
-        if %i[GB DK FR].include?(country_code)
+        if %i[DK FR].include?(country_code)
           number.gsub(/\.|\t/, '').upcase
         else
           number.gsub(/\.|\t|\s/, '').upcase

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,18 +61,21 @@ 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 if body[position]
+      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)
-      end
+
+      Europe::Vat::Fromat::VAT_REGEX.key?(origin_country.to_sym) ||
+        Europe::Vat::Fromat::VAT_REGEX.key?(number[0..1].to_sym)
     end
 
     def self.send_request(country_code, number)

data/lib/europe/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Europe version
 module Europe
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.17'
 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
@@ -19,10 +21,6 @@ module Europe
         ES: 'ESX9999999X',
         FI: 'FI99999999',
         FR: 'FRXX 999999999',
-        GB: ['GB999 9999 99 9995',
-             'GBGD9996',
-             'GBHA9997',
-             'GB999 9999 99'],
         HR: 'HR99999999999',
         HU: 'HU99999999',
         IE: %w[IE9S99999L IE9999999WI],

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
@@ -21,11 +23,6 @@ module Europe
         assert validate_correct_vat[:valid] \
           unless %i[timeout failed].include?(validate_correct_vat)
 
-        # Sky
-        validate_correct_vat = Europe::Vat.validate('GB440627467')
-        assert validate_correct_vat[:valid] \
-          unless %i[timeout failed].include?(validate_correct_vat)
-
         # Volkswagen
         validate_correct_vat = Europe::Vat.validate('DE115235681')
         assert validate_correct_vat[:valid] \

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.12
+  version: 0.0.17
 platform: ruby
 authors:
-- VvanGemert
-autorequire: 
+- Gem shards
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -139,12 +139,13 @@ 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: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rubocop.yml"
@@ -177,11 +178,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 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-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: