valvat 0.4.1 → 0.4.2

data/.rbenv-gemsets

@@ -0,0 +1 @@
+plugin

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p286

data/CHANGES.md

@@ -1,6 +1,14 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.4.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.4.2...master)
+
+### 0.4.2 / 2012-11-16
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.4,1...v0.4.2)
+
+* Fixed usage with savon version 1.2
+* Require version 1.2 of the savon gem from now on
+* Added :raise_error option to throw errors instead of returning nil
 
 ### 0.4.1 / 2012-07-17
 

data/lib/valvat/lookup.rb

@@ -9,19 +9,19 @@ class Valvat
       vat = Valvat(vat)
       return false unless vat.european?
 
-      request = options[:requester_vat] ? 
-        Valvat::Lookup::RequestWithId.new(vat, Valvat(options[:requester_vat])) : 
+      request = options[:requester_vat] ?
+        Valvat::Lookup::RequestWithId.new(vat, Valvat(options[:requester_vat])) :
         Valvat::Lookup::Request.new(vat)
-      
+
       begin
         response = request.perform(self.client)
-        response[:valid] && (options[:detail] || options[:requester_vat]) ? 
+        response[:valid] && (options[:detail] || options[:requester_vat]) ?
           filter_detail(response) : response[:valid]
       rescue => err
-        @last_error = err
-        if err.respond_to?(:to_hash) && err.to_hash[:fault] && err.to_hash[:fault][:faultstring] == "{ 'INVALID_INPUT' }"
+        if err.respond_to?(:to_hash) && err.to_hash[:fault] && e(rr.to_hash[:fault][:faultstring] || "").upcase =~ /INVALID_INPUT/
           return false
         end
+        raise err if options[:raise_error]
         nil
       end
     end
@@ -37,20 +37,14 @@ class Valvat
         end
         HTTPI.log = false
 
-        Savon::Client.new do
-          wsdl.document = 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl'
-        end
+        Savon::Client.new('http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl')
       end
     end
-    
-    def self.last_error
-      @last_error
-    end
-    
+
     private
-    
-    REMOVE_KEYS = [:valid, :@xmlns] 
-    
+
+    REMOVE_KEYS = [:valid, :@xmlns]
+
     def self.filter_detail(response)
       response.inject({}) do |hash, kv|
         key, value = kv

data/lib/valvat/lookup/request.rb

@@ -4,24 +4,23 @@ class Valvat
       def initialize(vat)
         @vat = vat
       end
-      
+
       def perform(client)
-        client.request("n1", action) do
-          soap.body = body
-          soap.namespaces["xmlns:n1"] = "urn:ec.europa.eu:taxud:vies:services:checkVat:types"    
+        client.request(action) do |r|
+          r.body = body
         end.to_hash[response_key]
       end
-      
+
       private
-      
+
       def body
-        {"n1:countryCode" => @vat.vat_country_code, "n1:vatNumber" => @vat.to_s_wo_country}
+        {:country_code => @vat.vat_country_code, :vat_number => @vat.to_s_wo_country}
       end
-      
+
       def action
-        "checkVat"
+        :check_vat
       end
-      
+
       def response_key
         :check_vat_response
       end

data/lib/valvat/lookup/request_with_id.rb

@@ -5,20 +5,20 @@ class Valvat
         @vat = vat
         @requester_vat = requester_vat
       end
-      
+
       private
-      
+
       def body
         super.merge(
-          "n1:requesterCountryCode" => @requester_vat.vat_country_code, 
-          "n1:requesterVatNumber" => @requester_vat.to_s_wo_country
+          :requester_country_code => @requester_vat.vat_country_code,
+          :requester_vat_number => @requester_vat.to_s_wo_country
         )
       end
-      
+
       def action
-        "checkVatApprox"
+        :check_vat_approx
       end
-      
+
       def response_key
         :check_vat_approx_response
       end

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/spec_helper.rb

@@ -6,6 +6,13 @@ require File.dirname(__FILE__) + '/../lib/valvat.rb'
 
 $fakeweb = true
 
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end
+
 class ModelBase
   include ActiveModel::Serialization
   include ActiveModel::Validations

