europe 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa46dc40ecd90942490472823d2557a6cffaed5467a8147a589323a3cfe81bc4
-  data.tar.gz: 150097042834342df620e01663afad133e10ee7263a6740356ec108a7ff10e9e
+  metadata.gz: 485843e469d396d96b1f4691904ed6d2e21139a31eea5840e6369dd10f2cfaec
+  data.tar.gz: 596c49fcafcb9d05964c697f500e475adb2cf510baad1dd0f65df5e7fb1790bf
 SHA512:
-  metadata.gz: cf1c063eaa959b37e9202a0b962335c4479eab908210e4d5562c0ea7b667be366a20018f0334128a55ed51f2f31e9f6c3f13e108a62155d5d9f9ed3195d62d0a
-  data.tar.gz: 8fd71a389816b6a02178419b975e00a9017e6c713be070ad365fe067e269dfcb18c4c2e881903b2b0111f2f0f89f3a6a57485d8ce3ed2a71321dfc25d75df69b
+  metadata.gz: 239e7f92f39acc3f49f345a49eb1e3140866b0eab2f471d4619010e4c09adefe05fe62267a20ac4a993d91f4054b46fc6f131a60949846bdadf56151b4a520fc
+  data.tar.gz: 717c7a926fd9302c277d2d5d675eccc04b468bef6a12dd01148dab1270c491dd6091dd4ac1e746c4c09ae430a823ad3c6a828176f79e4d358d3e9783fbb245df

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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/lib/europe/currency/exchange_rates.rb

@@ -1,4 +1,3 @@
-require 'rexml/document'
 require 'net/http'
 require 'date'
 
@@ -8,7 +7,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'.freeze
 
       def self.retrieve
         resp = Net::HTTP.get_response(URI.parse(EXCHANGE_URL))
@@ -16,17 +15,17 @@ 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)
       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/postal/postal.rb

@@ -36,7 +36,8 @@ module Europe
     # rubocop:enable 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/tasks/eurostat.rake

@@ -7,8 +7,11 @@ namespace :eurostat do
 
   desc 'Download categories from Eurostat Bulk Facility'
   task :download_categories do
+    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

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

@@ -9,6 +9,7 @@ module Europe
       def self.retrieve
         resp = fetch_rates
         return resp if resp == :failed
+
         extract_rates(resp)
       end
 
@@ -19,6 +20,7 @@ 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

data/lib/europe/vat/vat.rb

@@ -33,11 +33,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 +48,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 +59,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 if body[position]
     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,4 @@
 # Europe version
 module Europe
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

data/test/europe/currency/exchange_rates_test.rb

@@ -12,7 +12,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/test_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$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.13
 platform: ruby
 authors:
 - VvanGemert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug