validates_zipcode 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b76a1516fa07d400bf8ecab157426a63385b512985468c7e506e5d5150f28570
-  data.tar.gz: 9bae835a99376edbe35c42e0419cf2dc7aec0cde7d22f6c5c4e4215389c9412c
+  metadata.gz: 214ffb965fb27983b44b38dbac18b42041d665e313862b10e809bf3f598c7698
+  data.tar.gz: bf2137923c16d09823dfb1fac10c372c2cb0f6f0fbb4c9053b7be5ee38098a2e
 SHA512:
-  metadata.gz: bc3619b94ba8b577fd35fa33c5a54b0c229470bc7b173c1408b9a5e552d5cd25ebe141f1445b5694e9576721837984f553b30eeade95485d210d188f5e11e294
-  data.tar.gz: 64baae1849d7ee97f4d887f5519f9a126ac00a129a47304de21f62790ae8a9c3e1ef9b163336efcd1bbf87d05b75b449be456ee2beacd60ecdeba59e980f8169
+  metadata.gz: 40bdbcb70fc0284c0b3f4d1ab3ad626a5f8fe37cd7ef893d5d38ff80961c30bd8736df59752cb4de8367768fa9a57b872a91af09e1376386af33c652b7629cf0
+  data.tar.gz: b359270f28b23d87c69f8af0646b7ad0e59140e09bd85b4fadb994b8fce94252c40a32b461f46c3d5fa6b16c806a7fd09c040ab37bbc7491b90b055ccf306edf

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.dccache

data/.rubocop.yml

@@ -12,7 +12,7 @@ require:
 AllCops:
   TargetRubyVersion: 2.4
 
-  TargetRailsVersion: 4.2
+  TargetRailsVersion: 5.2
 
   # Include common Ruby source files.
   Include:
@@ -862,7 +862,7 @@ Layout/DefEndAlignment:
 
 ##################### Rails ##################################
 Rails:
-  Enabled: true
+  Enabled: false
 
 Rails/ActionFilter:
   EnforcedStyle: action

data/.travis.yml

@@ -16,14 +16,15 @@ rvm:
   - 2.4.9
   - 2.5.7
   - 2.6.5
-  - 2.7.0
+  - 2.7.2
+  - 3.0.0
   - ruby-head
   - truffleruby
 
 gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
   - gemfiles/rails_edge.gemfile
 
 matrix:
@@ -32,6 +33,8 @@ matrix:
     - rvm: ruby-head
   exclude:
     - rvm: 2.4.9
-      gemfile: gemfiles/rails_6.gemfile
+      gemfile: gemfiles/rails_6.1.gemfile
     - rvm: 2.4.9
       gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -8,8 +8,8 @@ appraise 'rails-5.2' do
   gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails-6.0' do
-  gem 'activemodel', '~> 5.2.0'
+appraise 'rails-6.1' do
+  gem 'activemodel', '~> 6.1.0'
 end
 
 appraise 'rails_edge' do

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.5.0
+
+- Pass `format: true` option to the `validates_zipcode` or the constructor to attempt for format a given code using the (uncomplete) list of formatters by country. This process will happen before the validation takes place, dealing with case sensitive formats and whitespace, amongst others. This option is false by default for backwards compatibility. ~ @chloe-meister
+- Fixed unconsistent behaviour by which the `ValidatesZipcode.format` and `ValidatesZipcode::Formatter.new(..).format` where formatting an invalid code, the former, and raising a validity error, the latter. ~ @chloe-meister
+
+## 0.4.0
+
+**HEADS UP**: While I don't think this update would break any system for anyone, many formats where revisited to make them more loose or strict, potentially rendering your data invalid, particularly in edge cases or with data that was already incorrect in the first place and not flagges as such. I recommend you check your data with the new version in case these validations are critical to you. I am not releasing this as a 1.0 because there are no breaking changes in the API though. See PR #54 for more details.
+
+- Many regexps where modified to include recent changes in postal services, fix issues, narrow down formats that where unnecessary broad, allow for some looser cases such as optional whitespaces and making many of them case insensitive and removing countries with no postal codes - See PR #54. Thanks to ~ @ojsdude with some help from @dgilperez
+- Allow the gem to generate test data from the formatters. See README ~ @ojsdude
+- Officially support Ruby 3 and Rails 6.1
+
 ## 0.3.3
 
 - Fixes AR regex

data/README.md