data/spec/valvat/lookup_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Valvat::Lookup do
-  context "#validate" do
+  describe "#validate" do
     context "existing vat number" do
 
       it "returns true" do
@@ -27,41 +27,41 @@ describe Valvat::Lookup do
         Valvat::Lookup.validate("").should eql(false)
       end
     end
-    
+
     context "with details" do
       it "returns hash of details instead of true" do
         Valvat::Lookup.validate("IE6388047V", :detail => true).should eql({
-          :country_code=>"IE", 
-          :vat_number=>"6388047V", 
-          :request_date=> Date.today, 
-          :name=>"GOOGLE IRELAND LIMITED", 
+          :country_code=>"IE",
+          :vat_number=>"6388047V",
+          :request_date=> Date.today,
+          :name=>"GOOGLE IRELAND LIMITED",
           :address=>"1ST & 2ND FLOOR ,GORDON HOUSE ,BARROW STREET ,DUBLIN 4"
         })
-        
+
         Valvat::Lookup.validate("LU21416127", :detail => true).should eql({
-          :country_code=>"LU", 
-          :vat_number=>"21416127", 
-          :request_date=> Date.today, 
-          :name=>"EBAY EUROPE S.A R.L.", 
+          :country_code=>"LU",
+          :vat_number=>"21416127",
+          :request_date=> Date.today,
+          :name=>"EBAY EUROPE S.A R.L.",
           :address=>"22, BOULEVARD ROYAL\nL-2449  LUXEMBOURG"
         })
       end
-      
+
       it "still returns false on not existing vat number" do
         Valvat::Lookup.validate("BE08173319921", :detail => true).should eql(false)
       end
     end
