valvat 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2422dd0589a6a76903426d5b4e738e3b3c66c9c8
-  data.tar.gz: 0f473b7a536cc5f8eb48a9071821e09f88f4e213
+  metadata.gz: c91978204cfd4d62e0e63532f7ba5050ffb961ff
+  data.tar.gz: 3a3c0cc26abeef11d53eeca8b217f9315f15b99d
 SHA512:
-  metadata.gz: c871aec23db77c958785bb116b03348dd030946aeec3ed85b923b991fc98c084ebf146bda3a8a77459b411d556f14f39d8b0d612f758ec45122587999c2fc47e
-  data.tar.gz: ddea5c3424e6f95c39858a6d1b1ef418b9b9afc8f1d65ce17cdf189ea8106c3446136230159c322307dd71e337e58000254df5d6c980a62cefba344c775fb6e2
+  metadata.gz: 3da453e8fd22a40fa17395ce4726d4688be3a5c156ecb3d7b267c7b88c416f5764ad613774afdf41021ad7c047580f1bf3c672da8203e70b4fb9ac2ef0b5a8ef
+  data.tar.gz: 24b21743ebf0a7f824f36c3a4a87184ad1fd981b5c8aca00627939ac87639c763116707106a47313af691aff4b226b8ae33c3ed9f0f240b425ee1012a3895b07

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+gemfile:
+  - gemfiles/activemodel-4
+  - gemfiles/activemodel-3-2
+  - gemfiles/standalone

data/CHANGES.md

