validates_zipcode 0.5.4 → 0.7.0

data/Appraisals

@@ -1,19 +1,11 @@
 # frozen_string_literal: true
 
-appraise 'rails-4.2' do
-  gem 'activemodel', '~> 4.2.0'
+appraise 'rails-8.0' do
+  gem 'activemodel', '~> 8.0.0'
 end
 
-appraise 'rails-5.2' do
-  gem 'activemodel', '~> 5.2.0'
-end
-
-appraise 'rails-6.1' do
-  gem 'activemodel', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'activemodel', '~> 7.0.0'
+appraise 'rails-8.1' do
+  gem 'activemodel', '~> 8.1.0'
 end
 
 appraise 'rails_edge' do

data/CHANGELOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.7.0
+
+**Heads up:** This release requires Ruby >= 3.3 and ActiveModel >= 8.0, the versions that still receive security fixes. Apps on older Ruby or Rails should stay on 0.6.x.
+
+- Drop support for end-of-life Ruby (< 3.3) and Rails (< 8.0); test on Ruby 3.3, 3.4 and 4.0 with Rails 8.0, 8.1 and main
+- Replace the defunct Travis CI setup with GitHub Actions
+- Accept Nigeria's (NG) 11-character digital postcode, such as `EK-01-A03-FK-01`, alongside the six-digit code. NIPOST launched it in October 2026. Thanks to ~ @Adeniyikayodee
+- Fix the Moldova (MD) postcode pattern: accept the canonical `MD-####` form and bare 4-digit codes, and reject non-`MD` letter prefixes. The previous pattern required any two letters and rejected the hyphenated form — fixes #73
+
+## 0.6.0
+
+**Heads up:** This release changes the behaviour of `ValidatesZipcode.valid?` when an unknown or malformed country code is passed. Previously, passing a country code not recognised by the gem (e.g. `'UKXXXXX'`) would return `true` — no regex to match against meant no failure. It will now return `false`.
+
+If you were relying on the old behaviour (passing arbitrary country codes and expecting `true`), this is a breaking change for those cases. For everyone else, this is the expected fix — an unrecognised country is not a valid one.
+
+- Return `false` when the country code is not a known ISO 3166-1 alpha-2 code, instead of silently returning `true` — fixes #67
+
+## 0.5.3
+
+- See commits up to 4e5a3132061d57d220d1616beb15d15a47d301df
+
 ## 0.5.2
 
 - Added support for Puerto Rico, thanks to ~ @tahanson

data/Gemfile

@@ -4,3 +4,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in validates_zipcode.gemspec
 gemspec
+
+gem 'appraisal'
+gem 'rake', '>= 13.0'
+gem 'rspec'
+gem 'rubocop'

data/README.md

