valvat 0.8.1 → 1.0.1

data/gemfiles/activemodel-3-2

@@ -1,8 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
 gem "activemodel", "~> 3.2"
 
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../"

data/gemfiles/activemodel-4

@@ -1,8 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
 gem "activemodel", "~> 4.2"
 
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../"

data/gemfiles/activemodel-5

@@ -1,8 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
-gem "activemodel", "~> 5.0.2"
+gem "activemodel", "~> 5.2.0"
 
-gem 'rspec', '~> 3.0'
 gem 'rack'
-gem 'rake'
+
+gemspec path: "../"

data/gemfiles/activemodel-6

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 6.0.0"
+
+gem 'rack'
+
+gemspec path: "../"

data/gemfiles/before-ruby21/activemodel-3-2

@@ -1,9 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "nokogiri",    "< 1.7"
-gem "savon",       ">=2.3.0"
 gem "activemodel", "~> 3.2"
 
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../../"

data/gemfiles/before-ruby21/activemodel-4

@@ -1,9 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "nokogiri",    "< 1.7"
-gem "savon",       ">=2.3.0"
 gem "activemodel", "~> 4.2"
 
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../../"

data/gemfiles/before-ruby21/standalone

@@ -1,8 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "nokogiri",    "< 1.7"
-gem "savon",       ">=2.3.0"
 
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../../"

data/gemfiles/standalone

@@ -1,7 +1,5 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "savon",       ">=2.3.0"
-
-gem 'rspec', '~> 3.0'
 gem 'rack', '< 2'
-gem 'rake'
+
+gemspec path: "../"

data/lib/active_model/validations/valvat_validator.rb

@@ -5,6 +5,20 @@ require 'valvat/lookup'
 module ActiveModel
   module Validations
     class ValvatValidator < EachValidator
+      def initialize(options)
+        if options[:lookup]
+          options[:lookup] = if options[:lookup] == :fail_if_down
+            {fail_if_down: true}
+          elsif options[:lookup].is_a?(Hash)
+            options[:lookup]
+          else
+            {}
+          end
+        end
+
+        super
+      end
+
       def validate_each(record, attribute, value)
         vat = Valvat(value)
         iso_country_code = vat.iso_country_code
@@ -17,10 +31,10 @@ module ActiveModel
 
         iso_country_code = "eu" if iso_country_code.blank?
         record.errors.add(attribute, :invalid_vat,
-          :message => options[:message],
-          :country_adjective => I18n.t(
+          message: options[:message],
+          country_adjective: I18n.t(
             :"valvat.country_adjectives.#{iso_country_code.downcase}",
-            :default => [:"valvat.country_adjectives.eu", "european"]
+            default: [:"valvat.country_adjectives.eu", "european"]
           )
         )
       end
@@ -43,9 +57,10 @@ module ActiveModel
 
       def vat_exists?(vat)
         return true unless options[:lookup]
-        is_valid = vat.exists?
+
+        is_valid = vat.exists?(options[:lookup])
         return is_valid unless is_valid.nil?
-        options[:lookup] != :fail_if_down
+        !options[:lookup][:fail_if_down]
       end
     end
   end

data/lib/valvat.rb

@@ -1,7 +1,9 @@
+require 'valvat/error'
 require 'valvat/local'
 require 'valvat/lookup'
 require 'valvat/lookup/request'
-require 'valvat/lookup/request_with_id'
+require 'valvat/lookup/response'
+require 'valvat/lookup/fault'
 require 'active_model/validations/valvat_validator' if defined?(ActiveModel)
 
 class Valvat

data/lib/valvat/checksum/gb.rb

@@ -3,33 +3,50 @@ class Valvat
     class GB < Base
       OLD_FORMAT_FORBIDDEN_RANGES = [(100_000..999_999), (9_490_001..9_700_000), (9_990_001..9_999_999)]
       NEW_FORMAT_FORBIDDEN_RANGES = [(1..100_000), (100_001..1_000_000)]
+      GOV_NUMBER = /\A(GD[0-4]{1}\d{2})\Z/
+      HEALTH_NUMBER = /\A(HA[5-9]{1}\d{2})\Z/
 
       def validate
         vat_number = vat.to_s_wo_country
-        check_sum  = vat.to_s_wo_country[7..8].to_i
-        vat_base = vat_number[0..6]
 
         # government departments and health authorities, so no checksum
-        return true if vat_number =~ /\A(GD[0-4]{1}\d{2})\Z/ || vat_number =~ /\A(HA[5-9]{1}\d{2})\Z/
-        return false if vat_number =~ /\A0{9}\Z/ || vat_number =~ /\A0{12}\Z/
+        return true if gov_or_health?(vat_number)
+        return false if all_zero?(vat_number)
 
-        vat_base_sum = vat_base.split('').
-          map(&:to_i).
-          zip([8, 7, 6, 5, 4, 3, 2]).
-          map { |vat_number_digit, multiplier| vat_number_digit * multiplier }.
-          inject(:+)
+        checksum  = vat_number[7..8].to_i
+        vat_base = vat_number[0..6]
+        vat_base_int = vat_base.to_i
+        vat_base_sum = generate_vat_base_sum(vat_base)
 
-        old_format_remainder = (vat_base_sum + check_sum).modulo(97)
-        new_format_remainder = (vat_base_sum + 55 + check_sum).modulo(97)
+        old_format_remainder = (vat_base_sum + checksum).modulo(97)
+        new_format_remainder = (vat_base_sum + 55 + checksum).modulo(97)
 
         return false if old_format_remainder == 0 &&
-          OLD_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base.to_i }
+          OLD_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base_int }
 
         return false if new_format_remainder == 0 &&
