vat_validator 1.1 → 1.2

data/Rakefile

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
 
 desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = Rake::FileList["spec/**/*_spec.rb"]
-  t.spec_opts  = ["-c"]
+task :spec do
+  puts `rspec spec/vat_validator/*_spec.rb`
 end
  
 task :default => :spec

data/lib/exceptions.rb

@@ -0,0 +1,3 @@
+module VatValidator
+  class ViesContactError < StandardError; end
+end

data/lib/vat_validator.rb

@@ -1,5 +1,6 @@
 require 'active_model'
-require 'vies_checker'
+require 'exceptions'
+require 'vies_checker' rescue nil
 
 module VatValidator
   
@@ -41,23 +42,37 @@ module VatValidator
     def validate_each(record, attribute, value)
       format_valid = true
       
-      if options[:country_method]
-        country_code = record.send(options[:country_method]).to_s
-        unless VAT_PATTERNS.has_key?(country_code) && value.to_s =~ VAT_PATTERNS[country_code]
-          record.errors.add(attribute, options[:message])
-          format_valid = false
-        end
-      else
-        unless value =~ VAT_PATTERNS.values.detect { |p| value.to_s =~ p }
-          record.errors.add(attribute, options[:message])
-          format_valid = false
-        end
+      country_code = options[:country_method] ? record.send(options[:country_method]).to_s : nil
+      unless VatNumber.new(value, country_code).valid?
+        record.errors.add(attribute, options[:message])
+        format_valid = false
       end
       
       if format_valid && options[:vies]
-        unless ViesChecker.check(value.to_s[0..1], value.to_s[2..15])
-          record.errors.add(attribute, options[:message])
+        if options[:vies_host]
+          valid = ViesChecker.check(value, options[:vies_host])
+        else
+          valid = ViesChecker.check(value)
         end
+
+        unless valid
+         record.errors.add(attribute, options[:message])
+        end
+      end
+    end
+  end
+  
+  class VatNumber
+    def initialize(number, country_code = nil)
+      @number = number
+      @country_code = country_code
+    end
+    
+    def valid?
+      if @country_code
+        VAT_PATTERNS.has_key?(@country_code) && @number.to_s =~ VAT_PATTERNS[@country_code]
+      else
+        VAT_PATTERNS.values.detect { |p| @number.to_s =~ p }
       end
     end
   end

data/lib/vies_checker.rb

@@ -1,20 +1,48 @@
 require 'rubygems'
-require 'soap/wsdlDriver'
+require 'savon'
+
+# Errors:
+# from http://blog.riff.org/2007_04_08_soap_box_accessing_vies_from_phpgtk
+# 'INVALID_INPUT'       => 'The provided CountryCode is invalid or the VAT number is empty',
+# 'SERVICE_UNAVAILABLE' => 'The SOAP service is unavailable, try again later',
+# 'MS_UNAVAILABLE'      => 'The Member State service is unavailable, try again later or with another Member State',
+# 'TIMEOUT'             => 'The Member State service could not be reached in time, try again later or with another Member State',
+# 'SERVER_BUSY'         => 'The service cannot process your request. Try again later.'
 
 module VatValidator
   class ViesChecker
-  
-    WSDL = 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl'
-  
-    class << self
-     def check(country_code, vat_number)
-       begin
-         proxy = SOAP::WSDLDriverFactory.new(WSDL).create_rpc_driver
-         return proxy.checkVat(:countryCode => country_code, :vatNumber => vat_number).valid
-       rescue
-        false
-       end
-     end
+    def self.check(complete_vat_number, vies_host='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl')
+
+      country_code = complete_vat_number[0..1]
+      vat_number   = complete_vat_number[2..15]
+
+      client = Savon::Client.new(vies_host)
+
+      begin
+        response = client.request :check_vat do
+          soap.body = {
+            :country_code => country_code, 
+            :vat_number => vat_number
+          }
+        end
+
+      rescue Savon::SOAP::Fault => fault
+        # https://github.com/rubiii/savon/blob/master/lib/savon/soap/fault.rb
+        if fault.to_hash[:fault][:faultstring] == "{ 'INVALID_INPUT' }"
+          return false
+        else
+          raise ViesContactError
+        end
+
+      rescue
+        raise ViesContactError
+      end
+
+      if response.success?
+        return response[:check_vat_response][:valid]
+      else
+        raise ViesContactError
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'active_model'
 
 require File.dirname(__FILE__) + '/../lib/vat_validator.rb'
@@ -48,6 +48,10 @@ class CountryCheckedInvoice < BaseTestModel
   end
 end
 
-class ViesCheckedInvoice < BaseTestModel  
+class ViesCheckedInvoice < BaseTestModel
   validates :vat_number, :vat => {:vies => true}
-end
+end
+
+class WrongViesCheckedInvoice < BaseTestModel
+  validates :vat_number, :vat => {:vies => true, :vies_host => 'http://agilitic.com/wrong.wsdl'}
+end

data/spec/vat_validator/validations_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Invoice do

data/spec/vat_validator/vies_checker_spec.rb

@@ -5,10 +5,20 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe ViesCheckedInvoice do
   it "should be valid if vat number is correct" do
+  	VatValidator::ViesChecker.check('BE0817331995').should be_true
     ViesCheckedInvoice.new(:vat_number => 'BE0817331995').should be_valid
   end
   
   it "should not be valid if vat number is correct" do
+  	VatValidator::ViesChecker.check('BE000678345').should_not be_true
     ViesCheckedInvoice.new(:vat_number => 'BE000678345').should_not be_valid
   end
+
+  it "should not be valid if the input is not valid" do
+  	VatValidator::ViesChecker.check('blop').should_not be_true
+  end
+
+  it "should raise an exception if VIES is unreachable" do
+    lambda {WrongViesCheckedInvoice.new(:vat_number => 'BE0817331995').valid?}.should raise_error(VatValidator::ViesContactError)
+  end
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: vat_validator
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
-- "Aur\xC3\xA9lien Malisart"
+- Aurelien Malisart
+- Francois Stephany
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 +02:00
-default_executable: 
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: soap
+  name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,19 +32,37 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: soap4r
+  name: savon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 53
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id003
 description: Validator for european countries VAT numbers for ActiveModel
 email: aurelien.malisart@gmail.com
 executables: []
@@ -54,6 +72,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- lib/exceptions.rb
 - lib/vat_validator.rb
 - lib/vies_checker.rb
 - spec/spec_helper.rb
@@ -61,7 +80,6 @@ files:
 - spec/vat_validator/vies_checker_spec.rb
 - README.rdoc
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/aurels/vat_validator
 licenses: []
 
@@ -93,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Validator for european countries VAT numbers for ActiveModel