Skip to content

Commit 29c7996

Browse files
MollemollMollemoll
committed
fix: linting
1 parent 486a3ef commit 29c7996

File tree

5 files changed

+34
-25
lines changed

5 files changed

+34
-25
lines changed

‎lib/valvat/checksum/ch.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class CH < Base
66
# All CH VAT starts with CHE. First figure is a character and should be skipped.
77
# The CH VATs can have a suffix (MWST, TVA, IVA) which should be skipped.
88
# Thus giving 8 figures to calculate the check digit
9-
FIGURES_RANGE = [1..8]
9+
FIGURES_RANGE = [1..8].freeze
1010
CHECK_DIGIT_POS = 9
1111

1212
def check_digit

‎lib/valvat/lookup/bfs.rb

+15-13
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,36 @@ class BFS < Base
3535
def self.prepare_for_lookup(vat)
3636
# BFS requires a space between the VAT number and the suffix (if present)
3737
index_of_suffix = vat =~ /MWST|IVA|TVA/
38-
return if !index_of_suffix
38+
return unless index_of_suffix
3939

4040
vat.insert(index_of_suffix, ' ')
4141
end
4242

4343
def perform
4444
return { valid: false } unless @options[:ch]
4545

46-
# BFS responds with a 500 if input is invalid, fault code is Data_validation_failed
4746
response = fetch(endpoint_uri)
48-
4947
case response
5048
when Net::HTTPSuccess
5149
parse(response.body)
5250
when Net::HTTPServerError
53-
if response.body =~ /Data_validation_failed/
54-
parse(response.body)
55-
else
56-
{ error: Valvat::HTTPError.new(response.code, self.class) }
57-
end
51+
parse_http_server_error(response)
5852
else
5953
{ error: Valvat::HTTPError.new(response.code, self.class) }
6054
end
6155
end
6256

6357
private
6458

59+
def parse_http_server_error(response)
60+
# BFS returns a 500 status code for data validation error
61+
if response.body =~ /Data_validation_failed/
62+
parse(response.body)
63+
else
64+
{ error: Valvat::HTTPError.new(response.code, self.class) }
65+
end
66+
end
67+
6568
def endpoint_uri
6669
ENDPOINT_URI
6770
end
@@ -90,18 +93,17 @@ def convert_values(hash)
9093
return build_fault(hash) if hash[:faultstring]
9194

9295
is_valid = case hash[:validate_vat_number_result]
93-
when 'true' then true
94-
when 'false' then false
95-
else nil
96-
end
96+
when 'true' then true
97+
when 'false' then false
98+
end
9799

98100
{ valid: is_valid }
99101
end
100102

101103
FAULTS = {
102104
'securityFaultFault' => SecurityError,
103105
'businessFaultFault' => BusinessError,
104-
'infrastructureFaultFault' => InfrastructureError,
106+
'infrastructureFaultFault' => InfrastructureError
105107
}.freeze
106108

107109
def build_fault(hash)

‎spec/valvat/checksum/ch_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
require 'spec_helper'
44

55
describe Valvat::Checksum::CH do
6-
["CHE-343.663.860", "CHE343663860", "CHE-355.036.078", "CHE355036078", "CHE-480.519.647", " CHE480519647"].each do |valid_vat|
6+
['CHE-343.663.860', 'CHE343663860', 'CHE-355.036.078', 'CHE355036078', 'CHE-480.519.647',
7+
"\tCHE480519647"].each do |valid_vat|
78
it "returns true on valid VAT #{valid_vat}" do
89
expect(Valvat::Checksum.validate(valid_vat)).to be(true)
910
end

‎spec/valvat/lookup/bfs_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
it 'returns hash that includes valid: false on invalid input' do
1313
response = described_class.new('CHE-343.663.86MWST', ch: true).perform
1414
expect(response).to match({
15-
:detail=>nil,
16-
:faultcode=>"s:Client",
17-
:faultstring=>"Data_validation_failed",
18-
:valid=>false,
15+
detail: nil,
16+
faultcode: 's:Client',
17+
faultstring: 'Data_validation_failed',
18+
valid: false
1919
})
2020
end
2121
end

