vat_id_validator 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc7209a52f4b1c5e1adfa7d690465d17d609c8d
-  data.tar.gz: 8669e92aad4b428409e17e514c1f69c2ede1565b
+  metadata.gz: f7e561972f975d1a75617f7dbee35f8080661be9
+  data.tar.gz: 6f06ca5e167c909f1307a6a07506c1739cc32bb4
 SHA512:
-  metadata.gz: 7a89c19e89adfb022ee15bd024bd97040459a97dd2b9c9bce747c6e894b62180565f58a5f567f8004250796dd92c898439867c59090f522a8f7cd8510996824b
-  data.tar.gz: 283e16f0d41c6dc96728c7485b60089a64799375ba275fd76d71bfd703bc7ea5ac26cf23eba47998cf55f49ad90e4316f3df79a0694d4c6ee944f1c45984082a
+  metadata.gz: 3439ac1cca3617c9445ea2fc593b5ade67b89d18c91861e4959750e2a1748ea97adee2b9569db1478d5b9baa99e1312d89153a17afc6be0a87448e705560f8f8
+  data.tar.gz: fff9ac2c3ba6f979ebaa099da4db65971a69c67634b399dac7a663cd4c6fd4a3468fd0e52380f944bf55f0e70dab9586e9312689c5b6a372c2fec987aad8655a

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,19 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-10-19 14:57:55 +0200 using RuboCop version 0.44.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 59
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 100
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/active_model/validations/vat_id_validator.rb'

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+### Next
+
+#### Features
+
+* Your contribution here.
+
+#### Fixes
+
+* Your contribution here.
+
+
+### 0.1.0 (2016/10/19)
+
+#### Features
+
+* [5](https://github.com/Sage/vat_id_validator/pull/5): Makes ready for rails 4 and 5 - [@LeFnord](https://github.com/LeFnord).

data/Fudgefile

@@ -1,4 +1,5 @@
 build :default do
+  shell 'bundle exec rubocop --format simple'
   yard 'stats --list-undoc -q', :coverage => 100
   cane :max_width => 200
   rspec :coverage => 100

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec', :version => 2, :cli => '--drb' do
+guard 'rspec', version: 2, cli: '--drb' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/active_model/validations/vat_id_validator.rb

@@ -8,67 +8,66 @@ module ActiveModel
   module Validations
     # Validator for VAT-ID based on ActiveModel::EachValidator.
     class VatIdValidator < ::ActiveModel::EachValidator
-
       # All Countries with the vat pattern
       VAT_PATTERNS = {
-          'AL'  => /\AAL(J|K)[0-9]{8}[A-Z]\Z/,                                 # Albania
-          'AR'  => /\AAR[0-9]{11}\Z/,                                          # Argentina
-          'AT'  => /\AATU[0-9]{8}\Z/,                                          # Austria
-          'AU'  => /\AAU[0-9]{9}\Z/,                                           # Australia
-          'BE'  => /\ABE0[0-9]{9}\Z/,                                          # Belgium
-          'BG'  => /\ABG[0-9]{9,10}\Z/,                                        # Bulgaria
-          'BO'  => /\ABO/,                                                     # Bolivia
-          'BR'  => /\ABR[0-9]{8}\Z/,                                           # Brasil
-          'BY'  => /\ABY[0-9]{9}\Z/,                                           # Belarus
-          'CA'  => /\ACA[0-9]{15}\Z/,                                          # Canada
-          'CH'  => /\ACHE[0-9]{9}(MWST|TVA|IVA)\Z/,                            # Switzerland
-          'CL'  => /\ACL[0-9]{9}\Z/,                                           # Chile
-          'CO'  => /\ACO[0-9]{10}\Z/,                                          # Colombia
-          'CR'  => /\ACR/,                                                     # Costa Rica
-          'CY'  => /\ACY[0-9]{8}[A-Z]\Z/,                                      # Cyprus
-          'CZ'  => /\ACZ[0-9]{8,10}\Z/,                                        # Czech Republic
-          'DE'  => /\ADE[0-9]{9}\Z/,                                           # Germany
-          'DK'  => /\ADK[0-9]{8}\Z/,                                           # Denmark
-          'DO'  => /\ADO/,                                                     # Dominican Republic
-          'EC'  => /\AEC[0-9]{13}\Z/,                                          # Ecuador
-          'EE'  => /\AEE[0-9]{9}\Z/,                                           # Estonia
-          'EL'  => /\AEL[0-9]{9}\Z/,                                           # Greece
-          'ES'  => /\AES([A-Z][0-9]{8}|[0-9]{8}[A-Z]|[A-Z][0-9]{7}[A-Z])\Z/,   # Spain
-          'FI'  => /\AFI[0-9]{8}\Z/,                                           # Finland
-          'FR'  => /\AFR[A-Z0-9]{2}[0-9]{9}\Z/,                                # France
-          'GB'  => /\AGB([0-9]{9}|[0-9]{12}|(HA|GD)[0-9]{3})\Z/,               # United Kingdom
-          'GT'  => /\AGT[0-9]{8}\Z/,                                           # Guatemala
-          'HN'  => /\AHN/,                                                     # Honduras
-          'HR'  => /\AHR[0-9]{11}\Z/,                                          # Croatia
-          'HU'  => /\AHU[0-9]{8}\Z/,                                           # Hungary
-          'IE'  => /\AIE([0-9][A-Z][0-9]{5}|[0-9]{7})[A-Z]\Z/,                 # Ireland
-          'IT'  => /\AIT[0-9]{11}\Z/,                                          # Italy
-          'LT'  => /\ALT([0-9]{9}|[0-9]{12})\Z/,                               # Lithuania
-          'LU'  => /\ALU[0-9]{8}\Z/,                                           # Luxembourg
-          'LV'  => /\ALV[0-9]{11}\Z/,                                          # Latvia
-          'MT'  => /\AMT[0-9]{8}\Z/,                                           # Malta
-          'MX'  => /\AMX[0-9]{12}\Z/,                                          # Mexico
-          'NI'  => /\ANI/,                                                     # Nicaragua
-          'NL'  => /\ANL[0-9]{9}B[0-9]{2}\Z/,                                  # Netherlands
-          'NO'  => /\ANO[0-9]{9}\Z/,                                           # Norway
-          'PA'  => /\APA/,                                                     # Panama
-          'PE'  => /\APE/,                                                     # Peru
-          'PH'  => /\APH[0-9]{12}\Z/,                                          # Philippines
-          'PL'  => /\APL[0-9]{10}\Z/,                                          # Poland
-          'PT'  => /\APT[0-9]{9}\Z/,                                           # Portugal
-          'PY'  => /\APY/,                                                     # Paraguay
-          'RO'  => /\ARO[1-9][0-9]{1,9}\Z/,                                    # Romania
-          'RU'  => /\ARU[0-9]{10}\Z/,                                          # Russia
-          'SE'  => /\ASE[0-9]{10}01\Z/,                                        # Sweden
-          'SI'  => /\ASI[0-9]{8}\Z/,                                           # Slovenia
-          'SK'  => /\ASK[0-9]{10}\Z/,                                          # Slovakia
-          'SM'  => /\ASM[0-9]{5}\Z/,                                           # San Marino
-          'SV'  => /\ASV/,                                                     # El Salvador
-          'TR'  => /\ATR[0-9]{10}\Z/,                                          # Turkey
-          'UA'  => /\AUA[0-9]{12}\Z/,                                          # Ukraine
-          'UY'  => /\AUY/,                                                     # Uruguay
-          'VE'  => /\AVE(J|G|V|E)[0-9]{9}\Z/                                   # Venezuela
-      }
+        'AL' => /\AAL(J|K)[0-9]{8}[A-Z]\Z/, # Albania
+        'AR'  => /\AAR[0-9]{11}\Z/,                                          # Argentina
+        'AT'  => /\AATU[0-9]{8}\Z/,                                          # Austria
+        'AU'  => /\AAU[0-9]{9}\Z/,                                           # Australia
+        'BE'  => /\ABE0[0-9]{9}\Z/,                                          # Belgium
+        'BG'  => /\ABG[0-9]{9,10}\Z/,                                        # Bulgaria
+        'BO'  => /\ABO/,                                                     # Bolivia
+        'BR'  => /\ABR[0-9]{8}\Z/,                                           # Brasil
+        'BY'  => /\ABY[0-9]{9}\Z/,                                           # Belarus
+        'CA'  => /\ACA[0-9]{15}\Z/,                                          # Canada
+        'CH'  => /\ACHE[0-9]{9}(MWST|TVA|IVA)\Z/,                            # Switzerland
+        'CL'  => /\ACL[0-9]{9}\Z/,                                           # Chile
+        'CO'  => /\ACO[0-9]{10}\Z/,                                          # Colombia
+        'CR'  => /\ACR/,                                                     # Costa Rica
+        'CY'  => /\ACY[0-9]{8}[A-Z]\Z/,                                      # Cyprus
+        'CZ'  => /\ACZ[0-9]{8,10}\Z/,                                        # Czech Republic
+        'DE'  => /\ADE[0-9]{9}\Z/,                                           # Germany
+        'DK'  => /\ADK[0-9]{8}\Z/,                                           # Denmark
+        'DO'  => /\ADO/,                                                     # Dominican Republic
+        'EC'  => /\AEC[0-9]{13}\Z/,                                          # Ecuador
+        'EE'  => /\AEE[0-9]{9}\Z/,                                           # Estonia
+        'EL'  => /\AEL[0-9]{9}\Z/,                                           # Greece
+        'ES'  => /\AES([A-Z][0-9]{8}|[0-9]{8}[A-Z]|[A-Z][0-9]{7}[A-Z])\Z/,   # Spain
+        'FI'  => /\AFI[0-9]{8}\Z/,                                           # Finland
+        'FR'  => /\AFR[A-Z0-9]{2}[0-9]{9}\Z/,                                # France
+        'GB'  => /\AGB([0-9]{9}|[0-9]{12}|(HA|GD)[0-9]{3})\Z/,               # United Kingdom
+        'GT'  => /\AGT[0-9]{8}\Z/,                                           # Guatemala
+        'HN'  => /\AHN/,                                                     # Honduras
+        'HR'  => /\AHR[0-9]{11}\Z/,                                          # Croatia
+        'HU'  => /\AHU[0-9]{8}\Z/,                                           # Hungary
+        'IE'  => /\AIE([0-9][A-Z][0-9]{5}|[0-9]{7})[A-Z]{1,2}\Z/,            # Ireland
+        'IT'  => /\AIT[0-9]{11}\Z/,                                          # Italy
+        'LT'  => /\ALT([0-9]{9}|[0-9]{12})\Z/,                               # Lithuania
+        'LU'  => /\ALU[0-9]{8}\Z/,                                           # Luxembourg
+        'LV'  => /\ALV[0-9]{11}\Z/,                                          # Latvia
+        'MT'  => /\AMT[0-9]{8}\Z/,                                           # Malta
+        'MX'  => /\AMX[0-9]{12}\Z/,                                          # Mexico
+        'NI'  => /\ANI/,                                                     # Nicaragua
+        'NL'  => /\ANL[0-9]{9}B[0-9]{2}\Z/,                                  # Netherlands
+        'NO'  => /\ANO[0-9]{9}\Z/,                                           # Norway
+        'PA'  => /\APA/,                                                     # Panama
+        'PE'  => /\APE/,                                                     # Peru
+        'PH'  => /\APH[0-9]{12}\Z/,                                          # Philippines
+        'PL'  => /\APL[0-9]{10}\Z/,                                          # Poland
+        'PT'  => /\APT[0-9]{9}\Z/,                                           # Portugal
+        'PY'  => /\APY/,                                                     # Paraguay
+        'RO'  => /\ARO[1-9][0-9]{1,9}\Z/,                                    # Romania
+        'RU'  => /\ARU[0-9]{10}\Z/,                                          # Russia
+        'SE'  => /\ASE[0-9]{10}01\Z/,                                        # Sweden
+        'SI'  => /\ASI[0-9]{8}\Z/,                                           # Slovenia
+        'SK'  => /\ASK[0-9]{10}\Z/,                                          # Slovakia
+        'SM'  => /\ASM[0-9]{5}\Z/,                                           # San Marino
+        'SV'  => /\ASV/,                                                     # El Salvador
+        'TR'  => /\ATR[0-9]{10}\Z/,                                          # Turkey
+        'UA'  => /\AUA[0-9]{12}\Z/,                                          # Ukraine
+        'UY'  => /\AUY/,                                                     # Uruguay
+        'VE'  => /\AVE(J|G|V|E)[0-9]{9}\Z/                                   # Venezuela
+      }.freeze
 
       # Validates an attribute of a record if it contains a valid VAT-ID.
       #

