valvat 0.2.1 → 0.2.2

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.2.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.2.2...master)
+
+### 0.2.2 / 2011-01-10
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.2.1...v0.2.2)
+
+* Using vies directly via soap/savon again; isvat.appspot.com is not _really_ reliable.
+* Added support for Valvat#exist? as an alias of Valvat#exists?
 
 ### 0.2.1 / 2011-01-07
 

data/README.md

@@ -6,8 +6,8 @@ Validates european vat numbers. Standalone or as a ActiveModel validator.
 
 * Simple syntax verification
 * Lookup via the VIES web service
-* Works standalone without any gem dependencies
 * (Optional) ActiveModel/Rails3 integration
+* Works standalone without ActiveModel
 * I18n locales for country specific error messages
 
 valvat is tested and works with ruby 1.8.7/1.9.2 and ActiveModel 3.0.
@@ -70,13 +70,13 @@ By default blank vat numbers validate to false. To change this add the `:allow_b
     
 To allow vat numbers from outside of europe, add something like this to your model (country_code should return a upcase iso country code):
 
-  class MyModel < ActiveRecord::Base
-    validates :vat_number, :valvat => true, :if => :eu?
-    
-    def eu?
-      Valvat::Utils::EU_COUNTRIES.include?(country_code)
+    class MyModel < ActiveRecord::Base
+      validates :vat_number, :valvat => true, :if => :eu?
+      
+      def eu?
+        Valvat::Utils::EU_COUNTRIES.include?(country_code)
+      end
     end
-  end
 
 ### Utilities
 
@@ -114,7 +114,6 @@ This basically just removes trailing spaces and ensures all chars are uppercase.
 * [VIES web service](http://ec.europa.eu/taxation_customs/vies)
 * [European vat number formats (german)](http://bzst.de/DE/Steuern_International/USt_Identifikationsnummer/Merkblaetter/Aufbau_USt_IdNr.html)
 * [European vat number formats on Wikipedia](http://en.wikipedia.org/wiki/European_Union_Value_Added_Tax)
-* [isvat VIES REST wrapper](http://isvat.appspot.com/)
 
 ### BlaBla
 

data/lib/valvat.rb

@@ -13,6 +13,7 @@ class Valvat
   def exists?
     Valvat::Lookup.validate(self)
   end
+  alias_method :exist?, :exists?
   
   def iso_country_code
     Valvat::Utils.vat_country_to_iso_country(vat_country_code)

data/lib/valvat/lookup.rb

@@ -4,20 +4,37 @@ require 'yaml'
 
 class Valvat
   module Lookup
+    
     def self.validate(vat)
       vat = Valvat(vat)
       return false unless vat.european?
-      result = begin
-        YAML.load(Net::HTTP.start("isvat.appspot.com", 80) {|http|
-          http.get("/#{vat.to_a.join("/")}/")
-        }.body)
+      
+      begin
+        client.request("n1", "checkVat") do
+          soap.body = {"n1:countryCode" => vat.vat_country_code, "n1:vatNumber" => vat.to_s_wo_country}
+          soap.namespaces["xmlns:n1"] = "urn:ec.europa.eu:taxud:vies:services:checkVat:types"
+        end.to_hash[:check_vat_response][:valid]
       rescue => err
-        # Ugly, ugly for better specs
-        raise if defined?(FakeWeb::NetConnectNotAllowedError) && FakeWeb::NetConnectNotAllowedError === err
+        if err.respond_to?(:to_hash) && err.to_hash[:fault] && err.to_hash[:fault][:faultstring] == "{ 'INVALID_INPUT' }"
+          return false
+        end
         nil
       end
-      
-      result.is_a?(Hash) && result["error_code"] == 1 ? nil : result
+    end
+
+    def self.client
+      @client ||= begin
+        # Require Savon only if really needed!
+        require 'savon' unless defined?(Savon)
+
+        # Quiet down Savon and HTTPI
+        Savon.logger.level = Logger::WARN
+        HTTPI.logger.level = Logger::WARN
+
+        Savon::Client.new do
+          wsdl.document = 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl'
+        end
+      end
     end
   end
 end

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/valvat/lookup_spec.rb

@@ -3,9 +3,6 @@ require 'spec_helper'
 describe Valvat::Lookup do
   context "#validate" do
     context "existing vat number" do
-      before do
-        FakeWeb.register_uri(:get, "http://isvat.appspot.com/BE/0817331995/", :body => "true")
-      end if $fakeweb
       
       it "returns true" do
         Valvat::Lookup.validate("BE0817331995").should eql(true)
@@ -17,12 +14,8 @@ describe Valvat::Lookup do
     end
     
     context "not existing vat number" do
-      before do
-        FakeWeb.register_uri(:get, "http://isvat.appspot.com/BE/0817331995/", :body => "false")
-      end if $fakeweb
-      
       it "returns false" do
-        Valvat::Lookup.validate("BE0817331995").should eql(false)
+        Valvat::Lookup.validate("BE08173319921").should eql(false)
       end
     end
     
@@ -35,15 +28,16 @@ describe Valvat::Lookup do
       end
     end
     
-    context "country web service down" do
-      before do
-        json = "{\"error_message\": \"Member State service unavailable.\", \"error_code\": 1, \"error\": true}"
-        FakeWeb.register_uri(:get, "http://isvat.appspot.com/DE/259597697/", :body => json)
-      end if $fakeweb
-      
-      it "returns nil" do
-        Valvat::Lookup.validate("DE259597697").should eql(nil)
-      end
-    end
+    # TODO : Reactivate with coorect "down" response
+    # context "country web service down" do
+    #   before do
+    #     json = "{\"error_message\": \"Member State service unavailable.\", \"error_code\": 1, \"error\": true}"
+    #     FakeWeb.register_uri(:get, "http://isvat.appspot.com/DE/259597697/", :body => json)
+    #   end if $fakeweb
+    #   
+    #   it "returns nil" do
+    #     Valvat::Lookup.validate("DE259597697").should eql(nil)
+    #   end
+    # end
   end
 end

data/spec/valvat_spec.rb

@@ -39,15 +39,17 @@ describe Valvat do
       end
     end
     
-    context "#exist?" do
+    context "#exist(s)?" do
       context "on existing vat numbers" do
         before do
           Valvat::Lookup.stub(:validate => true)
         end
         
         it "returns true" do
-          de_vat.should be_exist
-          gr_vat.should be_exist
+          de_vat.exists?.should eql(true)
+          gr_vat.exists?.should eql(true)
+          de_vat.exist?.should eql(true)
+          gr_vat.exist?.should eql(true)
         end
       end
       
@@ -57,7 +59,8 @@ describe Valvat do
         end
         
         it "returns false" do
-          at_vat.should_not be_exist
+          at_vat.exists?.should eql(false)
+          at_vat.exist?.should eql(false)
         end
       end
     end

data/valvat.gemspec

@@ -27,10 +27,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_development_dependency 'rspec', '>= 2.4.0'
+  s.add_dependency             'savon',       '>=0.8.2'
+  
+  s.add_development_dependency 'rspec',       '>= 2.4.0'
   s.add_development_dependency 'guard-rspec', '>=0.1.9'
-  s.add_development_dependency 'growl', '>=1.0.3'
-  s.add_development_dependency 'rb-fsevent', '>=0.3.9'
+  s.add_development_dependency 'growl',       '>=1.0.3'
+  s.add_development_dependency 'rb-fsevent',  '>=0.3.9'
   s.add_development_dependency 'activemodel', '>=3.0'
-  s.add_development_dependency 'fakeweb'
+  s.add_development_dependency 'fakeweb',     '>= 1.3.0'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sebastian Munz
@@ -14,13 +14,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: savon
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 2
+        version: 0.8.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,11 +46,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +61,11 @@ dependencies:
         - 9
         version: 0.1.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: growl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +76,11 @@ dependencies:
         - 3
         version: 1.0.3
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rb-fsevent
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,11 +91,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,20 +105,22 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: "  Validates european vat numbers. Standalone or as a ActiveModel validator.\n  \n  * Simple syntax verification\n  * Lookup via the VIES web service\n  * Works standalone without any gem dependencies\n  * (Optional) ActiveModel/Rails3 integration\n  * I18n locales for country specific error messages\n"
 email: 
 - sebastian@yo.lk