Skip to content

Adds BFPO support & tidies up regex list. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robotmay wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adds BFPO support & tidies up regex list. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b161416
Adds BFPO support & tidies up regex list.
Nov 1, 2011
fa64a12
Tests for BFPO
Nov 1, 2011
b58e6e7
Switched to hash
Nov 1, 2011
8f17d45
Update lib/validates_as_uk_postcode.rb
Nov 1, 2011
2b7790b
Update test/rails3/validates_as_uk_postcode_test.rb
Nov 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions lib/validates_as_uk_postcode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
module ValidatesAsUKPostcode
module Postcodes
UK = begin
an_naa_or_ann_naa = '^[A-PR-UWYZ]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
aan_naa_or_aann_naa = '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
ana_naa = '^[A-PR-UWYZ]{1}\d[A-HJKSTUW]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
aana_naa = '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d[ABEHMNPRVWXY]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
historic_code="GIR\s?0AA"
postcode_spec = "#{an_naa_or_ann_naa}|#{aan_naa_or_aann_naa}|#{ana_naa}|#{aana_naa}|#{historic_code}"
pattern = /#{postcode_spec}/i
UK = begin
patterns = {
:an_naa_or_ann_naa => '^[A-PR-UWYZ]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
:aan_naa_or_aann_naa => '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
:ana_naa => '^[A-PR-UWYZ]{1}\d[A-HJKSTUW]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
:aana_naa => '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d[ABEHMNPRVWXY]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
:historic_code => '^(gir)(0aa)$',
:bfpo => '^(bfpo)([0-9]{1,4})$',
:bfpo_co => '^(bfpo)(c\/o[0-9]{1,3})$'
}
values = patterns.collect{|k,v| v}
pattern = /#{values.join "|"}/i
end
end
end
Expand Down
4 changes: 4 additions & 0 deletions test/rails2/validates_as_uk_postcode_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ def test_invalid_postcodes
'EC1O 1BB', 'EC1Q 1BB', 'EC1S 1BB', 'EC1T 1BB', 'EC1U 1BB', 'EC1Z 1BB', 'EC1A 1IB',
'EC1A 1MB', 'EC1A 1OB', 'EC1A 1VB', 'EC1A 1BC', 'EC1A 1BI', 'EC1A 1BK', 'EC1A 1BM',
'EC1A 1BO', 'EC1A 1BV',

'BFPO 2789', 'BFPO c/o 2345'
]
postcodes.each do |postcode|
assert !AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be illegal."
Expand All @@ -58,6 +60,8 @@ def test_valid_postcodes
'EC1A 1BB',
'BT9 7JL',
'GIR 0AA',
'BFPO 772',
'BFPO c/o 63'
]
postcodes.each do |postcode|
assert AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be legal."
Expand Down
4 changes: 4 additions & 0 deletions test/rails3/validates_as_uk_postcode_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ def test_invalid_postcodes
'EC1O 1BB', 'EC1Q 1BB', 'EC1S 1BB', 'EC1T 1BB', 'EC1U 1BB', 'EC1Z 1BB', 'EC1A 1IB',
'EC1A 1MB', 'EC1A 1OB', 'EC1A 1VB', 'EC1A 1BC', 'EC1A 1BI', 'EC1A 1BK', 'EC1A 1BM',
'EC1A 1BO', 'EC1A 1BV',

'BFPO 2789', 'BFPO c/o 2345'
]
postcodes.each do |postcode|
assert !AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be illegal."
Expand All @@ -58,6 +60,8 @@ def test_valid_postcodes
'EC1A 1BB',
'BT9 7JL',
'GIR 0AA',
'BFPO 772',
'BFPO c/o 63'
]
postcodes.each do |postcode|
assert AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be legal."
Expand Down