valvat 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35c51e2fec07101b00e4b87d9e95fb7ff134e6bd
-  data.tar.gz: ad4e0b154dd6af5354888135402bff135409b9e2
+  metadata.gz: e373ba20e8fed84df96a492189f89b9ada0019f0
+  data.tar.gz: 53ede53f7b0e013f3453e1874e29435a22397551
 SHA512:
-  metadata.gz: e8ab1a7d14b5fff8a7917e190f3d3d850af8585befc54ec3beb80d84aaa6fd8c288ce78b095533bed68f0fc7c5127e03cdf54e7ed55d9004672f1e3cc1b7377f
-  data.tar.gz: be0f2b8ac6381f2fa45888c53a321b8bbebd02cdc8b22b86d1f223e07e2568d6afdddeddd97b4f2ec42919c380d1497404f9e711ede3bb620a7719c1811bb380
+  metadata.gz: 541abfbb3d0138b2bbdb446f49f5bf9ad7d967e10b78d8594405113cf0d1b9144483820b28ba7536b459f9bd62ac53ae59f86c75467ca281349101ad1c3dd012
+  data.tar.gz: 26a115b8ddb9e833754648b3738f08fdf54cb79482b4f4643033f095d6272687bae5bef01ccdd3c27aa5aff821e3b94c0d7f009abf9579e7b45d64f6f7c8484e

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.7.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.7.2...master)
+
+### 0.7.2 / 2018-02-26
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.7.1...v0.7.2)
+
+* Added support for GB vats checksum validation (by [ivopashov](https://github.com/ivopashov))
+* Corrected dutch language support (by [ploomans](https://github.com/ploomans))
 
 ### 0.7.1 / 2017-06-21
 

data/README.md

@@ -1,7 +1,7 @@
 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)
+[![Gem Version](https://badge.fury.io/rb/valvat.svg)](http://badge.fury.io/rb/valvat) [![Build Status](https://travis-ci.org/yolk/valvat.svg)](https://travis-ci.org/yolk/valvat) [![Code Climate](https://codeclimate.com/github/yolk/valvat.svg)](https://codeclimate.com/github/yolk/valvat)
 
 Validates european vat numbers. Standalone or as a ActiveModel validator.
 

data/lib/valvat/checksum/gb.rb

@@ -0,0 +1,35 @@
+class Valvat
+  module Checksum
+    class GB < Base
+      OLD_FORMAT_FORBIDDEN_RANGES = [(100_000..999_999), (9_490_001..9_700_000), (9_990_001..9_999_999)]
+      NEW_FORMAT_FORBIDDEN_RANGES = [(1..100_000), (100_001..1_000_000)]
+
+      def validate
+        vat_number = vat.to_s_wo_country
+        check_sum  = vat.to_s_wo_country[7..8].to_i
+        vat_base = vat_number[0..6]
+
+        # government departments and health authorities, so no checksum
+        return true if vat_number =~ /\A(GD[0-4]{1}\d{2})\Z/ || vat_number =~ /\A(HA[5-9]{1}\d{2})\Z/
+        return false if vat_number =~ /\A0{9}\Z/ || vat_number =~ /\A0{12}\Z/
+
+        vat_base_sum = vat_base.split('').
+          map(&:to_i).
+          zip([8, 7, 6, 5, 4, 3, 2]).
+          map { |vat_number_digit, multiplier| vat_number_digit * multiplier }.
+          inject(:+)
+
+        old_format_remainder = (vat_base_sum + check_sum).modulo(97)
+        new_format_remainder = (vat_base_sum + 55 + check_sum).modulo(97)
+
+        return false if old_format_remainder == 0 &&
+          OLD_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base.to_i }
+
+        return false if new_format_remainder == 0 &&
+          NEW_FORMAT_FORBIDDEN_RANGES.any? { |range| range.include? vat_base.to_i }
+
+        old_format_remainder == 0 || new_format_remainder == 0
+      end
+    end
+  end
+end

data/lib/valvat/locales/nl.yml

@@ -1,7 +1,7 @@
 nl:
   errors:
     messages:
-      invalid_vat: is niet een valide %{country_adjective} btw nummer
+      invalid_vat: is geen geldig %{country_adjective} btw nummer
   valvat:
     country_adjectives:
       eu: Europees

data/lib/valvat/version.rb

@@ -1,3 +1,3 @@
 class Valvat
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/spec/valvat/checksum/gb_spec.rb

@@ -0,0 +1,29 @@
+describe Valvat::Checksum::GB do
+  %w(GBGD100 GBHA600).each do |gov_agency_vat|
+    it "returns true on valid vat for government agency #{gov_agency_vat}" do
+      expect(Valvat::Checksum.validate(gov_agency_vat)).to be true
+    end
+  end
+
+  %w(GB000000000 GB000000000000).each do |invalid_vat|
+    it 'is false for all zero number' do
+      expect(Valvat::Checksum.validate(invalid_vat)).to be false
+    end
+  end
+
+  it 'is true for an old format valid vat' do
+    expect(Valvat::Checksum.validate('GB434031494')).to be true
+  end
+
+  it 'is true for a new format valid vat' do
+    expect(Valvat::Checksum.validate('GB434031439')).to be true
+  end
+
+  it 'is false for an old format vat in forbidden group' do
+    expect(Valvat::Checksum.validate('GB999999973')).to be false
+  end
+
+  it 'is false for a new format vat in forbidden group' do
+    expect(Valvat::Checksum.validate('GB100000034')).to be false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valvat
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Sebastian Munz
@@ -30,7 +30,7 @@ cert_chain:
   uE5yNhiszXkFmLQWPm57rwu8PbwT7av5kmYVhn8qkRz2aZnuAlLV3rcq2Khe5F0/
   jZmT2fJ8H8g=
   -----END CERTIFICATE-----
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -111,6 +111,7 @@ files:
 - lib/valvat/checksum/es.rb
 - lib/valvat/checksum/fi.rb
 - lib/valvat/checksum/fr.rb
+- lib/valvat/checksum/gb.rb
 - lib/valvat/checksum/gr.rb
 - lib/valvat/checksum/hr.rb
 - lib/valvat/checksum/hu.rb
@@ -160,6 +161,7 @@ files:
 - spec/valvat/checksum/es_spec.rb
 - spec/valvat/checksum/fi_spec.rb
 - spec/valvat/checksum/fr_spec.rb
+- spec/valvat/checksum/gb_spec.rb
 - spec/valvat/checksum/gr_spec.rb
 - spec/valvat/checksum/hr_spec.rb
 - spec/valvat/checksum/hu_spec.rb
@@ -217,6 +219,7 @@ test_files:
 - spec/valvat/checksum/es_spec.rb
 - spec/valvat/checksum/fi_spec.rb
 - spec/valvat/checksum/fr_spec.rb
+- spec/valvat/checksum/gb_spec.rb
 - spec/valvat/checksum/gr_spec.rb
 - spec/valvat/checksum/hr_spec.rb
 - spec/valvat/checksum/hu_spec.rb