europe 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e7e1e3027e935421fd4e15e7164cff183a1345deed66a5a2c764b35e63667a
-  data.tar.gz: ffbaee22b0ec7bbccedb5a9ae2e269deed652007ed28e3bed0faf5b8818cda7b
+  metadata.gz: c273b711c76924d23e6bdd6f597501e79c4af5c1da3006f24696fe12c02aca99
+  data.tar.gz: e4721f22a5f68bb779dbc5b807eec55fb87fc5df7ddf0faa67134dcaf4cfbafc
 SHA512:
-  metadata.gz: 559cecc3c404bf11e187c1ff2641ede7721bb66b34152be7d7981302561c1bd0593755eac3b8f964ede852b27f37794200cf5623d124d4c61f2ef1b1f3d79755
-  data.tar.gz: 8b68f205e4b6bb3972ba988771c965948b6b8bb7e8295f40922c54d8741b6ec615cb70d2caa9e7491518797bd2c2c08b9482cbbdb1cb0195d64ce8502505ad81
+  metadata.gz: 1c93ed548787b6d5fd8589d439eb70481d8de30b49298b8ccfd65fd78976cde09cff637db0f512a76e0a93e4e6ffdcf65a35dc3bceaa3e0c86d941d3303ebbc3
+  data.tar.gz: 3168fe73cabbf2dd4c6bc65686659e2786f9295e7ba49dd960025f710adbcc979a7317aa361a4af86786fedf5ae4229ef7f880b7442197af851ebb66c1ab0456

data/.gitignore

@@ -13,4 +13,5 @@
 *.a
 mkmf.log
 .DS_Store
-coverage
+coverage
+.byebug_history

data/.travis.yml

@@ -2,9 +2,7 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.8
-  - 2.2.0
-  - 2.2.3
-  - 2.2.4
+  - 2.2.2
+  - 2.4.0
+  - 2.5.0
+  - 2.5.1

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# 0.0.9
+  - Removed all external depdencies, only Ruby's standard library is used
+  - Added Postal code format validator
+  - Used different source for exchange rates which returns more currencies
+
+# 0.0.8
+  - Changed URL for retrieving VAT rates. The old one was no longer valid
+  - Skipped Eurostat tests as URL changed. Eurostat use is still expirimental
+
 # 0.0.7
   - Fixed currencies for Estonia, Lithuania and Sweden
   - Added eurozone call to Countries which returns all countries with EUR currency

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Vincent
+Copyright (c) 2018 Vincent
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/README.md