-          NEW_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base.to_i }
+          NEW_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base_int }
 
         old_format_remainder == 0 || new_format_remainder == 0
       end
+
+      private
+
+      def gov_or_health?(vat_number)
+        vat_number =~ GOV_NUMBER || vat_number =~ HEALTH_NUMBER
+      end
+
+      def all_zero?(vat_number)
+        vat_number =~ /\A0{9}\Z/ || vat_number =~ /\A0{12}\Z/
+      end
+
+      def generate_vat_base_sum(vat_base)
+        vat_base.split('').
+          map(&:to_i).
+          zip([8, 7, 6, 5, 4, 3, 2]).
+          map { |vat_number_digit, multiplier| vat_number_digit * multiplier }.
+          inject(:+)
+      end
     end
   end
 end

data/lib/valvat/checksum/ie.rb

@@ -6,7 +6,7 @@ class Valvat
           fig*(i+2)
         end
         if str_wo_country.size == 9
-          total += (CHARS.index(str_wo_country[8]) * 9)
+          total += ((CHARS.index(str_wo_country[8]) || 0)  * 9)
         end
         total.modulo(23)
       end

data/lib/valvat/checksum/nl.rb

@@ -1,6 +1,11 @@
 class Valvat
   module Checksum
     class NL < Base
+      def validate
+        vat.to_s.gsub(/[A-Z]/) { |let| (let.ord - 55).to_s }.to_i % 97 == 1 ||
+        super
+      end
+
       def check_digit
         sum_figures_by do |fig, i|
           fig*(i+2)

data/lib/valvat/checksum/si.rb

@@ -8,8 +8,8 @@ class Valvat
 
       def check_digit
         chk = sum_of_figues_for_pt_si
-        chk == 1 ? 0 : chk
+        chk == 10 ? 0 : chk
       end
     end
   end
-end
+end

data/lib/valvat/error.rb

@@ -0,0 +1,28 @@
+class Valvat
+  Error = Class.new(RuntimeError)
+
+  class ViesError < Error
+    def initialize(faultstring='UNKNOWN')
+      @faultstring = faultstring
+    end
+
+    def to_s
+      "The VIES web service returned the error '#{@faultstring}'."
+    end
+
+    def eql?(other)
+      to_s.eql?(other.to_s)
+    end
+  end
+  ViesMaintenanceError = Class.new(ViesError)
+
+  ServiceUnavailable = Class.new(ViesMaintenanceError)
+  MemberStateUnavailable = Class.new(ViesMaintenanceError)
+
+  Timeout = Class.new(ViesError)
+  InvalidRequester = Class.new(ViesError)
+  BlockedError = Class.new(ViesError)
+  RateLimitError = Class.new(ViesError)
+
+  UnknownViesError = Class.new(ViesError)
+end

data/lib/valvat/local.rb

@@ -22,8 +22,9 @@ class Valvat
     Valvat::Utils.vat_country_to_iso_country(vat_country_code)
   end
 
+  # TODO: Remove method / not in use
   def european?
-    Valvat::Utils::EU_COUNTRIES.include?(iso_country_code)
+    Valvat::Utils::EU_MEMBER_STATES.include?(iso_country_code)
   end
 
   def to_a

data/lib/valvat/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   errors:
     messages:
-      invalid_vat: is not a valid %{country_adjective} vat number
+      invalid_vat: is not a valid %{country_adjective} VAT number
   valvat:
     country_adjectives:
       eu: European

data/lib/valvat/locales/fr.yml

@@ -5,29 +5,29 @@ fr:
   valvat:
     country_adjectives:
       eu: intracommunautaire
-      at: autrichienne
+      at: autrichien
       be: belge
       bg: bulgare
       cy: chypriote
       cz: tchèque
