valvat 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b170f10e2a265c6da14bbd5c84d60efa9bae5519
-  data.tar.gz: f146300ab0f27c975c0abd00a491f7cfaec40092
+  metadata.gz: de213034100a14f27abc0826f14073d390864ca0
+  data.tar.gz: f7b2ac840be2d736e3a0ca9fe7505b2884fe4022
 SHA512:
-  metadata.gz: c8ef6a1375a425b8c6d5637e9cac5978c32d7279888966a9f1c9a530c1d71e4f36a5b02ce5ecd68ffe0e32bbf64eda6249540a44b560769ccbcfcbfcfda159e1
-  data.tar.gz: 7851b20ae347a34f5466bcb67aa3a198083e400155b0a86176424ba807f0cf4abb9b585f1713045eec3680a7c66220fd4b490a8325bedf8c9909b776f3d5a85a
+  metadata.gz: 2af8967f19c4de9ebd3476196bd1d85be240d1dfc2545cd77d77cfced868ae5337b27597ab360641831fb15ce543dd58215720ad14b899ea9d4566cbd10e2627
+  data.tar.gz: 640305dfc1ce256f77e62cb396ea5f38b6042fdf2c9c66b2c9ad99c0aaa5fff038d47ac340c3c5f25babb138c6010cd69d1dd525fd04bc80605fcaa8f7e00196

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.1
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - rbx-2.1.1
+  - rbx-2.2.9
 gemfile:
   - gemfiles/activemodel-4
   - gemfiles/activemodel-3-2

data/CHANGES.md