@@ -1,10 +1,10 @@
-# ValidatesZipcode [![Build Status](https://secure.travis-ci.org/dgilperez/validates_zipcode.png)](https://travis-ci.org/dgilperez/validates_zipcode) [![Code Climate](https://codeclimate.com/github/dgilperez/validates_zipcode/badges/gpa.svg)](https://codeclimate.com/github/dgilperez/validates_zipcode) [![Gem Version](https://badge.fury.io/rb/validates_zipcode.svg)](http://badge.fury.io/rb/validates_zipcode) [![security](https://hakiri.io/github/dgilperez/validates_zipcode/master.svg)](https://hakiri.io/github/dgilperez/validates_zipcode/master)
+# ValidatesZipcode [![CI](https://github.com/dgilperez/validates_zipcode/actions/workflows/ci.yml/badge.svg)](https://github.com/dgilperez/validates_zipcode/actions/workflows/ci.yml) [![Gem Version](https://badge.fury.io/rb/validates_zipcode.svg)](https://badge.fury.io/rb/validates_zipcode)
 
 Adds zipcode / postal code validation support to Rails (ActiveModel), considering postal code formats for mostly every country.
 
 ``ValidatesZipcode`` currently support **233 country codes**. Regex data taken from several sources, being the main source the [CLDR](http://unicode.org/cldr/trac/browser/tags/release-27-d05/common/supplemental/postalCodeData.xml) database (release 27, around 159). Any other country's postal code will validate without errors.
 
-``ValidatesZipcode`` supports Rails >= 4.2 and Ruby >= 2.4. This gem could work in Rails 3.2 and Ruby 1.9.3 as well, yet unsupported; try v0.2 series if having trouble with later versions. Truffleruby is also tested, but no reports of working in production apps for now.
+``ValidatesZipcode`` supports the Ruby and Rails versions that still receive security fixes: Ruby >= 3.3 and Rails (ActiveModel) >= 8.0. For older versions, use the v0.6 series (Rails >= 4.2, Ruby >= 2.4) or the v0.2 series (Rails 3.2, Ruby 1.9.3).
 
 ## Installation
 

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake", ">= 13.0"
+gem "rspec"
+gem "rubocop"
+gem "activemodel", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake", ">= 13.0"
+gem "rspec"
+gem "rubocop"
+gem "activemodel", "~> 8.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "rake", ">= 13.0"
+gem "rspec"
+gem "rubocop"
 gem "activemodel", github: "rails/rails"
 
 gemspec path: "../"

data/lib/validates_zipcode/cldr_regex_collection.rb

@@ -9,25 +9,25 @@ 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/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/,
+      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/,
+      CA: /\A[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJ-NPRSTV-Z] ?\d[ABCEGHJ-NPRSTV-Z]\d\z/,
       DE: /\A\d{5}\z/,
       AU: /\A\d{4}\z/,
       IT: /\A\d{5}\z/,
       CH: /\A\d{4}\z/,
       AT: /\A\d{4}\z/,
       ES: /\A\d{5}\z/,
-      NL: /\A[1-9]\d{3}[ ]?(S[BCE-RT-Z]|[A-RT-Z][A-Z])\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/,
       FI: /\A\d{5}\z/,
       AX: /\A22\d{3}\z/,
-      KR: /\A(\d{5}|\d{3}[\-]\d{3})\z/,
+      KR: /\A(\d{5}|\d{3}-\d{3})\z/,
       CN: /\A\d{6}\z/,
       SG: /\A\d{6}\z/,
       DZ: /\A\d{5}\z/,
@@ -38,16 +38,16 @@ module ValidatesZipcode
       BD: /\A\d{4}\z/,
       BB: /\ABB([1-2]\d{4}|15156667)\z/,
       BY: /\A\d{6}\z/,
-      BM: /\A[A-Z]{2}[ ]?[A-Z0-9]{2}\z/,
+      BM: /\A[A-Z]{2} ?[A-Z0-9]{2}\z/,
       BA: /\A\d{5}\z/,
-      BN: /\A[BKTP][A-Z][ ]?\d{4}\z/i,
+      BN: /\A[BKTP][A-Z] ?\d{4}\z/i,
       BG: /\A\d{4}\z/,
       KH: /\A\d{6}\z/,
       CV: /\A\d{4}\z/,
-      CL: /\A\d{3}[-]?\d{4}\z/,
+      CL: /\A\d{3}-?\d{4}\z/,
       HR: /\A\d{5}\z/,
       CY: /\A\d{4}\z/,
-      CZ: /\A[1-7][0-9]{2}[ ]?\d{2}\z/,
+      CZ: /\A[1-7][0-9]{2} ?\d{2}\z/,
       DO: /\A\d{5}\z/,
       EC: /\A\d{6}\z/,
       EE: /\A\d{5}\z/,
@@ -66,24 +66,24 @@ module ValidatesZipcode
       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/,
+      LB: /\A(\d{4}( ?\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/i,
+      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/,
+      NG: /\A(\d{6}|[A-Z]{2}[- ]?(0[1-9]|[1-9]\d)[- ]?[A-Z0-9]{3}[- ]?[A-Z]{2}[- ]?(0[1-9]|[1-9]\d))\z/i,
       OM: /\A(PC )?\d{3}\z/i,
       PK: /\A\d{5}\z/,
       PY: /\A(\d{4}|\d{6})\z/,
       PH: /\A\d{4}\z/,
       PL: /\A\d{2}[ -]?\d{3}\z/,
-      PR: /\A00[679]\d{2}([ \-]\d{4})?\z/,
+      PR: /\A00[679]\d{2}([ -]\d{4})?\z/,
       RO: /\A\d{6}\z/,
       RU: /\A\d{6}\z/,
       SM: /\A4789\d\z/,
@@ -110,13 +110,13 @@ module ValidatesZipcode
       YU: /\A\d{5}\z/,
       CX: /\A6798\z/,
       ET: /\A\d{4}\z/,
-      FK: /\AFIQQ[ ]?1ZZ\z/i,
+      FK: /\AFIQQ ?1ZZ\z/i,
       NF: /\A2899\z/,
-      FM: /\A(9694[1-4])([ \-]\d{4})?\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/i,
-      GU: /\A969[1-3]\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/,
@@ -125,20 +125,20 @@ module ValidatesZipcode
       LS: /\A\d{3}\z/,
       MG: /\A\d{3}\z/,
       MN: /\A\d{5}(-?\d{4})?\z/,
-      MP: /\A9695[012]([ \-]\d{4})?\z/,
+      MP: /\A9695[012]([ -]\d{4})?\z/,
       MQ: /\A9[78]2\d{2}\z/,
       NC: /\A988\d{2}\z/,
       NE: /\A\d{4}\z/,
       PF: /\A987\d{2}\z/,
       PG: /\A\d{3}\z/,
       PM: /\A9[78]5\d{2}\z/,
-      PN: /\APCRN[ ]?1ZZ\z/i,
+      PN: /\APCRN ?1ZZ\z/i,
       PW: /\A96940\z/,
       RE: /\A974\d{2}\z/,
-      SH: /\A(ASCN|STHL|TDCU)[ ]?1ZZ\z/i,
+      SH: /\A(ASCN|STHL|TDCU) ?1ZZ\z/i,
       SJ: /\A\d{4}\z/,
       SZ: /\A[HLMS]\d{3}\z/i,
-      TC: /\ATKCA[ ]?1ZZ\z/i,
+      TC: /\ATKCA ?1ZZ\z/i,
       WF: /\A986\d{2}\z/,
       XK: /\A\d{5}\z/,
       YT: /\A976\d{2}\z/,
@@ -149,12 +149,12 @@ module ValidatesZipcode
       AL: /\A\d{4}\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,
+      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/,
+      BR: /\A\d{5}(-?\d{3})\z/,
       BJ: /\A([A-Z\d\s]){3,}\z/i,
       BT: /\A\d{5}\z/,
       BQ: /\A([A-Z\d\s]){3,}\z/i,
@@ -183,27 +183,27 @@ module ValidatesZipcode
       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/,
+      GI: /\A(GX11 ?1AA)\z/i,
+      GR: /\A\d{3} ?\d{2}\z/,
       GY: /\A([A-Z\d\s]){3,}\z/i,
       HN: /\A([A-Z]{2}|\d{1})\d{4}\z/i,
       IO: /\A\d{5}\z/,
       IR: /\A\d{5}\z/,
-      JP: /\A\d{3}\-?\d{4}\z/,
+      JP: /\A\d{3}-?\d{4}\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,
+      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/i,
+      LV: /\A(LV[- ]?)?\d{4}\z/i,
       LY: /\A\d{5}\z/,
-      LT: /\A(LT[\- ]?)?\d{5}\z/i,
+      LT: /\A(LT[- ]?)?\d{5}\z/i,
       LC: /\A([A-Z\d\s]){3,}\z/i,
       MC: /\A\d{5}\z/,
-      MD: /\A(([A-Z]){2})(|\s)\d{4}\z/i,
+      MD: /\A(MD[- ]?)?\d{4}\z/i,
       ME: /\A([A-Z\d\s]){3,}\z/i,
       MH: /\A\d{5}\z/,
       MR: /\A([A-Z\d\s]){3,}\z/i,
@@ -213,15 +213,15 @@ module ValidatesZipcode
       NA: /\A\d{5}\z/,
       NP: /\A\d{5}\z/,
       NR: /\A([A-Z\d\s]){3,}\z/i,
-      PT: /\A\d{4}([\-]\d{3})?\z/,
+      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-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/,
+      SE: /\A\d{3} ?\d{2}\z/,
+      SK: /\A[089]\d{2} ?\d{2}\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,

data/lib/validates_zipcode/formatter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module ValidatesZipcode
   class Formatter
-    WORD_CHAR_AND_DIGIT = /[A-Z0-9]/.freeze
+    WORD_CHAR_AND_DIGIT = /[A-Z0-9]/
 
     ZIPCODES_TRANSFORMATIONS = {
       AT: ->(z) { z.scan(/\d/).join },

data/lib/validates_zipcode/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ValidatesZipcode
-  VERSION = '0.5.4'
+  VERSION = '0.7.0'
 end

data/lib/validates_zipcode/zipcode.rb

@@ -12,6 +12,7 @@ module ValidatesZipcode
 
     def valid?
       return true if @excluded_country_codes.include?(@country_alpha2)
+      return false unless valid_country_alpha2?
       return true unless regexp
 
       zipcode = @format ? formatted_zip : @zipcode
@@ -31,6 +32,13 @@ module ValidatesZipcode
       @regexp ||= regexp_for_country_alpha2(@country_alpha2)
     end
 
+    # ISO 3166-1 alpha-2 codes are exactly 2 uppercase ASCII letters.
+    # Anything longer or shorter (e.g. "UKXXXXX", "G", "12") is not a
+    # valid country code and should fail validation immediately.
+    def valid_country_alpha2?
+      @country_alpha2.to_s.match?(/\A[A-Za-z]{2}\z/)
+    end
+
     def formatted_zip
       @formatted_zip ||= Formatter.new(zipcode: @zipcode, country_alpha2: @country_alpha2).format
     end

data/lib/validates_zipcode.rb

@@ -9,12 +9,12 @@ require 'validates_zipcode/zipcode'
 require 'validates_zipcode/formatter'
 
 module ValidatesZipcode
-  def self.valid?(*args)
-    build_zipcode(*args).valid?
+  def self.valid?(*)
+    build_zipcode(*).valid?
   end
 
-  def self.format(*args)
-    build_zipcode(*args).format
+  def self.format(*)
+    build_zipcode(*).format
   end
 
   def self.build_zipcode(zipcode, country_alpha2, options = {})

data/spec/format_zipcode_spec.rb

@@ -41,6 +41,6 @@ describe ValidatesZipcode::Formatter, '#format' do
 
   def check_format(country, formatting)
     from_zip, to_zip = formatting.first
-    expect(::ValidatesZipcode::Formatter.new(zipcode: from_zip, country_alpha2: country).format).to eq(to_zip)
+    expect(ValidatesZipcode::Formatter.new(zipcode: from_zip, country_alpha2: country).format).to eq(to_zip)
   end
 end

data/spec/spec_helper.rb

@@ -344,11 +344,11 @@ TEST_DATA = {
     ]
   },
   KR: {
-    valid: [
-      '72315',
-      '723-150',
-      '11011',
-      '110-110'
+    valid: %w[
+      72315
+      723-150
+      11011
+      110-110
     ],
     invalid: [
       nil,
@@ -554,9 +554,9 @@ TEST_DATA = {
   },
   KH: {
     valid: %w[
-      07113
-      02566
-      66261
+      071131
+      025662
+      662613
     ],
     invalid: [
       nil,
@@ -584,10 +584,10 @@ TEST_DATA = {
     ]
   },
   CL: {
-    valid: [
-      '123-1233',
-      '000-0000',
-      '1234567'
+    valid: %w[
+      123-1233
+      000-0000
+      1234567
     ],
     invalid: [
       nil,
@@ -915,10 +915,10 @@ TEST_DATA = {
     ]
   },
   LU: {
-    valid: [
-      'L-5635',
-      'L5635',
-      '5635'
+    valid: %w[
+      L-5635
+      L5635
+      5635
     ],
     invalid: [
       nil,
@@ -1065,11 +1065,15 @@ TEST_DATA = {
     ]
   },
   NG: {
-    valid: %w[
-      071134
-      025663
-      662612
-      071135
+    valid: [
+      '071134',
+      '025663',
+      '662612',
+      '071135',
+      'EK-01-A03-FK-01',
+      'EK 01 A03 FK 01',
+      'EK01A03FK01',
+      'ek01a03fk01'
     ],
     invalid: [
       nil,
@@ -1077,7 +1081,10 @@ TEST_DATA = {
       'invalid_zip',
       '12345',
       '123456-123456',
-      'D0D0D0'
+      'D0D0D0',
+      'EK-00-A03-FK-01',
+      'EK-01-A03-FK-00',
+      'EK-01-A03-FK-011'
     ]
   },
   OM: {
@@ -2156,19 +2163,20 @@ TEST_DATA = {
     ]
   },
   BR: {
-    valid: [
-      '58397-000',
-      '58915-000',
-      '58763000',
-      '58935-000',
-      '12345678'
+    valid: %w[
+      58397-000
+      58915-000
+      58763000
+      58935-000
+      12345678
     ],
     invalid: [
       nil,
       '',
       'invalid_zip',
       '1234',
-      '123456789'
+      '123456789',
+      '12345'
     ]
   },
   BJ: {
@@ -2657,11 +2665,11 @@ TEST_DATA = {
     ]
   },
   JP: {
-    valid: [
-      '1029200',
-      '102-9200',
-      '408-0301',
-      '207-1000'
+    valid: %w[
+      1029200
+      102-9200
+      408-0301
+      207-1000
     ],
     invalid: [
       nil,
@@ -2759,10 +2767,10 @@ TEST_DATA = {
     ]
   },
   LV: {
-    valid: [
-      'LV-1234',
-      'LV-8735',
-      '8735'
+    valid: %w[
+      LV-1234
+      LV-8735
+      8735
     ],
     invalid: [
       nil,
@@ -2838,13 +2846,16 @@ TEST_DATA = {
   },
   MD: {
     valid: %w[
+      2001
       MD2001
+      MD-2001
     ],
     invalid: [
       nil,
       '',
       'invalid_zip',
-      'MD-2100'
+      'XY2021',
+      'MD-202'
     ]
   },
   ME: {
@@ -2995,9 +3006,9 @@ TEST_DATA = {
     ]
   },
   PT: {
-    valid: [
-      '4500',
-      '4500-250'
+    valid: %w[
+      4500
+      4500-250
     ],
     invalid: [
       nil,

data/spec/validates_zipcode_spec.rb

@@ -17,7 +17,13 @@ describe ValidatesZipcode, '#validate_each' do
 
       context 'does not validate with invalid zipcodes' do
         values[:invalid].each do |zipcode|
-          display_name = zipcode.nil? ? 'nil' : zipcode.blank? ? 'blank' : zipcode
+          display_name = if zipcode.nil?
+                           'nil'
+                         elsif zipcode.blank?
+                           'blank'
+                         else
+                           zipcode
+                         end
 
           it display_name.to_s do
             record = build_record(zipcode, country_code)
@@ -73,7 +79,7 @@ describe ValidatesZipcode, '.valid?' do
     end
 
     it 'is false with an invalid zipcode for a given country code' do
-      ['1234', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
+      %w[1234 12345-12345 D0D0D0 invalid_zip].each do |zipcode|
         expect(ValidatesZipcode.valid?(zipcode, 'ES')).to eq(false)
       end
     end
@@ -82,6 +88,14 @@ describe ValidatesZipcode, '.valid?' do
       expect(ValidatesZipcode.valid?('12345', 'ZZ')).to eq(true)
     end
 
+    it 'is false with a malformed country code that is not a valid ISO 3166-1 alpha-2 code' do
+      expect(ValidatesZipcode.valid?('Sw1A 2aA', 'UKXXXXX')).to eq(false)
+      expect(ValidatesZipcode.valid?('12345', 'USA')).to eq(false)    # 3 letters
+      expect(ValidatesZipcode.valid?('12345', 'U')).to eq(false)      # 1 letter
+      expect(ValidatesZipcode.valid?('12345', '12')).to eq(false)     # digits
+      expect(ValidatesZipcode.valid?('12345', '')).to eq(false)       # empty
+    end
+
     it "is true with an excluded country code -  we don't want those to fail and nil is hairy" do
       expect(ValidatesZipcode.valid?('XXXX!!!XXXX', 'PA', excluded_country_codes: %w[PA])).to eq(true)
     end
@@ -138,6 +152,7 @@ end
 
 class ValidationDummyClass
   include ::ActiveModel::Validations
+
   attr_accessor :zipcode, :country_alpha2
 
   def self.name

data/validates_zipcode.gemspec

@@ -11,22 +11,18 @@ Gem::Specification.new do |s|
   s.email         = ['dgilperez@gmail.com']
   s.summary       = 'Localizable zipcode validation for Rails.'
   s.description   = 'Adds zipcode validation methods to ActiveModel considering different country zipcode formats.'
-  s.homepage      = 'http://github.com/dgilperez/validates_zipcode'
+  s.homepage      = 'https://github.com/dgilperez/validates_zipcode'
   s.license       = 'MIT'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = %w[lib]
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 3.3'
 
-  s.add_dependency 'activemodel', '>= 4.2.0'
+  s.add_dependency 'activemodel', '>= 8.0'
 
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake', '>= 12.3.3'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rubocop-rails'
+  s.metadata['changelog_uri'] = "#{s.homepage}/blob/master/CHANGELOG.md"
+  s.metadata['source_code_uri'] = s.homepage
+  s.metadata['rubygems_mfa_required'] = 'true'
 end