-    
+
     context "with request identifier" do
       it "returns hash of details instead of true" do
         response = Valvat::Lookup.validate("LU21416127", :requester_vat => "IE6388047V")
         response[:request_identifier].size.should eql(16)
         response[:request_identifier] = "some_uniq_string"
         response.should eql({
-          :country_code=>"LU", 
-          :vat_number=>"21416127", 
-          :request_date=> Date.today, 
-          :name => "EBAY EUROPE S.A R.L.", 
+          :country_code=>"LU",
+          :vat_number=>"21416127",
+          :request_date=> Date.today,
+          :name => "EBAY EUROPE S.A R.L.",
           :address => "22, BOULEVARD ROYAL\nL-2449  LUXEMBOURG",
           :company_type => nil,
           :request_identifier => "some_uniq_string"
@@ -69,13 +69,29 @@ describe Valvat::Lookup do
       end
     end
 
+    context "error on request" do
+      before do
+        @request = mock("request")
+        Valvat::Lookup::Request.stub(:new => @request)
+        @request.stub(:perform).and_raise(ArgumentError.new)
+      end
+
+      it "should return nil" do
+        Valvat::Lookup.validate("LU21416127").should eql(nil)
+      end
+
+      it "should raise error with raise_error option" do
+        lambda {Valvat::Lookup.validate("LU21416127", :raise_error => true)}.should raise_error(ArgumentError)
+      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

data/spec/valvat/syntax_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Valvat::Syntax do
-  context "#validate" do
+  describe "#validate" do
     it "validates a DE vat number" do
       Valvat::Syntax.validate("DE345889003").should eql(true)
 

data/spec/valvat/utils_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Valvat::Utils do
-  context "#split" do
+  describe "#split" do
     it "returns country and rest on vat number as array" do
       Valvat::Utils.split("DE345889003").should eql(["DE", "345889003"])
       Valvat::Utils.split("ESX4588900X").should eql(["ES", "X4588900X"])
@@ -25,7 +25,7 @@ describe Valvat::Utils do
     end
   end
 
-  context "#normalize" do
+  describe "#normalize" do
     it "returns vat number with upcase chars" do
       Valvat::Utils.normalize("de345889003").should eql("DE345889003")
       Valvat::Utils.normalize("EsX4588900y").should eql("ESX4588900Y")
@@ -52,7 +52,7 @@ describe Valvat::Utils do
     end
   end
 
-  context "#vat_country_to_iso_country" do
+  describe "#vat_country_to_iso_country" do
     it "returns iso country code on greek iso language 'EL'" do
       Valvat::Utils.vat_country_to_iso_country("EL").should eql("GR")
     end
@@ -64,7 +64,7 @@ describe Valvat::Utils do
     end
   end
 
-  context "#iso_country_to_vat_country" do
+  describe "#iso_country_to_vat_country" do
     it "returns vat country on greek iso country code 'GR'" do
       Valvat::Utils.iso_country_to_vat_country("GR").should eql("EL")
     end

data/spec/valvat_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'spec_helper'
 
 describe Valvat do
-  context "#new" do
+  describe "#new" do
     it "demands one and only one argument" do
       lambda{ Valvat.new }.should raise_error(ArgumentError)
       lambda{ Valvat.new("a", "b") }.should raise_error(ArgumentError)
@@ -33,7 +33,7 @@ describe Valvat do
     let(:at_vat) { Valvat.new("ATU458890031") } # invalid
     let(:gr_vat) { Valvat.new("EL999943280") } # valid & exists
 
-    context "#valid?" do
+    describe "#valid?" do
       it "returns true on valid numbers" do
         de_vat.should be_valid
         gr_vat.should be_valid
@@ -44,7 +44,7 @@ describe Valvat do
       end
     end
 
-    context "#exist(s)?" do
+    describe "#exist(s)?" do
       context "on existing vat numbers" do
         before do
           Valvat::Lookup.stub(:validate => true)
@@ -77,7 +77,7 @@ describe Valvat do
       end
     end
 
-    context "#iso_country_code" do
+    describe "#iso_country_code" do
       it "returns iso country code on iso_country_code" do
         de_vat.iso_country_code.should eql("DE")
         at_vat.iso_country_code.should eql("AT")
@@ -88,7 +88,7 @@ describe Valvat do
       end
     end
 
-    context "#vat_country_code" do
+    describe "#vat_country_code" do
       it "returns iso country code on iso_country_code" do
         de_vat.vat_country_code.should eql("DE")
         at_vat.vat_country_code.should eql("AT")
@@ -99,7 +99,7 @@ describe Valvat do
       end
     end
 
-    context "#european?" do
+    describe "#european?" do
       it "returns true" do
         de_vat.should be_european
         at_vat.should be_european
@@ -107,7 +107,7 @@ describe Valvat do
       end
     end
 
-    context "#to_s" do
+    describe "#to_s" do
       it "returns full vat number" do
         de_vat.to_s.should eql("DE259597697")
         at_vat.to_s.should eql("ATU458890031")
@@ -115,7 +115,7 @@ describe Valvat do
       end
     end
 
-    context "#inspect" do
+    describe "#inspect" do
       it "returns vat number with iso country code" do
         de_vat.inspect.should eql("#<Valvat DE259597697 DE>")
         at_vat.inspect.should eql("#<Valvat ATU458890031 AT>")
@@ -123,7 +123,7 @@ describe Valvat do
       end
     end
 
-    context "#to_a" do
+    describe "#to_a" do
       it "calls Valvat::Utils.split with raw vat number and returns result" do
         de_vat # initialize
         Valvat::Utils.should_receive(:split).once.with("DE259597697").and_return(["a", "b"])
@@ -136,14 +136,14 @@ describe Valvat do
     let(:us_vat) { Valvat.new("US345889003") }
     let(:ch_vat) { Valvat.new("CH445889003") }
 
-    context "#valid?" do
+    describe "#valid?" do
       it "returns false" do
         us_vat.should_not be_valid
         ch_vat.should_not be_valid
       end
     end
 
-    context "#exist?" do
+    describe "#exist?" do
       without_any_web_requests!
 
       it "returns false" do
@@ -152,35 +152,35 @@ describe Valvat do
       end
     end
 
-    context "#iso_country_code" do
+    describe "#iso_country_code" do
       it "returns nil" do
         us_vat.iso_country_code.should eql(nil)
         ch_vat.iso_country_code.should eql(nil)
       end
     end
 
-    context "#vat_country_code" do
+    describe "#vat_country_code" do
       it "returns nil" do
         us_vat.vat_country_code.should eql(nil)
         ch_vat.vat_country_code.should eql(nil)
       end
     end
 
-    context "#european?" do
+    describe "#european?" do
       it "returns false" do
         us_vat.should_not be_european
         ch_vat.should_not be_european
       end
     end
 
-    context "#to_s" do
+    describe "#to_s" do
       it "returns full given vat number" do
         us_vat.to_s.should eql("US345889003")
         ch_vat.to_s.should eql("CH445889003")
       end
     end
 
-    context "#inspect" do
+    describe "#inspect" do
       it "returns vat number without iso country code" do
         us_vat.inspect.should eql("#<Valvat US345889003>")
         ch_vat.inspect.should eql("#<Valvat CH445889003>")
@@ -195,7 +195,7 @@ describe Valvat do
     let(:empty_vat) { Valvat.new("") }
     let(:nil_vat) { Valvat.new("") }
 
-    context "#valid?" do
+    describe "#valid?" do
       it "returns false" do
         only_iso_vat.should_not be_valid
         num_vat.should_not be_valid
@@ -204,7 +204,7 @@ describe Valvat do
       end
     end
 
-    context "#exist?" do
+    describe "#exist?" do
       without_any_web_requests!
 
       it "returns false" do
@@ -215,7 +215,7 @@ describe Valvat do
       end
     end
 
-    context "#iso_country_code" do
+    describe "#iso_country_code" do
       it "returns nil" do
         only_iso_vat.iso_country_code.should eql(nil)
         num_vat.iso_country_code.should eql(nil)
@@ -224,7 +224,7 @@ describe Valvat do
       end
     end
 
-    context "#vat_country_code" do
+    describe "#vat_country_code" do
       it "returns nil" do
         only_iso_vat.vat_country_code.should eql(nil)
         num_vat.vat_country_code.should eql(nil)
@@ -233,7 +233,7 @@ describe Valvat do
       end
     end
 
-    context "#european?" do
+    describe "#european?" do
       it "returns false" do
         only_iso_vat.should_not be_european
         num_vat.should_not be_european
@@ -242,7 +242,7 @@ describe Valvat do
       end
     end
 
-    context "#to_s" do
+    describe "#to_s" do
       it "returns full given vat number" do
         only_iso_vat.to_s.should eql("DE")
         num_vat.to_s.should eql("12445889003")
@@ -251,7 +251,7 @@ describe Valvat do
       end
     end
 
-    context "#inspect" do
+    describe "#inspect" do
       it "returns vat number without iso country code" do
         only_iso_vat.inspect.should eql("#<Valvat DE>")
         num_vat.inspect.should eql("#<Valvat 12445889003>")

data/valvat.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   * Simple syntax verification
   * Lookup via the VIES web service
-  * Works standalone without any gem dependencies
+  * Supports details & requester identification
   * (Optional) ActiveModel/Rails3 integration
   * I18n locales for country specific error messages
   END
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency             'savon',       '>=0.9.12'
+  s.add_dependency             'savon',       '>=1.2.0'
 
   s.add_development_dependency 'rspec',       '>= 2.4.0'
   s.add_development_dependency 'guard-rspec', '>=0.1.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valvat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,9 +124,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 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"
+  \ * Simple syntax verification\n  * Lookup via the VIES web service\n  * Supports
+  details & requester identification\n  * (Optional) ActiveModel/Rails3 integration\n
+  \ * I18n locales for country specific error messages\n"
 email:
 - sebastian@yo.lk
 executables: []
@@ -134,7 +134,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .rbenv-gemsets
+- .rbenv-version
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -171,21 +172,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -443670798108934611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -443670798108934611
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Validates european vat numbers. Standalone or as a ActiveModel validator.

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3@valvat --create