data/lib/rspec/matchers/validate_vat_id_of.rb

@@ -21,7 +21,7 @@ module VatIdValidator # :nodoc:
       # @return [boolean]
       def matches?(actual)
         validators = actual._validators[@expected]
-        validators.select { |val| val.kind_of?(ActiveModel::Validations::VatIdValidator) }.count > 0
+        validators.select { |val| val.is_a?(ActiveModel::Validations::VatIdValidator) }.count > 0
       end
 
       # Returns a error message for should matches
@@ -42,7 +42,7 @@ module VatIdValidator # :nodoc:
       #
       # @return [String] the description
       def description
-        "be a vat id"
+        'be a vat id'
       end
     end
   end

data/lib/vat_id_validator/version.rb

@@ -1,5 +1,5 @@
 # Namespace module.
 module VatIdValidator
   # :nodoc:
-  VERSION = "0.0.2"
+  VERSION = '0.1.0'.freeze
 end

data/spec/active_model/validations/vat_id_validator_spec.rb

@@ -7,203 +7,202 @@ describe ActiveModel::Validations::VatIdValidator do
   shared_examples_for 'tax_number with 8 digits' do
     it 'should be valid with 8 digits' do
       subject.tax_number = prefix + '12345678'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
 
     it 'should not be valid with less then 8 digits' do
       subject.tax_number = prefix + '1234567'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
 
     it 'should not be valid with more then 8 digits' do
       subject.tax_number = prefix + '123456789'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
   end
 
   shared_examples_for 'tax_number with 9 digits' do
     it 'should be valid with 9 digits' do
       subject.tax_number = prefix + '123456789'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
 
     it 'should not be valid with less then 9 digits' do
       subject.tax_number = prefix + '12345678'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
 
     it 'should not be valid with more then 9 digits' do
       subject.tax_number = prefix + '1234567890'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
   end
 
   shared_examples_for 'tax_number with 10 digits' do
     it 'should be valid with 10 digits' do
       subject.tax_number = prefix + '1234567890'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
 
     it 'should not be valid with less then 10 digits' do
       subject.tax_number = prefix + '123456789'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
 
     it 'should not be valid with more then 10 digits' do
       subject.tax_number = prefix + '12345678901'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
   end
 
   shared_examples_for 'tax_number with 11 digits' do
     it 'should be valid with 11 digits' do
       subject.tax_number = prefix + '12345678901'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
 
     it 'should not be valid with less then 11 digits' do
       subject.tax_number = prefix + '1234567890'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
 
     it 'should not be valid with more then 11 digits' do
       subject.tax_number = prefix + '123456789012'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
   end
 
   shared_examples_for 'tax_number with 12 digits' do
     it 'should be valid with 12 digits' do
       subject.tax_number = prefix + '123456789012'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
 
     it 'should not be valid with less then 12 digits' do
       subject.tax_number = prefix + '12345678901'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
 
     it 'should not be valid with more then 12 digits' do
       subject.tax_number = prefix + '1234567890123'