@@ -8,6 +8,7 @@ This gem provides EU governmental data, extracted from various EU / EC websites.
 - [Usage](#usage)
   - [Validating VAT numbers](#validating-vat-numbers)
   - [Validate VAT number format](#validate-vat-number-format)
+  - [Validate Postal code format](#validate-postal-code-format)
   - [Retrieving VAT rates for each EC/EU member](#retrieving-vat-rates-for-each-eceu-member)
   - [Retrieving currency exchange rates](#retrieving-currency-exchange-rates)
   - [Retrieving currency information](#retrieving-currency-information)
@@ -64,6 +65,15 @@ Response
 => true
 ```
 
+### Validate Postal Code format
+Call
+```ruby
+Europe::Postal.validate('NL', '1000 AP')
+```
+Response
+```ruby
+=> true
+```
 
 ### Retrieving VAT rates for each EC/EU member
 Call

data/europe.gemspec

@@ -22,9 +22,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri'
-  spec.add_dependency 'savon'
-
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'

data/lib/europe.rb

@@ -1,6 +1,7 @@
 require 'europe/version'
 require 'europe/countries/countries'
 require 'europe/currency/currency'
+require 'europe/postal/postal'
 require 'europe/vat/vat'
 require 'europe/eurostat/eurostat'
 

data/lib/europe/currency/exchange_rates.rb

@@ -1,5 +1,6 @@
-require 'open-uri'
-require 'nokogiri'
+require 'rexml/document'
+require 'net/http'
+require 'date'
 
 # Europe Gem
 module Europe
@@ -7,18 +8,25 @@ module Europe
   module Currency
     # exchange rates
     module ExchangeRates
-      EXCHANGE_URL = 'http://www.ecb.europa.eu/stats/' \
-                     'eurofxref/eurofxref-daily.xml'.freeze
+      EXCHANGE_URL = 'https://www.floatrates.com/daily/eur.xml'.freeze
+
       def self.retrieve
-        extract_rates(Nokogiri::XML(open(EXCHANGE_URL)))
+        resp = Net::HTTP.get_response(URI.parse(EXCHANGE_URL))
+        resp.code.to_i == 200 ? extract_rates(resp.body) : :failed
       end
 
       def self.extract_rates(doc)
-        rates = { date: Date.parse(doc.css('Cube Cube').first['time']),
+        xml = REXML::Document.new(doc)
+
+        rates = { date: Date.parse(xml.elements.first.elements[7].text),
                   rates: {} }
-        doc.css('Cube Cube Cube').each do |rate|
-          rates[:rates][rate.xpath('@currency').text.to_sym] =
-            rate.xpath('@rate').text.to_f
+
+        filter_rates(xml, 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
         end
         rates
       end

data/lib/europe/postal/postal.rb

@@ -0,0 +1,54 @@
+# Europe Gem
+module Europe
+  # VAT
+  module Postal
+    # rubocop:disable LineLength
+    POSTAL_REGEX = {
+      AT: /^\d{4}$/,
+      BE: /^\d{4}$/,
+      BG: /^\d{4}$/,
+      CY: /^\d{4}$/,
+      CZ: /^\d{3} \d{2}$/,
+      DE: /^\d{5}$/,
+      DK: /^\d{4}$/,
+      EE: /^\d{5}$/,
+      EL: /^\d{3} \d{2}$/,
+      ES: /^\d{5}$/,
+      FI: /^\d{5}$/,
+      FR: /^\d{3} \d{2}$/,
+      GB: /GIR[ ]?0AA|((AB|AL|B|BA|BB|BD|BH|BL|BN|BR|BS|BT|CA|CB|CF|CH|CM|CO|CR|CT|CV|CW|DA|DD|DE|DG|DH|DL|DN|DT|DY|E|EC|EH|EN|EX|FK|FY|G|GL|GY|GU|HA|HD|HG|HP|HR|HS|HU|HX|IG|IM|IP|IV|JE|KA|KT|KW|KY|L|LA|LD|LE|LL|LN|LS|LU|M|ME|MK|ML|N|NE|NG|NN|NP|NR|NW|OL|OX|PA|PE|PH|PL|PO|PR|RG|RH|RM|S|SA|SE|SG|SK|SL|SM|SN|SO|SP|SR|SS|ST|SW|SY|TA|TD|TF|TN|TQ|TR|TS|TW|UB|W|WA|WC|WD|WF|WN|WR|WS|WV|YO|ZE)(\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}))|BFPO[ ]?\d{1,4}/,
+      HR: /^\d{5}$/,
+      HU: /^\d{4}$/,
+      IE: /^IE\d[A-Z0-9\+\*|\d]\d{5}([A-Z]|WI)$/,
+      IT: /^\d{5}$/,
+      LT: /^LT\-\d{5}$/,
+      LU: /^\d{4}$/,
+      LV: /^LV\-\d{4}$/,
+      MT: /^\w{3} \d{2,4}$/,
+      NL: /^\d{4}[ ]?[A-Z]{2}$/,
+      PL: /^\d{2}-\d{3}$/,
+      PT: /^\d{4}([\-]\d{3})?$/,
+      RO: /^\d{6}$/,
+      SE: /^\d{3}[ ]?\d{2}$/,
+      SI: /^\d{4}$/,
+      SK: /^\d{3}[ ]?\d{2}$/
+    }.freeze
+    # rubocop:enable LineLength
+
+    def self.validate(country_code, postal_code)
+      return false unless POSTAL_REGEX.keys.include?(country_code.to_sym)
+      match_postal_code(postal_code, country_code)
+    end
+
+    def self.match_postal_code(postal_code, country_code)
+      if POSTAL_REGEX[country_code.to_sym].is_a?(Array)
+        POSTAL_REGEX[country_code.to_sym].each do |regex|
+          return true if regex.match(postal_code)
+        end
+      elsif POSTAL_REGEX[country_code.to_sym].match(postal_code)
+        return true
+      end
+      false
+    end
+  end
+end

data/lib/europe/vat/rates.rb

@@ -1,3 +1,5 @@
+require 'rexml/document'
+
 module Europe
   module Vat
     # Rates
@@ -12,14 +14,23 @@ module Europe
 
       def self.extract_rates(resp)
         rates = {}
-        doc = Nokogiri::XML(resp)
-        doc.css('body tbody tr')[2..-1].each do |data|
-          key = data.css('td').children[1].text.to_sym
-          rates[key] = data.css('td').children[2].text.to_f
+
+        data = resp.scan(%r{\<tbody\>(.*)\<\/tbody\>}m).first.first.strip
+        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
+        rates
+      end
+
       def self.fetch_rates
         resp = Net::HTTP.get_response(URI.parse(RATES_URL))
         resp.code.to_i == 200 ? resp.body : :failed

data/lib/europe/vat/vat.rb

@@ -1,22 +1,64 @@
 require 'europe/vat/rates'
 require 'europe/vat/format'
-require 'savon'
+require 'uri'
+require 'net/http'
+require 'rexml/document'
+require 'date'
 
 # Europe Gem
 module Europe
   # VAT
   module Vat
-    WSDL = 'http://ec.europa.eu/taxation_customs/' \
-           'vies/checkVatService.wsdl'.freeze
-    NS = 'urn:ec.europa.eu:taxud:vies:services:checkVat:types'.freeze
+    WSDL = 'http://ec.europa.eu/taxation_customs/vies/' \
+           'services/checkVatService'.freeze
+    HEADERS = {
+      'Content-Type' => 'text/xml;charset=UTF-8',
+      'SOAPAction' => ''
+    }.freeze
+
+    BODY = <<-XML.freeze
+      <soapenv:Envelope
+      xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+      xmlns:urn="urn:ec.europa.eu:taxud:vies:services:checkVat:types">
+        <soapenv:Header/>
+        <soapenv:Body>
+           <urn:checkVat>
+              <urn:countryCode>{COUNTRY_CODE}</urn:countryCode>
+              <urn:vatNumber>{NUMBER}</urn:vatNumber>
+           </urn:checkVat>
+        </soapenv:Body>
+      </soapenv:Envelope>
+    XML
+
     def self.validate(number)
       response = send_request(number[0..1], number[2..-1])
-      return :failed unless response.success?
-      response.body[:check_vat_response].tap { |x| x.delete(:@xmlns) }
-    rescue Savon::HTTPError, Savon::SOAPFault
-      return :failed
-    rescue Timeout::Error
+      return :failed unless response.is_a? Net::HTTPSuccess
+      setup_response(response)
+    rescue Net::OpenTimeout
       return :timeout
+    rescue Net::HTTPServerError
+      return :server_error
+    end
+
+    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: Date.parse(extract_data(body, 3)),
+        name: extract_data(body, 5),
+        address: extract_data(body, 6)
+      }
+    end
+
+    def self.response_xml(response)
+      xml = REXML::Document.new(response.body)
+      xml.first.elements.first.elements.first.elements
+    end
+
+    def self.extract_data(body, position)
+      body[position].text
     end
 
     def self.charge_vat?(origin_country, number)
@@ -30,12 +72,18 @@ module Europe
     end
 
     def self.send_request(country_code, number)
-      client = Savon.client(wsdl: WSDL, namespace: NS,
-                            open_timeout: 10, read_timeout: 10)
+      uri = URI.parse(WSDL)
+
+      body = BODY.dup.gsub('{COUNTRY_CODE}', country_code)
+      body = body.gsub('{NUMBER}', number)
+
+      # Create the HTTP objects
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Post.new(uri.request_uri, HEADERS)
+      request.body = body
 
-      client.call(:check_vat,
-                  message: { countryCode: country_code,
-                             vatNumber: number.delete(' ') })
+      # Send the request
+      http.request(request)
     end
   end
 end

data/lib/europe/version.rb

@@ -1,4 +1,4 @@
 # Europe version
 module Europe
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

data/test/europe/postal/format_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+module Europe
+  module Postal
+    # FormatTest
+    class FormatTest < Minitest::Test
+      def test_several_postal_codes
+        # Netherlands
+        assert Europe::Postal.validate('NL', '1000 AP')
+
+        # German
+        assert Europe::Postal.validate('DE', '02782')
+
+        # UK
+        assert Europe::Postal.validate('GB', 'SW1W 0NY')
+      end
+
+      def test_fail_several_postal_codes
+        # Netherlands
+        refute Europe::Postal.validate('NL', '1000x AP')
+
+        # German
+        refute Europe::Postal.validate('DE', 'BW02782')
+
+        # UK
+        refute Europe::Postal.validate('GB', 'XSW1Wxx 0NY')
+      end
+    end
+  end
+end

data/test/europe/vat/validation_test.rb

@@ -34,11 +34,10 @@ module Europe
 
       def test_failed_request_to_soap_service
         WebMock.enable!
-        stub_request(:any, 'http://ec.europa.eu/taxation_customs' \
-                           '/vies/checkVatService.wsdl').to_timeout
+        stub_request(:any, 'http://ec.europa.eu/taxation_customs/vies/services/checkVatService').to_timeout
         Europe::Vat.validate('DE115235681')
 
-        stub_request(:get, 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl')
+        stub_request(:get, 'http://ec.europa.eu/taxation_customs/vies/services/checkVatService')
           .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })
           .to_return(status: 421, body: '')
         Europe::Vat.validate('DE115235681')

metadata

@@ -1,37 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: europe
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - VvanGemert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -166,7 +152,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - europe.gemspec
@@ -176,6 +161,7 @@ files:
 - lib/europe/currency/currency.rb
 - lib/europe/currency/exchange_rates.rb
 - lib/europe/eurostat/eurostat.rb
+- lib/europe/postal/postal.rb
 - lib/europe/rake_task.rb
 - lib/europe/tasks/eurostat.rake
 - lib/europe/vat/format.rb
@@ -186,6 +172,7 @@ files:
 - test/europe/currency/currency_test.rb
 - test/europe/currency/exchange_rates_test.rb
 - test/europe/eurostat/eurostat_test.rb
+- test/europe/postal/format_test.rb
 - test/europe/vat/format_test.rb
 - test/europe/vat/rates_test.rb
 - test/europe/vat/validation_test.rb
@@ -219,6 +206,7 @@ test_files:
 - test/europe/currency/currency_test.rb
 - test/europe/currency/exchange_rates_test.rb
 - test/europe/eurostat/eurostat_test.rb
+- test/europe/postal/format_test.rb
 - test/europe/vat/format_test.rb
 - test/europe/vat/rates_test.rb
 - test/europe/vat/validation_test.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 VvanGemert
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.