-      de: allemande
-      dk: danoise
+      de: allemand
+      dk: danois
       ee: estonien
-      es: espagnole
-      fi: finlandaise
-      fr: française
+      es: espagnol
+      fi: finlandais
+      fr: français
       gb: britannique
-      gr: grèque
-      ie: irlandaise
-      it: italienne
-      lt: lituanienne
-      lu: luxembourgeoise
-      lv: lettone
+      gr: grec
+      ie: irlandais
+      it: italien
+      lt: lituanien
+      lu: luxembourgeois
+      lv: letton
       mt: maltais
-      nl: hollandaise
-      pl: polonaise
-      pt: portugaise
-      ro: roumaine
-      se: suédoise
+      nl: hollandais
+      pl: polonais
+      pt: portugais
+      ro: roumain
+      se: suédois
       si: slovène
       sk: slovaque

data/lib/valvat/locales/pt.yml

@@ -4,31 +4,31 @@ pt:
       invalid_vat: O NIF %{country_adjective} não é válido.
   valvat:
     country_adjectives:
-    eu: europeu
-    at: austríaco
-    be: belga
-    bg: búlgaro
-    cy: cipriota
-    cz: checo
-    de: alemão
-    dk: dinamarquês
-    ee: estónio
-    es: espanhol
-    fi: finlandês
-    fr: francês
-    gb: britânico
-    gr: grego
-    hu: húngaro
-    ie: irlandês
-    it: italiano
-    lt: lituano
-    lu: luxemburguês
-    lv: letão
-    mt: maltês
-    nl: holandês
-    pl: polaco
-    pt: português
-    ro: romeno
-    se: sueco
-    si: esloveno
-    sk: eslovaco
+      eu: europeu
+      at: austríaco
+      be: belga
+      bg: búlgaro
+      cy: cipriota
+      cz: checo
+      de: alemão
+      dk: dinamarquês
+      ee: estónio
+      es: espanhol
+      fi: finlandês
+      fr: francês
+      gb: britânico
+      gr: grego
+      hu: húngaro
+      ie: irlandês
+      it: italiano
+      lt: lituano
+      lu: luxemburguês
+      lv: letão
+      mt: maltês
+      nl: holandês
+      pl: polaco
+      pt: português
+      ro: romeno
+      se: sueco
+      si: esloveno
+      sk: eslovaco

data/lib/valvat/lookup.rb

@@ -1,36 +1,23 @@
-require 'savon'
-
 class Valvat
   class Lookup
-    VIES_WSDL_URL = 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl'
-    REMOVE_KEYS = [:valid, :@xmlns]
-
-    attr_reader :vat, :options
 
     def initialize(vat, options={})
       @vat = Valvat(vat)
       @options = options || {}
-      @options[:requester_vat] = Valvat(requester_vat) if requester_vat
+      @options[:requester] ||= @options[:requester_vat]
     end
 
     def validate
-      return false unless vat.european?
+      return false if !@options[:skip_local_validation] && !@vat.valid?
+      return handle_vies_error(response[:error]) if response[:error]
 
-      valid? && show_details? ? response_details : valid?
-    rescue => error
-      return false if invalid_input?(error)
-      raise error  if options[:raise_error]
-      nil
+      response[:valid] && show_details? ? response.to_hash : response[:valid]
     end
 
     class << self
       def validate(vat, options={})
         new(vat, options).validate
       end
-
-      def client
-        @client ||= Savon::Client.new(wsdl: VIES_WSDL_URL, log: false)
-      end
     end
 
     private
@@ -40,37 +27,18 @@ class Valvat
     end
 
     def response
-      @response ||= request.perform(self.class.client)
-    end
-
-    def request
-      if requester_vat
-        RequestWithId.new(vat, requester_vat)
-      else
-        Request.new(vat)
-      end
-    end
-
-    def requester_vat
-      options[:requester_vat]
-    end
-
-    def invalid_input?(err)
-      return if !err.respond_to?(:to_hash) || !err.to_hash[:fault]
-      (err.to_hash[:fault][:faultstring] || "").upcase =~ /INVALID_INPUT/
+      @response ||= Request.new(@vat, @options).perform
     end
 
     def show_details?
-      requester_vat || options[:detail]
+      @options[:requester] || @options[:detail]
     end
 
-    def response_details
-      response.inject({}) do |hash, kv|
-        key, value = kv
-        unless REMOVE_KEYS.include?(key)
-          hash[key.to_s.sub(/^trader_/, "").to_sym] = (value == "---" ? nil : value)
-        end
-        hash
+    def handle_vies_error(error)
+      if ViesMaintenanceError === error
+        raise error if @options[:raise_error]
+      else
+        raise error unless @options[:raise_error] == false
       end
     end
   end