validates_as_vat_number 1.0.0 → 1.0.1

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+*.gemspec

data/CHANGELOG

@@ -0,0 +1,3 @@
+1.0.1
+
+* changed to the new WSDL address

data/README.markdown

@@ -1,6 +1,6 @@
 ## validates_as_vat_number
 
-Now you can validate a VAT using the European service called VIES, to ensure it exists. Only require this gem and call validate_as_vat_number on your VAT field, in an Active Record object.
+Now you can validate VAT using the European service called [VIES](http://ec.europa.eu/taxation_customs/vies/viesspec.do), to ensure it exists. Only require this gem and call validate_as_vat_number on your VAT field, in an Active Record object.
 
 ## Install 
 
@@ -19,6 +19,7 @@ Then install it.
     	validates_as_vat_number :vat
     end
 
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "validates_as_vat_number"
     gem.summary = "Permits VAT validation within ActiveRecord using EU VIES Web Service."
-    gem.description = "Now you can validate a VAT using the European service called VIES, 
+    gem.description = "Now you can validate VAT using the European service called VIES, 
                        to ensure it exists. Only require this gem and call validate_as_vat_number 
                        on your VAT field, in an Active Record object."
     gem.email = "lab@develon.com"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/validates_as_vat_number.rb

@@ -21,20 +21,20 @@ module Develon
                      'SK' =>/^SK\d{10}$/ }
 
       validates_each(attr_names,configuration) do |record, attr_name, value|
-        if iso3661_country_codes.include?(value[0,2].upcase)
-          if structures[value[0,2].upcase].match(value).nil? || check_vat(value[0,2], value.gsub(/^\w\w/, '')) == false
-            record.errors.add(attr_name, :not_valid, :default => configuration[:message])
-          end
+        country = country_code(value)
+        if iso3661_country_codes.include?(country)
+          message = configuration[:message] unless structures[country].match(value) && check_vat(country, value.gsub(/^\w\w/, ''))
         else
-          record.errors.add(attr_name, 'has an invalid country')
+          message = 'has an invalid country'
         end
+        record.errors.add(attr_name, :not_valid, :default => message) unless message.nil?
       end
     end
 
     protected
 
     def vies_driver
-      wsdl = "http://ec.europa.eu/taxation_customs/vies/api/checkVatPort?wsdl"
+      wsdl = "http://ec.europa.eu/taxation_customs/vies/services/checkVatService?wsdl"
       @driver = SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
     end
 
@@ -42,6 +42,10 @@ module Develon
       @driver = vies_driver unless @driver
       @driver.checkVat(:countryCode => country_code, :vatNumber => vat_number).valid == 'true'
     end
+    
+    def country_code(vat)
+      vat[0,2].upcase
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_as_vat_number
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Alessandro Dal Grande
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +01:00
+date: 2010-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
         version: 1.2.9
     version: 
 description: |-
-  Now you can validate a VAT using the European service called VIES, 
+  Now you can validate VAT using the European service called VIES, 
                          to ensure it exists. Only require this gem and call validate_as_vat_number 
                          on your VAT field, in an Active Record object.
 email: lab@develon.com
@@ -39,6 +39,7 @@ files:
 - .autotest
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.markdown
 - Rakefile