@@ -82,6 +82,23 @@ ValidatesZipcode.format('Sw1A 2aA', 'FR')
 
 At the moment not every country is supported. See [lib/validates_zipcode/formatter.rb](lib/validates_zipcode/formatter.rb) to find all available countries.
 
+### Test data
+
+In order to generate test data, we suggest using the [regexp-examples gem](https://github.com/tom-lord/regexp-examples)
+This dependency will allow you to create examples as follows:
+
+```ruby
+require "regexp-examples"
+
+ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX[:ES].examples
+
+# => ["00000", "00001", "00002", "00003", ..., "44443", "44444"]
+
+ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX[:ES].random_example
+
+# => "27072"
+```
+
 ## Contributing
 
 1. Fork it

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    validates_zipcode (0.3.3)
+    validates_zipcode (0.5.0)
       activemodel (>= 4.2.0)
 
 GEM

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    validates_zipcode (0.3.3)
+    validates_zipcode (0.5.0)
       activemodel (>= 4.2.0)
 
 GEM

data/gemfiles/{rails_6.0.gemfile → rails_6.1.gemfile}

@@ -3,6 +3,6 @@
 
 source 'https://rubygems.org'
 
-gem 'activemodel', '~> 5.2.0'
+gem 'activemodel', '~> 6.1.0'
 
 gemspec path: '../'

data/gemfiles/rails_6.1.gemfile.lock

@@ -0,0 +1,85 @@
+PATH
+  remote: ..
+  specs:
+    validates_zipcode (0.5.0)
+      activemodel (>= 4.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.4.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-progressbar (1.11.0)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 6.1.0)
+  appraisal
+  bundler
+  rake (>= 12.3.3)
+  rspec
+  rubocop
+  rubocop-rails
+  validates_zipcode!
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/rails_edge.gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: ..
   specs:
-    validates_zipcode (0.3.3)
+    validates_zipcode (0.5.0)
       activemodel (>= 4.2.0)
 
 GEM

data/lib/validates_zipcode/cldr_regex_collection.rb

@@ -9,9 +9,9 @@ module ValidatesZipcode
       UK: /\AGIR ?0AA|((([A-Z]\d{1,2})|(([A-Z][A-HJ-Y]\d{1,2})|(([A-Z]\d[A-Z])|([A-Z][A-HJ-Y]\d?[A-Z])))) ?\d[A-Z]{2})\z/i,
       # GB: /\AGIR[ ]?0AA|((AB|AL|B|BA|BB|BD|BH|BL|BN|BR|BS|BT|CA|CB|CF|CH|CM|CO|CR|CT|CV|CW|DA|DD|DE|DG|DH|DL|DN|DT|DY|E|EC|EH|EN|EX|FK|FY|G|GL|GY|GU|HA|HD|HG|HP|HR|HS|HU|HX|IG|IM|IP|IV|JE|KA|KT|KW|KY|L|LA|LD|LE|LL|LN|LS|LU|M|ME|MK|ML|N|NE|NG|NN|NP|NR|NW|OL|OX|PA|PE|PH|PL|PO|PR|RG|RH|RM|S|SA|SE|SG|SK|SL|SM|SN|SO|SP|SR|SS|ST|SW|SY|TA|TD|TF|TN|TQ|TR|TS|TW|UB|W|WA|WC|WD|WF|WN|WR|WS|WV|YO|ZE)(\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}))|BFPO[ ]?\d{1,4}\z/i,
       # UK: /\A([A-PR-UWYZ0-9][A-HK-Y0-9][AEHMNPRTVXY0-9]?[ABEHMNPRVWXY0-9]? {1,2}[0-9][ABD-HJLN-UW-Z]{2}|GIR 0AA)\z/,
-      JE: /\AJE\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/,
-      GG: /\AGY\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/,
-      IM: /\AIM\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/,
+      JE: /\AJE\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/i,
+      GG: /\AGY\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/i,
+      IM: /\AIM\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/i,
       US: /\A\d{5}([ \-](?:\d{4}|\d{6}))?\z/,
       IE: /\A([AC-FHKNPRTV-Y]\d{2}|D6W)\s?[0-9AC-FHKNPRTV-Y]{4}\z/,
       CA: /\A[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJ-NPRSTV-Z][ ]?\d[ABCEGHJ-NPRSTV-Z]\d\z/,
@@ -21,7 +21,7 @@ module ValidatesZipcode
       CH: /\A\d{4}\z/,
       AT: /\A\d{4}\z/,
       ES: /\A\d{5}\z/,
-      NL: /\A[1-9]\d{3}[ ]?(?!SA|SD|SS)[A-Z]{2}\z/,
+      NL: /\A[1-9]\d{3}[ ]?(S[BCE-RT-Z]|[A-RT-Z][A-Z])\z/,
       BE: /\A\d{4}\z/,
       DK: /\A\d{4}\z/,
       NO: /\A\d{4}\z/,
@@ -34,13 +34,13 @@ module ValidatesZipcode
       AD: /\AAD\d{3}\z/,
       AR: /\A[A-HJ-NP-Z]{1}\d{4}([A-Z]{3})?\z/,
       AM: /\A(37)?\d{4}\z/,
-      BH: /\A((1[0-2]|[2-9])\d{2})?\z/,
+      BH: /\A(1[0-2]|[1-9])\d{2}\z/,
       BD: /\A\d{4}\z/,
-      BB: /\A(BB\d{5})?\z/,
+      BB: /\ABB([1-2]\d{4}|15156667)\z/,
       BY: /\A\d{6}\z/,
       BM: /\A[A-Z]{2}[ ]?[A-Z0-9]{2}\z/,
       BA: /\A\d{5}\z/,
-      BN: /\A[A-Z]{2}[ ]?\d{4}\z/,
+      BN: /\A[BKTP][A-Z][ ]?\d{4}\z/i,
       BG: /\A\d{4}\z/,
       KH: /\A\d{5}\z/,
       CV: /\A\d{4}\z/,
@@ -49,7 +49,7 @@ module ValidatesZipcode
       CY: /\A\d{4}\z/,
       CZ: /\A[1-7][0-9]{2}[ ]?\d{2}\z/,
       DO: /\A\d{5}\z/,
-      EC: /\A([A-Z]\d{4}[A-Z]|(?:[A-Z]{2})?\d{6})?\z/,
+      EC: /\A\d{6}\z/,
       EE: /\A\d{5}\z/,
       FO: /\A\d{3}\z/,
       GE: /\A\d{4}\z/,
@@ -60,29 +60,29 @@ module ValidatesZipcode
       IS: /\A\d{3}\z/,
       IN: /\A\d{6}\z/,
       ID: /\A\d{5}\z/,
-      IL: /\A\d{5,7}\z/,
+      IL: /\A(\d{5}|\d{7})\z/,
       JO: /\A\d{5}\z/,
       KZ: /\A\d{6}\z/,
       KE: /\A\d{5}\z/,
       KW: /\A\d{5}\z/,
       LA: /\A\d{5}\z/,
       LB: /\A(\d{4}([ ]?\d{4})?)?\z/,
-      LU: /\A(L\-)?\d{4}\z/,
+      LU: /\A(L[\- ]?)?\d{4}\z/,
       MK: /\A\d{4}\z/,
       MY: /\A\d{5}\z/,
       MV: /\A\d{5}\z/,
-      MT: /\A[A-Z]{3}[ ]?\d{2,4}\z/,
-      MU: /\A[ARar1-9]\d{4}\z/,
+      MT: /\A[A-Z]{3}[ ]?\d{2,4}\z/i,
+      MU: /\A[AR1-9]\d{4}\z/i,
       MX: /\A\d{5}\z/,
       MA: /\A\d{5}\z/,
       NZ: /\A\d{4}\z/,
       NI: /\A\d{5}\z/,
-      NG: /\A(\d{6})?\z/,
-      OM: /\A(PC )?\d{3}\z/,
+      NG: /\A\d{6}\z/,
+      OM: /\A(PC )?\d{3}\z/i,
       PK: /\A\d{5}\z/,
       PY: /\A\d{4}\z/,
       PH: /\A\d{4}\z/,
-      PL: /\A\d{2}-\d{3}\z/,
+      PL: /\A\d{2}[ -]?\d{3}\z/,
       PR: /\A00[679]\d{2}([ \-]\d{4})?\z/,
       RO: /\A\d{6}\z/,
       RU: /\A\d{6}\z/,
@@ -110,13 +110,13 @@ module ValidatesZipcode
       YU: /\A\d{5}\z/,
       CX: /\A6798\z/,
       ET: /\A\d{4}\z/,
-      FK: /\AFIQQ 1ZZ\z/,
+      FK: /\AFIQQ[ ]?1ZZ\z/i,
       NF: /\A2899\z/,
       FM: /\A(9694[1-4])([ \-]\d{4})?\z/,
       GF: /\A9[78]3\d{2}\z/,
       GP: /\A9[78][01]\d{2}\z/,
-      GS: /\ASIQQ 1ZZ\z/,
-      GU: /\A969[123]\d([ \-]\d{4})?\z/,
+      GS: /\ASIQQ[ ]?1ZZ\z/i,
+      GU: /\A969[1-3]\d([ \-]\d{4})?\z/,
       GW: /\A\d{4}\z/,
       HM: /\A\d{4}\z/,
       IQ: /\A\d{5}\z/,
@@ -132,117 +132,121 @@ module ValidatesZipcode
       PF: /\A987\d{2}\z/,
       PG: /\A\d{3}\z/,
       PM: /\A9[78]5\d{2}\z/,
-      PN: /\APCRN 1ZZ\z/,
+      PN: /\APCRN[ ]?1ZZ\z/i,
       PW: /\A96940\z/,
-      RE: /\A9[78]4\d{2}\z/,
-      SH: /\A(ASCN|STHL) 1ZZ\z/,
+      RE: /\A974\d{2}\z/,
+      SH: /\A(ASCN|STHL|TDCU)[ ]?1ZZ\z/i,
       SJ: /\A\d{4}\z/,
-      SZ: /\A[HLMS]\d{3}\z/,
-      TC: /\ATKCA 1ZZ\z/,
+      SZ: /\A[HLMS]\d{3}\z/i,
+      TC: /\ATKCA[ ]?1ZZ\z/i,
       WF: /\A986\d{2}\z/,
       XK: /\A\d{5}\z/,
       YT: /\A976\d{2}\z/,
       # NOTE: UAE has no postal codes
       # https://github.com/dgilperez/validates_zipcode/issues/28
-      # AE: /\A([a-zA-Z\d\s]){3,}\z/,
+      # AE: /\A([A-Z\d\s]){3,}\z/i,
       AF: /\A\d{4}\z/,
       AL: /\A\d{4}\z/,
-      AG: /\A([a-zA-Z\d\s]){3,}\z/,
-      AO: /\A([a-zA-Z\d\s]){3,}\z/,
-      AZ: /\A([a-zA-Z\d\s]){3,}\z/,
-      BF: /\A([a-zA-Z\d\s]){3,}\z/,
-      BI: /\A([a-zA-Z\d\s]){3,}\z/,
-      BS: /\A([a-zA-Z\d\s]){3,}\z/,
-      BZ: /\A([a-zA-Z\d\s]){3,}\z/,
+      AG: /\A([A-Z\d\s]){3,}\z/i,
+      AO: /\A([A-Z\d\s]){3,}\z/i,
+      AZ: /\A(AZ[ ]?)?\d{4}\z/i,
+      BF: /\A([A-Z\d\s]){3,}\z/i,
+      BI: /\A([A-Z\d\s]){3,}\z/i,
+      BS: /\A([A-Z\d\s]){3,}\z/i,
+      BZ: /\A([A-Z\d\s]){3,}\z/i,
       BR: /\A\d{5}(-?\d{3})?\z/,
-      BJ: /\A([a-zA-Z\d\s]){3,}\z/,
+      BJ: /\A([A-Z\d\s]){3,}\z/i,
       BT: /\A\d{5}\z/,
-      BQ: /\A([a-zA-Z\d\s]){3,}\z/,
+      BQ: /\A([A-Z\d\s]){3,}\z/i,
       BO: /\A\d{4}\z/,
-      BW: /\A([a-zA-Z\d\s]){3,}\z/,
-      CF: /\A([a-zA-Z\d\s]){3,}\z/,
-      CG: /\A([a-zA-Z\d\s]){3,}\z/,
-      CI: /\A([a-zA-Z\d\s]){3,}\z/,
-      CM: /\A([a-zA-Z\d]){3,7}\z/,
-      CO: /\A([a-zA-Z\d\s]){3,}\z/,
+      BW: /\A([A-Z\d\s]){3,}\z/i,
+      CF: /\A([A-Z\d\s]){3,}\z/i,
+      CG: /\A([A-Z\d\s]){3,}\z/i,
+      CI: /\A([A-Z\d\s]){3,}\z/i,
+      # NOTE: Cameroon has no postal codes
+      # CM: /\A([A-Z\d]){3,7}\z/i,
+      CO: /\A([A-Z\d\s]){3,}\z/i,
       CR: /\A\d{5}\z/,
       CU: /\A\d{5}\z/,
-      KM: /\A([a-zA-Z\d\s]){3,}\z/,
-      DJ: /\A([a-zA-Z\d\s]){3,}\z/,
-      DM: /\A([a-zA-Z\d\s]){3,}\z/,
-      EG: /\A([a-zA-Z\d\s]){3,}\z/,
-      GQ: /\A([a-zA-Z\d\s]){3,}\z/,
+      KM: /\A([A-Z\d\s]){3,}\z/i,
+      DJ: /\A([A-Z\d\s]){3,}\z/i,
+      DM: /\A([A-Z\d\s]){3,}\z/i,
+      EG: /\A([A-Z\d\s]){3,}\z/i,
+      GQ: /\A([A-Z\d\s]){3,}\z/i,
       EL: /\A\d{5}\z/,
-      ER: /\A([a-zA-Z\d\s]){3,}\z/,
-      FJ: /\A([a-zA-Z\d\s]){3,}\z/,
+      ER: /\A([A-Z\d\s]){3,}\z/i,
+      FJ: /\A([A-Z\d\s]){3,}\z/i,
       FR: /\A\d{5}\z/,
-      GA: /\A\d{2}\z/,
-      GD: /\A([a-zA-Z\d\s]){3,}\z/,
-      GH: /\A([a-zA-Z\d\s]){3,}\z/,
-      GM: /\A([a-zA-Z\d\s]){3,}\z/,
-      GN: /\A([a-zA-Z\d\s]){3,}\z/,
-      GI: /\A(GX11 1AA)\z/,
+      GA: /\A\d{4}\z/,
+      GD: /\A([A-Z\d\s]){3,}\z/i,
+      GH: /\A([A-Z\d\s]){3,}\z/i,
+      GM: /\A([A-Z\d\s]){3,}\z/i,
+      GN: /\A([A-Z\d\s]){3,}\z/i,
+      GI: /\A(GX11[ ]?1AA)\z/i,
       GR: /\A\d{3}[ ]?\d{2}\z/,
-      GY: /\A([a-zA-Z\d\s]){3,}\z/,
-      HN: /\A(([a-zA-Z]){2}|\d{2})\d{4}\z/,
+      GY: /\A([A-Z\d\s]){3,}\z/i,
+      HN: /\A(([A-Z]){2}|\d{2})\d{4}\z/i,
       IO: /\A\d{5}\z/,
       IR: /\A\d{5}\z/,
       JP: /\A\d{3}\-?\d{4}\z/,
-      JM: /\A(JM)[A-Z]{3}\d{2}\z/,
-      KI: /\A([a-zA-Z\d\s]){3,}\z/,
-      KN: /\A([a-zA-Z\d\s]){3,8}\z/,
-      KP: /\A([a-zA-Z\d\s]){3,8}\z/,
+      # Jamaica has no postcode system.However, for Kingston, there are one- and two-digit sector codes.
+      # On February 12, 2007 it was announced: "POST CODE PROJECT SUSPENDED INDEFINITELY"
+      # https://en.youbianku.com/Jamaica#:~:text=Jamaica%20has%20no%20postcode%20system,the%20name%20of%20the%20town.
+      JM: /\A((JM(DCN|CHR|AKN|DMR|BPD|AAW|CAN|ACE|DEH|CJS|BMY|BTS|CTY|DWD)(0[1-9]|[1-2]\d))|\d{1,2})?\z/i,
+      KI: /\AKI0[1-3]\d{2}\z/i,
+      KN: /\AKN[ ]?\d{4}\z/i,
+      KP: /\A([A-Z\d\s]){3,8}\z/i,
       LI: /\A\d{4}\z/,
-      LV: /\A(LV)?\-?\d{4}\z/,
+      LV: /\A(LV[\- ]?)?\d{4}\z/i,
       LY: /\A\d{5}\z/,
-      LT: /\A(LT-)?\d{5}\z/,
-      LC: /\A([a-zA-Z\d\s]){3,}\z/,
+      LT: /\A(LT[\- ]?)?\d{5}\z/i,
+      LC: /\A([A-Z\d\s]){3,}\z/i,
       MC: /\A\d{5}\z/,
-      MD: /\A(([a-zA-Z]){2})(|\s)\d{4}\z/,
-      ME: /\A([a-zA-Z\d\s]){3,}\z/,
+      MD: /\A(([A-Z]){2})(|\s)\d{4}\z/i,
+      ME: /\A([A-Z\d\s]){3,}\z/i,
       MH: /\A\d{5}\z/,
-      MR: /\A([a-zA-Z\d\s]){3,}\z/,
-      MM: /\A([a-zA-Z\d\s]){3,}\z/,
-      MW: /\A([a-zA-Z\d\s]){3,}\z/,
+      MR: /\A([A-Z\d\s]){3,}\z/i,
+      MM: /\A([A-Z\d\s]){3,}\z/i,
+      MW: /\A([A-Z\d\s]){3,}\z/i,
       MZ: /\A\d{4}\z/,
       NA: /\A\d{5}\z/,
       NP: /\A\d{6}\z/,
-      NR: /\A([a-zA-Z\d\s]){3,}\z/,
+      NR: /\A([A-Z\d\s]){3,}\z/i,
       PT: /\A\d{4}([\-]\d{3})?\z/,
       PS: /\A\d{3}\z/,
       PA: /\A\d{4}\z/,
       PE: /\A\d{5}\z/,
-      QA: /\A([a-zA-Z\d\s]){3,}\z/,
-      RW: /\A([a-zA-Z\d\s]){3,}\z/,
-      SC: /\A([a-zA-Z\d\s]){3,}\z/,
+      QA: /\A([A-Z\d\s]){3,}\z/i,
+      RW: /\A([A-Z\d\s]){3,}\z/i,
+      SC: /\A([A-Z\d\s]){3,}\z/i,
       SE: /\A\d{3}[ ]?\d{2}\z/,
       SK: /\A[089]\d{2}[ ]?\d{2}\z/,
-      SL: /\A([a-zA-Z\d\s]){3,}\z/,
-      SB: /\A([a-zA-Z\d\s]){3,}\z/,
-      SR: /\A([a-zA-Z\d\s]){3,}\z/,
-      SO: /\A([a-zA-Z\d\s]){3,}\z/,
-      SV: /\A([a-zA-Z\d\s]){3,}\z/,
+      SL: /\A([A-Z\d\s]){3,}\z/i,
+      SB: /\A([A-Z\d\s]){3,}\z/i,
+      SR: /\A([A-Z\d\s]){3,}\z/i,
+      SO: /\A([A-Z\d\s]){3,}\z/i,
+      SV: /\A([A-Z\d\s]){3,}\z/i,
       SD: /\A\d{5}\z/,
-      ST: /\A([a-zA-Z\d\s]){3,}\z/,
-      SY: /\A([a-zA-Z\d\s]){3,}\z/,
+      ST: /\A([A-Z\d\s]){3,}\z/i,
+      SY: /\A([A-Z\d\s]){3,}\z/i,
       SS: /\A\d{5}\z/,
       TD: /\A\d{5}\z/,
-      TG: /\A([a-zA-Z\d\s]){3,}\z/,
-      TO: /\A([a-zA-Z\d\s]){3,}\z/,
-      TZ: /\A([a-zA-Z\d\s]){3,}\z/,
+      TG: /\A([A-Z\d\s]){3,}\z/i,
+      TO: /\A([A-Z\d\s]){3,}\z/i,
+      TZ: /\A([A-Z\d\s]){3,}\z/i,
       TT: /\A\d{6}\z/,
       TW: /\A\d{3}(\d{2})?\z/,
-      UG: /\A([a-zA-Z\d\s]){3,}\z/,
-      UM: /\A([a-zA-Z\d\s]){3,}\z/,
-      UY: /\A([a-zA-Z\d\s]){3,}\z/,
-      VC: /\A(VC)\d{4}\z/,
+      UG: /\A([A-Z\d\s]){3,}\z/i,
+      UM: /\A([A-Z\d\s]){3,}\z/i,
+      UY: /\A([A-Z\d\s]){3,}\z/i,
+      VC: /\A(VC)\d{4}\z/i,
       VI: /\A\d{5}\z/,
-      VG: /\A([a-zA-Z\d\s]){3,}\z/,
+      VG: /\A([A-Z\d\s]){3,}\z/i,
       VN: /\A\d{6}\z/,
-      VU: /\A([a-zA-Z\d\s]){3,}\z/,
-      WS: /\A([a-zA-Z\d\s]){3,}\z/,
-      YE: /\A([a-zA-Z\d\s]){3,}\z/,
-      ZW: /\A([a-zA-Z\d\s]){3,}\z/
+      VU: /\A([A-Z\d\s]){3,}\z/i,
+      WS: /\A([A-Z\d\s]){3,}\z/i,
+      YE: /\A([A-Z\d\s]){3,}\z/i,
+      ZW: /\A([A-Z\d\s]){3,}\z/i
     }.freeze
 
     def regexp_for_country_alpha2(alpha2)