@@ -1,6 +1,14 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.6.4...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.5...master)
+
+### 0.6.5 / 2014-06-19
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.4...v0.6.5)
+
+* Added french, spanish and danish translations (by [Roman Lehnert](https://github.com/romanlehnert))
+* Specs: Fixed issues with rspec 3
+* Specs: Switched to :expect syntax
 
 ### 0.6.4 / 2014-04-09
 

data/README.md

@@ -11,10 +11,10 @@ Validates european vat numbers. Standalone or as a ActiveModel validator.
 * Lookup via the VIES web service
 * (Optional) ActiveModel/Rails3 integration
 * Works standalone without ActiveModel
-* I18n locales for country specific error messages in English, German, Swedish, Italian, Portuguese, Polish, Dutch, Bulgarian, Romanian and Latvian.
+* I18n locales for country specific error messages in English, German, French, Spanish, Italian, Portuguese, Polish, Swedish, Dutch, Danish, Bulgarian, Romanian and Latvian.
 * *Experimental* checksum verification
 
-valvat is tested and works with ruby MRI 1.9.3/2.0/2.1 and jruby (in 1.9 mode) and ActiveModel 3.2/4.0
+valvat is tested and works with ruby MRI 1.9.3/2.0/2.1, jruby (in 1.9 mode) and rubinius 2.2 and ActiveModel 3.2/4.1
 
 ## Installation
 
@@ -188,6 +188,7 @@ There seems to be a problem when using the VIES service over IPv6. Sadly this is
 
 ## Contributions by
 
+* [Roman Lehnert](https://github.com/romanlehnert)
 * [0scarius](https://github.com/0scarius)
 * [Davidslv](https://github.com/Davidslv)
 * [brianphillips](https://github.com/brianphillips)

data/gemfiles/activemodel-3-2

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "savon",       "2.3.0"
 gem "activemodel", "3.2.15"
 
-gem 'rspec', '>= 2.14.0'
+gem 'rspec', '~> 3.0'
 gem 'fakeweb', '>= 1.3.0'
 gem 'rake'
 

data/gemfiles/activemodel-4

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "savon",       "2.3.0"
 gem "activemodel", "4.0.1"
 
-gem 'rspec', '>= 2.14.0'
+gem 'rspec', '~> 3.0'
 gem 'fakeweb', '>= 1.3.0'
 gem 'rake'
 

data/gemfiles/standalone

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem "savon",       "2.3.0"
 
-gem 'rspec', '>= 2.14.0'
+gem 'rspec', '~> 3.0'
 gem 'fakeweb', '>= 1.3.0'
 gem 'rake'
 

data/lib/valvat/locales/da.yml

@@ -0,0 +1,34 @@
+da:
+  errors:
+    messages:
+      invalid_vat: Er ikke et gyldigt %{country_adjective} moms-nummer
+  valvat:
+    country_adjectives:
+      eu: Europæisk
+      at: Østrigsk
+      be: Belgisk
+      bg: Bulgarsk
+      cy: Cypriotisk
+      cz: Tjekkisk
+      de: Tysk
+      dk: Dansk
+      ee: Estisk
+      es: Spansk
+      fi: Finsk
+      fr: Fransk
+      gb: Engelsk
+      gr: Græsk
+      hu: Ungarsk
+      ie: Irsk
+      it: Italiensk
+      lt: Litauisk
+      lu: Luxembourgsk
+      lv: Lettisk
+      mt: Maltesisk
+      nl: Nederlandsk
+      pl: Polsk
+      pt: Portugisisk
+      ro: Rumænsk
+      se: Svensk
+      si: Slovensk
+      sk: Slovakisk

data/lib/valvat/locales/es.yml

@@ -0,0 +1,34 @@
+es:
+  errors:
+    messages:
+      invalid_vat: el impuesto sobre el valor añadido %{country_adjective} no es válido 
+  valvat:
+    country_adjectives:
+      eu: europeo
+      at: austriaco
+      be: belga
+      bg: búlgaro
+      cy: chipriota
+      cz: checo
+      de: alemán
+      dk: danés
+      ee: estonio
+      es: español
+      fi: finlandés
+      fr: francés
+      gb: británico
+      gr: griego
+      hu: úngaro
+      ie: irlandés
+      it: italiano
+      lt: lituano
+      lu: luxemburgués
+      lv: letón
+      mt: maltés
+      nl: holandés
+      pl: polaco
+      pt: portugués
+      ro: romano
+      se: sueco
+      si: eslovenio
+      sk: eslovaco

data/lib/valvat/locales/fr.yml

@@ -0,0 +1,33 @@
+fr:
+  errors:
+    messages:
+      invalid_vat: "ce n`est pas un nombre d`identification de TVA %{country_adjective} valide"
+  valvat:
+    country_adjectives:
+      eu: européen
+      at: autrichienne
+      be: belge
+      bg: bulgare
+      cy: chypriote 
+      cz: tchèque
+      de: allemande
+      dk: danoise
+      ee: estonien
+      es: espagnole
+      fi: finlandaise
+      fr: français
+      gb: britannique
+      gr: grec
+      ie: irlandais
+      it: italien
+      lt: lituanienne
+      lu: luxembourgeoise
+      lv: letton
+      mt: maltais
+      nl: français
+      pl: polonais
+      pt: portugais
+      ro: roumaine
+      se: suédois
+      si: suédois
+      sk: slovaque

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/active_model/validations/valvat_validator_spec.rb

@@ -44,7 +44,7 @@ if defined?(ActiveModel)
   describe Invoice do
     context "with valid vat number" do
       it "should be valid" do
-        Invoice.new(:vat_number => "DE259597697").should be_valid
+        expect(Invoice.new(:vat_number => "DE259597697")).to be_valid
       end
     end
 
@@ -52,12 +52,12 @@ if defined?(ActiveModel)
       let(:invoice) { Invoice.new(:vat_number => "DE259597697123") }
 
       it "should not be valid" do
-        invoice.should_not be_valid
+        expect(invoice).not_to be_valid
       end
 
       it "should add default (country specific) error message" do
         invoice.valid?
-        invoice.errors[:vat_number].should eql(["is not a valid German vat number"])
+        expect(invoice.errors[:vat_number]).to eql(["is not a valid German vat number"])
       end
 
       context "with i18n translation in place" do
@@ -71,7 +71,7 @@ if defined?(ActiveModel)
 
         it "should use translation" do
           invoice.valid?
-          invoice.errors[:vat_number].should eql(["is ugly."])
+          expect(invoice.errors[:vat_number]).to eql(["is ugly."])
         end
       end
 
@@ -87,21 +87,21 @@ if defined?(ActiveModel)
         it "should replace country adjective placeholder" do
           invoice = Invoice.new(:vat_number => "IE123")
           invoice.valid?
-          invoice.errors[:vat_number].should eql(["is not a Irish vat"])
+          expect(invoice.errors[:vat_number]).to eql(["is not a Irish vat"])
         end
 
         it "should fall back to 'European' if country is missing" do
           invoice = Invoice.new(:vat_number => "XX123")
           invoice.valid?
-          invoice.errors[:vat_number].should eql(["is not a European vat"])
+          expect(invoice.errors[:vat_number]).to eql(["is not a European vat"])
         end
       end
     end
 
     context "with blank vat number" do
       it "should not be valid" do
-        Invoice.new(:vat_number => "").should_not be_valid
-        Invoice.new(:vat_number => nil).should_not be_valid
+        expect(Invoice.new(:vat_number => "")).not_to be_valid
+        expect(Invoice.new(:vat_number => nil)).not_to be_valid
       end
     end
   end
@@ -109,34 +109,34 @@ if defined?(ActiveModel)
   describe InvoiceWithLookup do
     context "with valid but not existing vat number" do
       before do
-        Valvat::Syntax.stub(:validate => true)
-        Valvat::Lookup.stub(:validate => false)
+        allow(Valvat::Syntax).to receive_messages(:validate => true)
+        allow(Valvat::Lookup).to receive_messages(:validate => false)
       end
 
       it "should not be valid" do
-        InvoiceWithLookup.new(:vat_number => "DE123").should_not be_valid
+        expect(InvoiceWithLookup.new(:vat_number => "DE123")).not_to be_valid
       end
     end
 
     context "with valid and existing vat number" do
       before do
-        Valvat::Syntax.stub(:validate => true)
-        Valvat::Lookup.stub(:validate => true)
+        allow(Valvat::Syntax).to receive_messages(:validate => true)
+        allow(Valvat::Lookup).to receive_messages(:validate => true)
       end
 
       it "should be valid" do
-        InvoiceWithLookup.new(:vat_number => "DE123").should be_valid
+        expect(InvoiceWithLookup.new(:vat_number => "DE123")).to be_valid
       end
     end
 
     context "with valid vat number and VIES country service down" do
       before do
-        Valvat::Syntax.stub(:validate => true)
-        Valvat::Lookup.stub(:validate => nil)
+        allow(Valvat::Syntax).to receive_messages(:validate => true)
+        allow(Valvat::Lookup).to receive_messages(:validate => nil)
       end
 
       it "should be valid" do
-        InvoiceWithLookup.new(:vat_number => "DE123").should be_valid
+        expect(InvoiceWithLookup.new(:vat_number => "DE123")).to be_valid
       end
     end
   end
@@ -144,12 +144,12 @@ if defined?(ActiveModel)
   describe InvoiceWithLookupAndFailIfDown do
     context "with valid vat number and VIES country service down" do
       before do
-        Valvat::Syntax.stub(:validate => true)
-        Valvat::Lookup.stub(:validate => nil)
+        allow(Valvat::Syntax).to receive_messages(:validate => true)
+        allow(Valvat::Lookup).to receive_messages(:validate => nil)
       end
 
       it "should not be valid" do
-        InvoiceWithLookupAndFailIfDown.new(:vat_number => "DE123").should_not be_valid
+        expect(InvoiceWithLookupAndFailIfDown.new(:vat_number => "DE123")).not_to be_valid
       end
     end
   end
@@ -157,8 +157,8 @@ if defined?(ActiveModel)
   describe InvoiceAllowBlank do
     context "with blank vat number" do
       it "should be valid" do
-        InvoiceAllowBlank.new(:vat_number => "").should be_valid
-        InvoiceAllowBlank.new(:vat_number => nil).should be_valid
+        expect(InvoiceAllowBlank.new(:vat_number => "")).to be_valid
+        expect(InvoiceAllowBlank.new(:vat_number => nil)).to be_valid
       end
     end
   end
@@ -166,62 +166,62 @@ if defined?(ActiveModel)
   describe InvoiceAllowBlankOnAll do
     context "with blank vat number" do
       it "should be valid" do
-        InvoiceAllowBlankOnAll.new(:vat_number => "").should be_valid
-        InvoiceAllowBlankOnAll.new(:vat_number => nil).should be_valid
+        expect(InvoiceAllowBlankOnAll.new(:vat_number => "")).to be_valid
+        expect(InvoiceAllowBlankOnAll.new(:vat_number => nil)).to be_valid
       end
     end
   end
 
   describe InvoiceCheckCountry 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
+      expect(InvoiceCheckCountry.new(:country => nil, :vat_number => "DE259597697")).not_to be_valid
+      expect(InvoiceCheckCountry.new(:country => "", :vat_number => "DE259597697")).not_to 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
+      expect(InvoiceCheckCountry.new(:country => "XAXXX", :vat_number => "DE259597697")).not_to be_valid
+      expect(InvoiceCheckCountry.new(:country => "ZO", :vat_number => "DE259597697")).not_to 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
+      expect(InvoiceCheckCountry.new(:country => "FR", :vat_number => "DE259597697")).not_to be_valid
+      expect(InvoiceCheckCountry.new(:country => "AT", :vat_number => "DE259597697")).not_to be_valid
+      expect(InvoiceCheckCountry.new(:country => "DE", :vat_number => "ATU65931334")).not_to 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
+      expect(InvoiceCheckCountry.new(:country => "DE", :vat_number => "DE259597697")).to be_valid
+      expect(InvoiceCheckCountry.new(:country => "AT", :vat_number => "ATU65931334")).to 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"])
+      expect(invoice.errors[:vat_number]).to 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"])
+      expect(invoice.errors[:vat_number]).to 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)
+      allow(Valvat::Syntax).to receive_messages(:validate => true)
+      allow(Valvat::Lookup).to receive_messages(: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)
+      expect(Valvat::Syntax).not_to receive(:validate)
+      expect(Valvat::Lookup).not_to 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)
+      expect(Valvat::Syntax).to receive(:validate).and_return(true)
+      expect(Valvat::Lookup).to receive(:validate).and_return(true)
       InvoiceCheckCountryWithLookup.new(:country => "DE", :vat_number => "DE259597697").valid?
     end
   end
@@ -229,13 +229,13 @@ if defined?(ActiveModel)
   describe InvoiceWithChecksum do
     context "with valid vat number" do
       it "should be valid" do
-        InvoiceWithChecksum.new(:vat_number => "DE259597697").should be_valid
+        expect(InvoiceWithChecksum.new(:vat_number => "DE259597697")).to be_valid
       end
     end
 
     context "with invalid vat number" do
       it "should not be valid" do
-        InvoiceWithChecksum.new(:vat_number => "DE259597687").should_not be_valid
+        expect(InvoiceWithChecksum.new(:vat_number => "DE259597687")).not_to be_valid
       end
     end
   end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ $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
   config.backtrace_exclusion_patterns = [/rspec\/(core|expectations)/]

data/spec/valvat/checksum/at_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Valvat::Checksum::AT do
   %w(ATU13585627 ATU66059506 ATU42403001).each do |valid_vat|
     it "returns true on valid vat #{valid_vat}" do
-      Valvat::Checksum.validate(valid_vat).should eql(true)
+      expect(Valvat::Checksum.validate(valid_vat)).to eql(true)
     end
 
     invalid_vat = "#{valid_vat[0..-4]}#{valid_vat[-1]}#{valid_vat[-2]}#{valid_vat[-3]}"
 
     it "returns false on invalid vat #{invalid_vat}" do
-      Valvat::Checksum.validate(invalid_vat).should eql(false)
+      expect(Valvat::Checksum.validate(invalid_vat)).to eql(false)
     end
   end
 end