@@ -1,6 +1,16 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.5.0...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.0...master)
+
+### 0.6.0 / 2013-08-01
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.5.0...v0.6.0)
+
+* Works now with current version of savon gem (2.3.0) (by [liggitt](https://github.com/liggitt))
+* Corrected regex for IE VAT numbers (by [brianphillips](https://github.com/brianphillips))
+* Improved PT translation
+* Some code refactorings
+* Spec improvments
 
 ### 0.5.0 / 2013-07-18
 

data/README.md

@@ -1,4 +1,7 @@
-# valvat
+valvat
+===========
+
+[![Gem Version](https://badge.fury.io/rb/valvat.png)](http://badge.fury.io/rb/valvat) [![Build Status](https://travis-ci.org/yolk/valvat.png)](https://travis-ci.org/yolk/valvat) [![Code Climate](https://codeclimate.com/github/yolk/valvat.png)](https://codeclimate.com/github/yolk/valvat)
 
 Validates european vat numbers. Standalone or as a ActiveModel validator.
 
@@ -11,7 +14,7 @@ Validates european vat numbers. Standalone or as a ActiveModel validator.
 * I18n locales for country specific error messages in English, German, Swedish, Italian, Portuguese, Polish, Bulgarian, Romanian and Latvian.
 * *Experimental* checksum verification
 
-valvat is tested and works with ruby 1.8.7/1.9.3/2.0 and ActiveModel 3.2/4.0
+valvat is tested and works with ruby 1.9.3/2.0 and ActiveModel 3.2/4.0
 
 ## Installation
 
@@ -47,8 +50,8 @@ Or to lookup a vat number string directly via VIES web service:
 
 valvat allows to check vat numbers from AT, BE, BG, DE, DK, ES, FI, GR, IE, IT, LU, NL, PL, PT, SE and SI against a checksum calculation. All other countries will fall back to a simple syntax check:
 
-  Valvat.new("DE345789003").valid_checksum?
-  => true or false
+    Valvat.new("DE345789003").valid_checksum?
+    => true or false
 
 These results are more valuabel than a simple syntax check, but keep in mind: they can not replace a lookup via VIES.
 
@@ -56,8 +59,8 @@ These results are more valuabel than a simple syntax check, but keep in mind: th
 
 To bypass initializing a Valvat instance:
 
-  Valvat::Checksum.validate("DE345789003")
-  => true or false
+    Valvat::Checksum.validate("DE345789003")
+    => true or false
 
 ## Details & request identifier
 
@@ -88,7 +91,7 @@ To receive a requestIdentifier you need to pass your own VAT number in the optio
 
 When the valvat gem is required and ActiveModel is already loaded, everything will work fine out of the box. If your load order differs just add
 
-    require 'valvat/active_model'
+    require 'active_model/validations/valvat_validator'
 
 after ActiveModel has been loaded.
 
@@ -181,6 +184,9 @@ This basically just removes trailing spaces and ensures all chars are uppercase.
 
 ## Contributions by
 
+* [brianphillips](https://github.com/brianphillips)
+* [wasi](https://github.com/wasi)
+* [liggitt](https://github.com/liggitt)
 * [nevesenin](https://github.com/nevesenin)
 * [shaundaley39](https://github.com/shaundaley39)
 * [lcx](https://github.com/lcx)

data/gemfiles/activemodel-3-2

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "savon",       "2.3.0"
+gem "activemodel", "3.2.13"
+
+gem 'rspec', '>= 2.4.0'
+gem 'fakeweb', '>= 1.3.0'
+gem 'rake'

data/gemfiles/activemodel-4

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "savon",       "2.3.0"
+gem "activemodel", "4.0"
+
+gem 'rspec', '>= 2.4.0'
+gem 'fakeweb', '>= 1.3.0'
+gem 'rake'

data/gemfiles/standalone

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem "savon",       "2.3.0"
+
+gem 'rspec', '>= 2.4.0'
+gem 'fakeweb', '>= 1.3.0'
+gem 'rake'

data/lib/active_model/validations/valvat_validator.rb

@@ -0,0 +1,54 @@
+require 'active_model'
+require 'valvat/syntax'
+require 'valvat/lookup'
+
+module ActiveModel
+  module Validations
+    class ValvatValidator < EachValidator
+      def validate_each(record, attribute, value)
+        vat = Valvat(value)
+        iso_country_code = vat.iso_country_code
+
+        if country_does_not_match?(record, iso_country_code)
+          iso_country_code = iso_country_code_of(record)
+        elsif vat.valid? && valid_checksum?(vat) && vat_exists?(vat)
+          return
+        end
+
+        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.#{iso_country_code.downcase}",
+            :default => [:"valvat.country_adjectives.eu", "european"]
+          )
+        )
+      end
+
+      private
+
+      def country_does_not_match?(record, iso_country_code)
+        return false unless options[:match_country]
+        iso_country_code_of(record) != iso_country_code
+      end
+
+      def iso_country_code_of(record)
+        (record.send(options[:match_country]) || "").upcase
+      end
+
+      def valid_checksum?(vat)
+        return true unless options[:checksum]
+        vat.valid_checksum?
+      end
+
+      def vat_exists?(vat)
+        return true unless options[:lookup]
+        is_valid = vat.exists?
+        return is_valid unless is_valid.nil?
+        options[:lookup] != :fail_if_down
+      end
+    end
+  end
+end
+
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/../../valvat/locales/*.yml"]

data/lib/valvat.rb

@@ -51,4 +51,4 @@ require 'valvat/lookup'
 require 'valvat/lookup/request'
 require 'valvat/lookup/request_with_id'
 require 'valvat/version'
-require 'valvat/active_model' if defined?(ActiveModel)
+require 'active_model/validations/valvat_validator' if defined?(ActiveModel)

data/lib/valvat/checksum.rb

@@ -51,10 +51,31 @@ class Valvat
       def str_wo_country
         vat.to_s_wo_country
       end
+
+      def sum_figures_by
+        figures.reverse.each_with_index.map do |fig, i|
+          yield(fig, i)
+        end.inject(:+)
+      end
+
+      def sum_of_squares(num)
+        num.to_s.split("").map(&:to_i).inject(:+)
+      end
+
+      def sum_of_figures_for_at_es_it_se(reverse_ints=false)
+        ints = reverse_ints ? [2, 1] : [1, 2]
+        sum_figures_by do |fig, i|
+          sum_of_squares(fig*(i.modulo(2) == 0 ? ints[0] : ints[1]))
+        end
+      end
+
+      def sum_of_figues_for_pt_si
+        11 - sum_figures_by do |fig, i|
+          fig*(i+2)
+        end.modulo(11)
+      end
     end
   end
 end
 
-Dir[File.dirname(__FILE__) + "/checksum/*.rb"].each do |file|
-  require file
-end
+Dir.glob(File.dirname(__FILE__) + "/checksum/*.rb", &method(:require))

data/lib/valvat/checksum/at.rb

@@ -4,9 +4,7 @@ class Valvat
   module Checksum
     class AT < Base
       def check_digit
-        chk = 96 - figures.reverse.each_with_index.map do |fig, i|
-          (fig*(i.modulo(2) == 0 ? 1 : 2)).to_s.split("").inject(0) { |sum, n| sum + n.to_i }
-        end.inject(:+)
+        chk = 96 - sum_of_figures_for_at_es_it_se
         chk.to_s[-1].to_i
       end
 

data/lib/valvat/checksum/bg.rb

@@ -4,31 +4,31 @@ class Valvat
       def check_digit
         natural_person? ? check_digit_natural_person : check_digit_legal_person
       end
-      
+
       def check_digit_natural_person
         local_person_chk = check_digit_local_natural_person
 
         return local_person_chk if given_check_digit == local_person_chk
         check_digit_foreign_natural_person
       end
-      
+
       def check_digit_local_natural_person
         weight = [2, 4, 8, 5, 10, 9, 7, 3, 6]
         chk = figures.map do |fig|
           fig * weight.shift
         end.inject(:+).modulo(11)
-        
+
         return chk if chk < 10
         return 0
       end
-      
+
       def check_digit_foreign_natural_person
         weight = [21, 19, 17, 13, 11, 9, 7, 3, 1]
 
         chk = figures.map do |fig|
           fig * weight.shift
         end.inject(:+).modulo(10)
-        
+
         chk
       end
 
@@ -37,22 +37,22 @@ class Valvat
         figures.each_with_index do |fig, index|
           prod += (index + 1) * fig.to_i
         end
-        
+
         chk = prod % 11
-        
+
         if chk == 10
           prod = 0
           figures.each_with_index do |fig, index|
             prod += (index + 3) * fig.to_i
           end
-          
+
           chk = prod % 11
           chk = 0 if chk == 10
         end
-        
+
         chk
       end
-      
+
       def natural_person?
         vat.to_s_wo_country.length == 10
       end

data/lib/valvat/checksum/es.rb

@@ -4,7 +4,9 @@ class Valvat
   module Checksum
     class ES < Base
       NATURAL_PERSON_CHARS       = %w(T R W A G M Y F P D X B N J Z S Q V H L C K E)
+      NATURAL_PERSON_EXP         = /\A([\d]{8}[ABCDEFGHJKLMNPQRSTVWXYZ]|[KLMX][\d]{7}[ABCDEFGHJKLMNPQRSTVWXYZ])\Z/
       LEGAL_FOREIGN_PERSON_CHARS = [false] + %w(A B C D E F G H I J)
+      LEGAL_FOREIGN_PERSON_EXP   = /\A[NPQRSW][\d]{7}[ABCDEFGHIJ]\Z/
 
       def check_digit
         natural_person? ? check_digit_natural_person : check_digit_legal_person
@@ -15,16 +17,14 @@ class Valvat
       end
 
       def check_digit_legal_person
-        chk = 10 - figures.reverse.each_with_index.map do |fig, i|
-          (fig*(i.modulo(2) == 0 ? 2 : 1)).to_s.split("").inject(0) { |sum, n| sum + n.to_i }
-        end.inject(:+).modulo(10)
-        legal_foreign_person? ? 
-          LEGAL_FOREIGN_PERSON_CHARS[chk] : 
+        chk = 10 - sum_of_figures_for_at_es_it_se(true).modulo(10)
+        legal_foreign_person? ?
+          LEGAL_FOREIGN_PERSON_CHARS[chk] :
           (chk == 10 ? 0 : chk)
       end
 
       def given_check_digit
-        natural_person? || legal_foreign_person? ? str_wo_country[-1] : super
+        person? ? str_wo_country[-1] : super
       end
 
       def str_wo_country
@@ -32,13 +32,16 @@ class Valvat
         str[0] =~ /\d/ ? str : str[1..-1]
       end
 
+      def person?
+        natural_person? || legal_foreign_person?
+      end
+
       def natural_person?
-        !!(vat.to_s_wo_country =~ /\A[\d]{8}[ABCDEFGHJKLMNPQRSTVWXYZ]\Z/) ||
-        !!(vat.to_s_wo_country =~ /\A[KLMX][\d]{7}[ABCDEFGHJKLMNPQRSTVWXYZ]\Z/)
+        !!(vat.to_s_wo_country =~ NATURAL_PERSON_EXP)
       end
 
       def legal_foreign_person?
-        !!(vat.to_s_wo_country =~ /\A[NPQRSW][\d]{7}[ABCDEFGHIJ]\Z/)
+        !!(vat.to_s_wo_country =~ LEGAL_FOREIGN_PERSON_EXP)
       end
     end
   end

data/lib/valvat/checksum/gr.rb

@@ -4,9 +4,9 @@ class Valvat
   module Checksum
     class GR < Base
       def check_digit
-        chk = figures.reverse.each_with_index.map do |fig, i|
+        chk = sum_figures_by do |fig, i|
           fig*(2**(i+1))
-        end.inject(:+).modulo(11)
+        end.modulo(11)
         chk > 9 ? 0 : chk
       end
     end

data/lib/valvat/checksum/ie.rb

@@ -4,9 +4,9 @@ class Valvat
   module Checksum
     class IE < Base
       def check_digit
-        figures.reverse.each_with_index.map do |fig, i|
+        sum_figures_by do |fig, i|
           fig*(i+2)
-        end.inject(:+).modulo(23)
+        end.modulo(23)
       end
 
       CHARS = "WABCDEFGHIJKLMNOPQRSTUV".split("")

data/lib/valvat/checksum/it.rb

@@ -4,7 +4,6 @@ class Valvat
   module Checksum
     class IT < Base
       def validate
-        # IT02762750210
         y = figures_str[7..9].to_i
         y >= 1 && (y <= 100 || [120, 121].include?(y)) &&
         figures_str[0..6] != "0000000" &&
@@ -12,9 +11,7 @@ class Valvat
       end
 
       def check_digit
-        chk = 10 - figures.reverse.each_with_index.map do |fig, i|
-          (fig*(i.modulo(2) == 0 ? 2 : 1)).to_s.split("").inject(0) { |sum, n| sum + n.to_i }
-        end.inject(:+).modulo(10)
+        chk = 10 - sum_of_figures_for_at_es_it_se(true).modulo(10)
         chk == 10 ? 0 : chk
       end
     end

data/lib/valvat/checksum/nl.rb

@@ -4,9 +4,9 @@ class Valvat
   module Checksum
     class NL < Base
       def check_digit
-        figures.reverse.each_with_index.map do |fig, i|
+        sum_figures_by do |fig, i|
           fig*(i+2)
-        end.inject(:+).modulo(11)
+        end.modulo(11)
       end
 
       def str_wo_country

data/lib/valvat/checksum/pt.rb

@@ -4,9 +4,7 @@ class Valvat
   module Checksum
     class PT < Base
       def check_digit
-        chk = 11 - figures.reverse.each_with_index.map do |fig, i|
-          fig*(i+2)
-        end.inject(:+).modulo(11)
+        chk = sum_of_figues_for_pt_si
         chk > 9 ? 0 : chk
       end
     end

data/lib/valvat/checksum/se.rb

@@ -13,9 +13,7 @@ class Valvat
       private
 
       def check_digit
-        figures.reverse.each_with_index.map do |fig, i|
-          (fig*(i.modulo(2) == 0 ? 1 : 2)).to_s.split("").inject(0) { |sum, n| sum + n.to_i }
-        end.inject(:+).modulo(10)
+        sum_of_figures_for_at_es_it_se.modulo(10)
       end
 
       def given_check_digit

data/lib/valvat/checksum/si.rb

@@ -9,9 +9,7 @@ class Valvat
       end
 
       def check_digit
-        chk = 11 - figures.reverse.each_with_index.map do |fig, i|
-          fig*(i+2)
-        end.inject(:+).modulo(11)
+        chk = sum_of_figues_for_pt_si
         chk == 1 ? 0 : chk
       end
     end

data/lib/valvat/locales/de.yml

@@ -1,7 +1,7 @@
 de:
   errors:
     messages:
-      invalid_vat: ist kein gültige %{country_adjective} UStId-Nr.
+      invalid_vat: ist keine gültige %{country_adjective} UStId-Nr.
   valvat:
     country_adjectives:
       eu: europäische