‎spec/valvat/syntax_spec.rb

+12-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,18 @@ def it_validates(valid_vats, invalid_vats)
2121
it_validates(%w[ATU03458890], %w[ATU034588908 ATU0345908 ATU0345889Y])
2222
it_validates(%w[BE0817331995 BE1817331999], %w[BE081733199 BE08173319944 BE081733199H BE2817331999])
2323
it_validates(%w[BG468134789 BG4681347897], %w[BG46813478979 BG4681347897C BG46813478G BG46813478])
24-
it_validates(["CHE-343.663.860", "CHE-343.663.860MWST", "CHE-343.663.860 MWST", "CHE343663860", "CHE343663860MWST", "CHE343663860 MWST"],
25-
["CHE-343.663.8601", "CHE-343.663.8601MWST", "CHE-343.663.8601 MWST", "CHE-34.663.860", "CHE-34.663.860MWST", "CHE-34.663.860 MWST"])
26-
it_validates(["CHE-343.663.860", "CHE-343.663.860TVA", "CHE-343.663.860 TVA", "CHE343663860", "CHE343663860TVA", "CHE343663860 TVA"],
27-
["CHE-343.663.8601", "CHE-343.663.8601TVA", "CHE-343.663.8601 TVA", "CHE-34.663.860", "CHE-34.663.860TVA", "CHE-34.663.860 TVA"])
28-
it_validates(["CHE-343.663.860", "CHE-343.663.860IVA", "CHE-343.663.860 IVA", "CHE343663860", "CHE343663860IVA", "CHE343663860 IVA"],
29-
["CHE-343.663.8601", "CHE-343.663.8601IVA", "CHE-343.663.8601 IVA", "CHE-34.663.860", "CHE-34.663.860IVA", "CHE-34.663.860 IVA"])
24+
it_validates(['CHE-343.663.860', 'CHE-343.663.860MWST', 'CHE-343.663.860 MWST', 'CHE343663860', 'CHE343663860MWST',
25+
'CHE343663860 MWST'],
26+
['CHE-343.663.8601', 'CHE-343.663.8601MWST', 'CHE-343.663.8601 MWST', 'CHE-34.663.860',
27+
'CHE-34.663.860MWST', 'CHE-34.663.860 MWST'])
28+
it_validates(['CHE-343.663.860', 'CHE-343.663.860TVA', 'CHE-343.663.860 TVA', 'CHE343663860', 'CHE343663860TVA',
29+
'CHE343663860 TVA'],
30+
['CHE-343.663.8601', 'CHE-343.663.8601TVA', 'CHE-343.663.8601 TVA', 'CHE-34.663.860',
31+
'CHE-34.663.860TVA', 'CHE-34.663.860 TVA'])
32+
it_validates(['CHE-343.663.860', 'CHE-343.663.860IVA', 'CHE-343.663.860 IVA', 'CHE343663860', 'CHE343663860IVA',
33+
'CHE343663860 IVA'],
34+
['CHE-343.663.8601', 'CHE-343.663.8601IVA', 'CHE-343.663.8601 IVA', 'CHE-34.663.860',
35+
'CHE-34.663.860IVA', 'CHE-34.663.860 IVA'])
3036
it_validates(%w[CY36579347A CY36579347C CY60000347C], %w[CY36579347 CY365793478 CY365793478A CY365793G])
3137
it_validates(%w[CZ56389267 CZ563892670 CZ5638926790], %w[CZ5638926 CZ56389268901])
3238
it_validates(%w[DE345889003], %w[DE34588900 DE3458890090 DE34588900C])

0 commit comments

Comments
 (0)