-      subject.should_not be_valid
+      expect(subject).not_to be_valid
     end
   end
 
   shared_examples_for 'tax_number with only prefix check' do
     it 'should be valid with the given prefix' do
       subject.tax_number = prefix + '123ABC'
-      subject.should be_valid
+      expect(subject).to be_valid
     end
   end
 
   it 'should be valid without tax_number' do
-    should be_valid
+    is_expected.to be_valid
   end
 
   it 'should not be valid without prefix' do
     subject.tax_number = '123456789'
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it 'should ignore special character and spaces for validation (formatting)' do
     subject.tax_number = 'DE 12-345.678/9'
-    subject.should be_valid
+    expect(subject).to be_valid
   end
 
   context 'when the tax_number starts with' do
-  
     context 'AL (Albania)' do
       let(:prefix) { 'AL' }
-  
+
       it 'should be valid with "K" + 8 digits + 1 char' do
         subject.tax_number = prefix + 'K12345678X'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with "J" + 8 digits + 1 char' do
         subject.tax_number = prefix + 'J12345678X'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid if the first char is not "K" or "J"' do
         subject.tax_number = prefix + 'X12345678X'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less then 8 digits' do
         subject.tax_number = prefix + 'J1234567X'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 8 digits' do
         subject.tax_number = prefix + 'K123456789X'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'AR (Argentina)' do
       let(:prefix) { 'AR' }
 
       it_behaves_like 'tax_number with 11 digits'
     end
