valvat 0.3.0 → 0.3.1

data/CHANGES.md

@@ -1,12 +1,19 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.3.0...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.3.1...master)
+
+### 0.3.1 / 2011-01-12
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.3,0...v0.3.1)
+
+* ActiveModel validation: Failed validations with _match_country_ now use error message with country from given attribute
+* ActiveModel validation: Failed validations with _match_country_ skip lookup and syntax checks
 
 ### 0.3.0 / 2011-01-12
 
 [full changelog](http://github.com/yolk/valvat/compare/v0.2.3...v0.3.0)
 
-* ActiveModel validation: added _match_counrty_ option to validate if iso country code of vat number matches another attribute.
+* ActiveModel validation: added _match_country_ option to validate if iso country code of vat number matches another attribute.
 
 ### 0.2.3 / 2011-01-10
 

data/lib/valvat/active_model.rb

@@ -8,21 +8,28 @@ module ActiveModel
       
       def validate_each(record, attribute, value)
         vat = Valvat(value)
-        is_valid = options[:lookup] ? vat.valid? && vat.exists? : vat.valid?
+        iso_country_code = vat.iso_country_code
+        is_valid = true
         
-        if is_valid.nil?
-          is_valid = options[:lookup] != :fail_if_down
+        if options[:match_country]
+          iso_country_code = (record.send(options[:match_country]) || "").upcase
+          is_valid = iso_country_code == vat.iso_country_code
         end
         
-        if is_valid && options[:match_country]
-          is_valid = (record.send(options[:match_country]) || "").upcase == vat.iso_country_code
+        if is_valid
+          is_valid = options[:lookup] ? vat.valid? && vat.exists? : vat.valid?
+        
+          if is_valid.nil?
+            is_valid = options[:lookup] != :fail_if_down
+          end
         end
         
         unless is_valid
+          iso_country_code = "eu" if iso_country_code.blank? 
           record.errors.add(attribute, :invalid_vat, 
             :message => options[:message], 
             :country_adjective => I18n.t(
-              :"valvat.country_adjectives.#{(Valvat::Utils.split(value)[0] || "eu").downcase}", 
+              :"valvat.country_adjectives.#{iso_country_code.downcase}", 
               :default => [:"valvat.country_adjectives.eu", "european"]
             )
           )

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/valvat/active_model_spec.rb

@@ -28,6 +28,14 @@ class InvoiceCheckCountry < ModelBase
   end
 end
 
+class InvoiceCheckCountryWithLookup < ModelBase  
+  validates :vat_number, :valvat => {:match_country => :country, :lookup => true}
+  
+  def country
+    @attributes[:country]
+  end
+end
+
 describe Invoice do
   context "with valid vat number" do
     it "should be valid" do
@@ -160,26 +168,55 @@ describe InvoiceAllowBlankOnAll do
 end
 
 describe InvoiceCheckCountry do
-  context "with blank vat number" do
-    it "should be not valid on blank country" do
-      InvoiceCheckCountry.new(:country => nil, :vat_number => "DE259597697").should_not be_valid
-      InvoiceCheckCountry.new(:country => "", :vat_number => "DE259597697").should_not be_valid
-    end
-    
-    it "should be not valid on wired country" do
-      InvoiceCheckCountry.new(:country => "XAXXX", :vat_number => "DE259597697").should_not be_valid
-      InvoiceCheckCountry.new(:country => "ZO", :vat_number => "DE259597697").should_not be_valid
-    end
-    
-    it "should be not valid on mismatching (eu) country" do
-      InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697").should_not be_valid
-      InvoiceCheckCountry.new(:country => "AT", :vat_number => "DE259597697").should_not be_valid
-      InvoiceCheckCountry.new(:country => "DE", :vat_number => "ATU65931334").should_not be_valid
-    end
-    
-    it "should be valid on matching country" do
-      InvoiceCheckCountry.new(:country => "DE", :vat_number => "DE259597697").should be_valid
-      InvoiceCheckCountry.new(:country => "AT", :vat_number => "ATU65931334").should be_valid
-    end
+  it "should be not valid on blank country" do
+    InvoiceCheckCountry.new(:country => nil, :vat_number => "DE259597697").should_not be_valid
+    InvoiceCheckCountry.new(:country => "", :vat_number => "DE259597697").should_not be_valid
+  end
+  
+  it "should be not valid on wired country" do
+    InvoiceCheckCountry.new(:country => "XAXXX", :vat_number => "DE259597697").should_not be_valid
+    InvoiceCheckCountry.new(:country => "ZO", :vat_number => "DE259597697").should_not be_valid
+  end
+  
+  it "should be not valid on mismatching (eu) country" do
+    InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697").should_not be_valid
+    InvoiceCheckCountry.new(:country => "AT", :vat_number => "DE259597697").should_not be_valid
+    InvoiceCheckCountry.new(:country => "DE", :vat_number => "ATU65931334").should_not be_valid
+  end
+  
+  it "should be valid on matching country" do
+    InvoiceCheckCountry.new(:country => "DE", :vat_number => "DE259597697").should be_valid
+    InvoiceCheckCountry.new(:country => "AT", :vat_number => "ATU65931334").should be_valid
+  end
+  
+  it "should give back error message with country from :country_match" do
+    invoice = InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697")
+    invoice.valid?
+    invoice.errors[:vat_number].should eql(["is not a valid french vat number"])
+  end
+  
+  it "should give back error message with country from :country_match even on invalid vat number" do
+    invoice = InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697123")
+    invoice.valid?
+    invoice.errors[:vat_number].should eql(["is not a valid french vat number"])
+  end
+end
+
+describe InvoiceCheckCountryWithLookup do
+  before do
+    Valvat::Syntax.stub(:validate => true)
+    Valvat::Lookup.stub(:validate => true)
+  end
+  
+  it "avoids lookup or syntax check on failed because of mismatching country" do
+    Valvat::Syntax.should_not_receive(:validate)
+    Valvat::Lookup.should_not_receive(:validate)
+    InvoiceCheckCountryWithLookup.new(:country => "FR", :vat_number => "DE259597697").valid?
+  end
+  
+  it "check syntax and looup on matching country" do
+    Valvat::Syntax.should_receive(:validate).and_return(true)
+    Valvat::Lookup.should_receive(:validate).and_return(true)
+    InvoiceCheckCountryWithLookup.new(:country => "DE", :vat_number => "DE259597697").valid?
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sebastian Munz