-    
+
     context 'ATU (Austria)' do
       let(:prefix) { 'ATU' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
-  
+
     context 'AU (Australia)' do
       let(:prefix) { 'AU' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
-  
+
     context 'BE (Belgium)' do
       let(:prefix) { 'BE' }
-  
+
       it 'should be valid with 10 digits (first digit == 0)' do
         subject.tax_number = prefix + '0123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with 10 digits (first digit != 0)' do
         subject.tax_number = prefix + '1123456789'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less then 10 digits' do
         subject.tax_number = prefix + '012345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 10 digits' do
         subject.tax_number = prefix + '01234567890'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'BG (Bulgaria)' do
       let(:prefix) { 'BG' }
-  
+
       it 'should be valid with 9 digits' do
         subject.tax_number = prefix + '123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 10 digits' do
         subject.tax_number = prefix + '1234567890'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 9 digits' do
         subject.tax_number = prefix + '12345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 10 digits' do
         subject.tax_number = prefix + '12345678901'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
 
@@ -221,93 +220,91 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'BY (Belarus)' do
       let(:prefix) { 'BY' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
-  
+
     context 'CA (Canada)' do
       let(:prefix) { 'CA' }
-  
+
       it 'should be valid with 15 digits' do
         subject.tax_number = prefix + '123456789012345'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 15 digits' do
         subject.tax_number = prefix + '12345678901234'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 15 digits' do
         subject.tax_number = prefix + '1234567890123456'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'CHE (Switzerland)' do
       let(:prefix) { 'CHE' }
-  
+
       it 'should not be valid without suffix' do
         subject.tax_number = prefix + '123456789'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       context 'and the tax_number ends with MWST (de-CH)' do
         let(:suffix) { 'MWST' }
         it 'should be valid with 9 digits' do
           subject.tax_number = prefix + '123456789' + suffix
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 9 digits' do
           subject.tax_number = prefix + '12345678' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 9 digits' do
           subject.tax_number = prefix + '1234567890' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
-  
+
       context 'and the tax_number ends with TVA (de-FR)' do
         let(:suffix) { 'TVA' }
-  
+
         it 'should be valid with 9 digits' do
           subject.tax_number = prefix + '123456789' + suffix
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 9 digits' do
           subject.tax_number = prefix + '12345678' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 9 digits' do
           subject.tax_number = prefix + '1234567890' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
-  
+
       context 'and the tax_number ends with IVA (de-IT)' do
         let(:suffix) { 'IVA' }
         it 'should be valid with 9 digits' do
           subject.tax_number = prefix + '123456789' + suffix
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 9 digits' do
           subject.tax_number = prefix + '12345678' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 9 digits' do
           subject.tax_number = prefix + '1234567890' + suffix
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
-  
-  
     end
 
     context 'CL (Chile)' do
@@ -331,66 +328,66 @@ describe ActiveModel::Validations::VatIdValidator do
     context 'CY (Cyprus)' do
       let(:prefix) { 'CY' }
       let(:suffix) { 'L' } # A-Z
-  
+
       it 'should not be valid without suffix' do
         subject.tax_number = prefix + '12345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should be valid with 8 digits' do
         subject.tax_number = prefix + '12345678' + suffix
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 8 digits' do
         subject.tax_number = prefix + '1234567' + suffix
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 8 digits' do
         subject.tax_number = prefix + '123456789' + suffix
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'CZ (Czech Republic)' do
       let(:prefix) { 'CZ' }
-  
+
       it 'should be valid with 8 digits' do
         subject.tax_number = prefix + '12345678'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 9 digits' do
         subject.tax_number = prefix + '123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 10 digits' do
         subject.tax_number = prefix + '1234567890'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 8 digits' do
         subject.tax_number = prefix + '1234567'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 10 digits' do
         subject.tax_number = prefix + '12345678901'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'DE (Germany)' do
       let(:prefix) { 'DE' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
-  
+
     context 'DK (Denmark)' do
       let(:prefix) { 'DK' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
 
@@ -405,156 +402,156 @@ describe ActiveModel::Validations::VatIdValidator do
 
       it 'should be valid with 13 digits' do
         subject.tax_number = prefix + '1234567890123'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it 'should not be valid with less then 13 digits' do
         subject.tax_number = prefix + '123456789012'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
 
       it 'should not be valid with more then 13 digits' do
         subject.tax_number = prefix + '12345678901234'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
 
     context 'EE (Estonia)' do
       let(:prefix) { 'EE' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
-  
+
     context 'EL (Greece)' do
       let(:prefix) { 'EL' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
-  
+
     context 'ES (Spain)' do
       let(:prefix) { 'ES' }
-  
+
       it 'should be valid with 1 char + 8 digits' do
         subject.tax_number = prefix + 'X12345678'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 8 digits + 1 char' do
         subject.tax_number = prefix + '12345678X'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 1 char + 7 digits + 1 char' do
         subject.tax_number = prefix + 'X1234567X'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 9 digits/chars' do
         subject.tax_number = prefix + 'X1234567'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 9 digits/chats' do
         subject.tax_number = prefix + '123456789X'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'FI (Finland)' do
       let(:prefix) { 'FI' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
-  
+
     context 'FR (France)' do
       let(:prefix) { 'FR' }
-  
+
       it 'should be valid with 2 digits/chars + 9 digits' do
         subject.tax_number = prefix + '1X123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 11 digits' do
         subject.tax_number = prefix + '1234567890'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 11 digits' do
         subject.tax_number = prefix + '123456789012'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'GB (United Kingdom)' do
       let(:prefix) { 'GB' }
-  
+
       context 'with digets only' do
         it 'should be valid with 9 digits (standard)' do
           subject.tax_number = prefix + '123456789'
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should be valid with 12 digits (branch traders)' do
           subject.tax_number = prefix + '123456789012'
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 9 digits' do
           subject.tax_number = prefix + '12345678'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with 10 digits' do
           subject.tax_number = prefix + '1234567890'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with 11 digits' do
           subject.tax_number = prefix + '12345678901'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 12 digits' do
           subject.tax_number = prefix + '1234567890123'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
-  
+
       context 'with prefix addition "HA" (health authorities)' do
         let(:addition) { 'HA' }
-  
+
         it 'should be valid with 3 digits' do
           subject.tax_number = prefix + addition + '123'
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 3 digits' do
           subject.tax_number = prefix + addition + '12'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 3 digits' do
           subject.tax_number = prefix + addition + '1234'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
-  
+
       context 'with prefix addition "GD" (government departments)' do
         let(:addition) { 'GD' }
-  
+
         it 'should be valid with 3 digits' do
           subject.tax_number = prefix + addition + '123'
-          subject.should be_valid
+          expect(subject).to be_valid
         end
-  
+
         it 'should not be valid with less then 3 digits' do
           subject.tax_number = prefix + addition + '12'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
-  
+
         it 'should not be valid with more then 3 digits' do
           subject.tax_number = prefix + addition + '1234'
-          subject.should_not be_valid
+          expect(subject).not_to be_valid
         end
       end
     end
@@ -573,100 +570,105 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'HR (Croatia)' do
       let(:prefix) { 'HR' }
-  
+
       it_behaves_like 'tax_number with 11 digits'
     end
-  
+
     context 'HU (Hungary)' do
       let(:prefix) { 'HU' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
-  
+
     context 'IE (Ireland)' do
       let(:prefix) { 'IE' }
-  
-      it 'should be valid with 1 digit + 1 char + 5 digets + 1 char' do
-        subject.tax_number = prefix + '1X12345L'
-        subject.should be_valid
+
+      it 'should be valid with 1 digit + 1 char + 5 digets + 2 char' do
+        subject.tax_number = prefix + '1X12345LT'
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 7 digits + 1 char' do
         subject.tax_number = prefix + '1234567L'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
+      it 'should be valid with 7 digits + 2 char' do
+        subject.tax_number = prefix + '1234567LS'
+        expect(subject).to be_valid
+      end
+
       it 'should not be valid if last is not a char' do
         subject.tax_number = prefix + '12345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less then 7 digits + 1 char' do
         subject.tax_number = prefix + '123456L'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 7 digits + 1 char' do
         subject.tax_number = prefix + '12345678L'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'IT (Italy)' do
       let(:prefix) { 'IT' }
-  
+
       it_behaves_like 'tax_number with 11 digits'
     end
-  
+
     context 'LT (Lithuania)' do
       let(:prefix) { 'LT' }
-  
+
       it 'should be valid with 9 digits' do
         subject.tax_number = prefix + '123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 12 digits' do
         subject.tax_number = prefix + '123456789012'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 9 digits' do
         subject.tax_number = prefix + '12345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with 10 digits' do
         subject.tax_number = prefix + '1234567890'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with 11 digits' do
         subject.tax_number = prefix + '12345678901'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 12 digits' do
         subject.tax_number = prefix + '1234567890123'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'LU (Luxembourg)' do
       let(:prefix) { 'LU' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
-  
+
     context 'LV (Latvia)' do
       let(:prefix) { 'LV' }
-  
+
       it_behaves_like 'tax_number with 11 digits'
     end
 
     context 'MT (Malta)' do
       let(:prefix) { 'MT' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
 
@@ -684,41 +686,41 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'NL (Netherlands)' do
       let(:prefix) { 'NL' }
-  
+
       it 'should be valid with 9 digits + "B" + 2 digits' do
         subject.tax_number = prefix + '123456789B12'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid without "B" on the 10 position' do
         subject.tax_number = prefix + '123456789X12'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less 9 digits + "B" + 2 digits' do
         subject.tax_number = prefix + '12345678B12'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more 9 digits + "B" + 2 digits' do
         subject.tax_number = prefix + '1234567890B12'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with 8 digits + "B" + less then 2 digits' do
         subject.tax_number = prefix + '12345678B1'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more 8 digits + "B" + more then 2 digits' do
         subject.tax_number = prefix + '12345678B123'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'NO (Norway)' do
       let(:prefix) { 'NO' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
 
@@ -736,19 +738,19 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'PH (Philippines)' do
       let(:prefix) { 'PH' }
-  
+
       it_behaves_like 'tax_number with 12 digits'
     end
-  
+
     context 'PL (Poland)' do
       let(:prefix) { 'PL' }
-  
+
       it_behaves_like 'tax_number with 10 digits'
     end
-  
+
     context 'PT (Portugal)' do
       let(:prefix) { 'PT' }
-  
+
       it_behaves_like 'tax_number with 9 digits'
     end
 
@@ -760,126 +762,126 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'RO (Romania)' do
       let(:prefix) { 'RO' }
-  
+
       it 'should be valid with 2 digits' do
         subject.tax_number = prefix + '12'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 3 digits' do
         subject.tax_number = prefix + '123'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 4 digits' do
         subject.tax_number = prefix + '1234'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 5 digits' do
         subject.tax_number = prefix + '12345'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 6 digits' do
         subject.tax_number = prefix + '123456'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 7 digits' do
         subject.tax_number = prefix + '1234567'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 8 digits' do
         subject.tax_number = prefix + '12345678'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 9 digits' do
         subject.tax_number = prefix + '123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should be valid with 10 digits' do
         subject.tax_number = prefix + '123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid if the first digit is 0' do
         subject.tax_number = prefix + '01'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less then 2 digits' do
         subject.tax_number = prefix + '1'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 10 digits' do
         subject.tax_number = prefix + '12345678901'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'RU (Russia)' do
       let(:prefix) { 'RU' }
-  
+
       it_behaves_like 'tax_number with 10 digits'
     end
-  
+
     context 'SE (Sweden)' do
       let(:prefix) { 'SE' }
-  
+
       it 'should be valid with 10 digits + "01"' do
         subject.tax_number = prefix + '123456789001'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid without "01" at the end' do
         subject.tax_number = prefix + '123456789012'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with less then 10 digits + "01"' do
         subject.tax_number = prefix + '12345678901'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 10 digits + "01"' do
         subject.tax_number = prefix + '1234567890101'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
-  
+
     context 'SI (Slovenia)' do
       let(:prefix) { 'SI' }
-  
+
       it_behaves_like 'tax_number with 8 digits'
     end
-  
+
     context 'SK (Slovakia)' do
       let(:prefix) { 'SK' }
-  
+
       it_behaves_like 'tax_number with 10 digits'
     end
-  
+
     context 'SM (San Marino)' do
       let(:prefix) { 'SM' }
-  
+
       it 'should be valid with 5 digits' do
         subject.tax_number = prefix + '12345'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
-  
+
       it 'should not be valid with less then 5 digits' do
         subject.tax_number = prefix + '1234'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
-  
+
       it 'should not be valid with more then 5 digits' do
         subject.tax_number = prefix + '123456'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
 
@@ -891,13 +893,13 @@ describe ActiveModel::Validations::VatIdValidator do
 
     context 'TR (Turkey)' do
       let(:prefix) { 'TR' }
-  
+
       it_behaves_like 'tax_number with 10 digits'
     end
-  
+
     context 'UA (Ukraine)' do
       let(:prefix) { 'UA' }
-  
+
       it_behaves_like 'tax_number with 12 digits'
     end
 
@@ -912,32 +914,32 @@ describe ActiveModel::Validations::VatIdValidator do
 
       it 'should be valid with "J" + 9 digits' do
         subject.tax_number = prefix + 'J123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it 'should be valid with "G" + 9 digits' do
         subject.tax_number = prefix + 'G123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it 'should be valid with "V" + 9 digits' do
         subject.tax_number = prefix + 'V123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it 'should be valid with "E" + 9 digits' do
         subject.tax_number = prefix + 'E123456789'
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it 'should not be valid with less then 9 digits' do
         subject.tax_number = prefix + 'E12345678'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
 
       it 'should not be valid with more then 9 digits' do
         subject.tax_number = prefix + 'E1234567890'
-        subject.should_not be_valid
+        expect(subject).not_to be_valid
       end
     end
   end