concerns_on_rails 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34c6e186b582806890012bb0f8bf049c1fd0f56f74007af7669cdb5ae713eb2
-  data.tar.gz: 298f957409be23ecfd9bbd0de46161ac56af7a01a6a300d29cf3bff9ca2b94d3
+  metadata.gz: f8d7976f6ba1afbdd29545f992c77fe50f42771828cb01ae14ea4dc194d6f36a
+  data.tar.gz: d159c7e96f3e430e71aa9d3d18f5ce8d70323cb6c13cb8fd403c8b122c4a0fb8
 SHA512:
-  metadata.gz: 6a96e094791d487cd9a534e4263de4bd902af9b533a8607ceb20906d4b38827c82ee0b370cb885d8a5800aef8a03a9b84cc718dc00074da1c0b1f35ade4fc2b3
-  data.tar.gz: e803d31da5694c6ad1a0ea28d928f9d552e75ded84420aa94cb816538e4cbe9b4a228f2b9dfa9428a8091b369444909d750523d2c5a0e9edae1f2df6fec95a78
+  metadata.gz: da311c75a34438a39c2bc2e2dc48916e205a15fee4aa40aeb609136ad2a26cba40b3c2ca919f5812e48aedde54bd22ac72ff778e86162e1f4ef29920468470b2
+  data.tar.gz: 9ad51a591b17b48c79afcb571090aa402338a87f491c0aba2f27b89ad0d28fd16f1e5a89b9f54f61790cc1c5ac15bec35e97698b3f7afefd157144cf513101c3

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 <!-- CHANGELOG.md -->
 
+## 1.11.1 (2026-06-05)
+
+### Added
+- **Models::Addressable**: `addressable_by` gained four options:
+  - `lengths:` — per-part length limits (`{ line1: 100, city: 3..50 }`); an Integer is a positive maximum, a Range is `min..max` (inclusive/exclusive, endless, and beginless all supported). Length is measured on the normalized value; messages mirror Rails (singular/plural). Bad bounds raise an `ArgumentError` at load time.
+  - `allow_blank:` — per-field opt-out (an Array of parts, or `true`) for the length check when a value is blank. Independent of `required:`.
+  - `normalize_country:` — opt-in canonicalization of a country value to its ISO 3166-1 alpha-2 code: a recognized English name (`"Canada"`) or 3-letter alpha-3 (`"CAN"`) maps to the alpha-2 (`"CA"`); unrecognized values are left untouched. Lets postal/state validation recognize a named country.
+  - `if:` / `unless:` — standard Rails validation conditions (Symbol, Proc, or Array) gating the address validations. Normalization still runs unconditionally.
+
+### Fixed
+- **Models::Addressable**: a present-but-unrecognized country (e.g. a full name with `normalize_country` off, or an invalid code) no longer borrows the `default_country`'s postal/state rules. It now falls back to the permissive postal pattern and skips state validation, so valid foreign postal codes aren't rejected against the wrong country. `default_country` still applies when the country column is absent or blank.
+
+### Internal
+- **Support::AddressData**: added `COUNTRY_DATA` (all 249 ISO 3166-1 countries → `[name, alpha-3]`) as the single source of truth; `ISO_COUNTRY_CODES` and the name / alpha-3 lookups are derived from it, and a new `normalize_country_code` backs the country normalization.
+
 ## 1.10.0 (2026-06-03)
 
 ### Added

data/README.md

@@ -725,6 +725,9 @@ class Place < ApplicationRecord
                  required:        %i[line1 city postal_code country],
                  default_country: "GB",                       # country used when the record has none
                  validate_state:  true,                       # opt-in US/CA state-code check
+                 lengths:         { line1: 100, city: 50, postal_code: 5..10 }, # max (Int) or min..max (Range)
+                 allow_blank:     %i[state],                   # these parts skip the length check when blank
+                 normalize_country: true,                      # "Canada"/"CAN" -> "CA" (off by default)
                  verify_with:     ->(rec) { Usps.verify(rec) } # opt-in external verifier
 end
 ```
@@ -735,20 +738,25 @@ end
 |-------------------|--------------------------------------|---------------------------------------------------------------------|
 | `line1:` … `country:` | same-named columns               | Map each canonical part to a real column. Missing columns are skipped. |
 | `required:`       | `%i[line1 city postal_code country]` | Parts (by canonical name) that must be present. Each must map to an existing column. |
-| `default_country:`| `"US"`                               | Country used to pick the postal-code format when the record has no recognized country. |
+| `default_country:`| `"US"`                               | Postal-code format used when the country column is **absent or blank**. A present-but-unrecognized country value falls back to the permissive pattern instead — see the postal note below. |
 | `validate_state:` | `false`                              | When `true`, validates the state against US / CA code sets.         |
+| `lengths:`        | `{}`                                 | Per-part length limits: `{ line1: 100, city: 50, postal_code: 5..10 }`. An Integer is a (positive) maximum; a Range is `min..max` (non-negative, satisfiable; endless `3..` and beginless `..50` allowed). Only the parts you list are checked. Bad bounds raise an `ArgumentError` at load time. |
+| `allow_blank:`    | `false`                              | Per-field opt-out for the length check: an Array of parts (e.g. `%i[line2 state]`), or `true` for all parts. A blank value for an allowed part skips its length check. Independent of `required:`. |
+| `normalize_country:` | `false`                           | When `true`, canonicalize the country to its ISO 3166-1 alpha-2 code: an English name (`"Canada"`, `"United States"`) or a 3-letter alpha-3 (`"CAN"`, `"USA"`) maps to the alpha-2 (`"CA"`, `"US"`); unrecognized values are left untouched. This also lets postal/state validation recognize a named country. |
 | `verify_with:`    | `nil`                                | A callable for real-world verification (see below).                 |
+| `if:` / `unless:` | `nil`                                | Standard Rails validation conditions (Symbol, Proc, or Array) gating the address **validations** — e.g. `if: :on_addresses?`. Normalization still runs unconditionally. |
 
 **What it normalizes** (in `before_validation`)
 - Text parts: `strip` + `squish`.
 - `postal_code`: squish + upcase, with canonical spacing for CA (`A1A1A1` → `A1A 1A1`).
-- `country` / `state`: upcased when they look like a 2-letter code (full names left alone).
+- `country` / `state`: upcased when they look like a 2-letter code (full names left alone). With `normalize_country: true`, a recognized ISO country name or alpha-3 code is canonicalized to its alpha-2 (`"Canada"`/`"CAN"` → `"CA"`); unrecognized values are left as-is.
 
 **What it validates**
 - Presence of every `required:` part.
 - `country`: a 2-letter value must be a real ISO 3166-1 alpha-2 code.
-- `postal_code`: matched against a per-country pattern (US, CA, GB, AU, DE, FR) with a permissive fallback for everything else.
+- `postal_code`: matched against a per-country pattern (US, CA, GB, AU, DE, FR) with a permissive fallback for everything else. A strict per-country pattern is only applied when the country is a recognized ISO alpha-2 code (or `default_country` when the country column is absent/blank); a present-but-unrecognized country (e.g. a full name like `"Canada"`) uses the permissive pattern, so valid foreign codes aren't rejected against the wrong country.
 - `state`: only when `validate_state: true` and the country is US/CA.
+- `lengths`: each listed part's length (measured on the **normalized** value) must fit its `min..max` (Integer = max only). Errors mirror Rails, including singular/plural: `"is too short (minimum is N characters)"` / `"is too long (maximum is 1 character)"`. A blank value satisfies a max-only rule and, by default, **fails a minimum greater than 0** — list the part in `allow_blank:` to skip the check when blank. `allow_blank` is independent of `required:`: presence is still governed solely by `required:`, so a required part with a minimum that's left blank reports both `"can't be blank"` and `"is too short …"`. Note length is counted *after* normalization, so a CA `postal_code` includes the inserted space (`"A1A 1A1"` is 7) — size limits accordingly.
 
 **External verification (`verify_with:`)** — runs **only after** structural validation passes, so you never spend an API call on an obviously-broken address. The callable receives the record and may either add to `record.errors` itself, or return:
 

data/lib/concerns_on_rails/models/addressable.rb

@@ -13,7 +13,10 @@ module ConcernsOnRails
     #     addressable_by                      # standard line1/line2/city/state/postal_code/country columns
     #     # addressable_by line1: :street, postal_code: :zip, country: :country_code,
     #     #                required: %i[line1 city postal_code], default_country: "GB",
-    #     #                validate_state: true, verify_with: ->(rec) { Usps.verify(rec) }
+    #     #                validate_state: true, verify_with: ->(rec) { Usps.verify(rec) },
+    #     #                lengths: { line1: 100, postal_code: 5..10 }, allow_blank: %i[state],
+    #     #                normalize_country: true,  # "Canada"/"CAN" -> "CA"
+    #     #                if: :on_addresses?        # Rails-style condition gating the validations
     #   end
     #
     # Scope is *format/structure* only — it checks shape, not real-world
@@ -31,15 +34,23 @@ module ConcernsOnRails
       # Parts required by default (each must map to an existing column).
       DEFAULT_REQUIRED = %i[line1 city postal_code country].freeze
 
+      # Prefix for the ArgumentErrors raised during configuration.
+      LABEL = "ConcernsOnRails::Models::Addressable".freeze
+
       included do
         class_attribute :addressable_fields, instance_accessor: false, default: {}
         class_attribute :addressable_required, instance_accessor: false, default: [].freeze
         class_attribute :addressable_default_country, instance_accessor: false, default: "US"
         class_attribute :addressable_validate_state, instance_accessor: false, default: false
         class_attribute :addressable_verifier, instance_accessor: false, default: nil
+        class_attribute :addressable_lengths, instance_accessor: false, default: {}
+        class_attribute :addressable_allow_blank, instance_accessor: false, default: [].freeze
+        class_attribute :addressable_normalize_country, instance_accessor: false, default: false
+        class_attribute :addressable_validation_registered, instance_accessor: false, default: false
 
+        # `validate :validate_address` is registered by `addressable_by` (not here) so it can
+        # carry the optional if:/unless: condition. Normalization always runs.
         before_validation :normalize_address
-        validate :validate_address
       end
 
       # Defined as a real module (not `class_methods do`) so the public macro and
@@ -51,23 +62,29 @@ module ConcernsOnRails
         # Configure the address. Column overrides are passed as `part: :column`
         # keyword pairs; everything else tunes behavior. See the module docs.
         def addressable_by(required: DEFAULT_REQUIRED, default_country: "US",
-                           validate_state: false, verify_with: nil, **mapping)
+                           validate_state: false, verify_with: nil,
+                           lengths: {}, allow_blank: false, normalize_country: false, **mapping)
+          condition = extract_validation_condition!(mapping)
           self.addressable_fields = resolve_addressable_fields(mapping)
           self.addressable_required = Array(required).map(&:to_sym)
           self.addressable_default_country = default_country.to_s.upcase
           self.addressable_validate_state = validate_state
           self.addressable_verifier = verify_with
+          self.addressable_lengths = resolve_lengths(lengths)
+          self.addressable_allow_blank = resolve_allow_blank(allow_blank)
+          self.addressable_normalize_country = normalize_country
           ensure_required_columns!
+          register_address_validation(condition)
         end
 
         private
 
         def resolve_addressable_fields(mapping)
           unknown = mapping.keys.map(&:to_sym) - DEFAULT_FIELDS.keys
-          raise ArgumentError, "ConcernsOnRails::Models::Addressable: unknown address part(s): #{unknown.join(', ')}" if unknown.any?
+          raise ArgumentError, "#{LABEL}: unknown address part(s): #{unknown.join(', ')}" if unknown.any?
 
           overrides = mapping.to_h { |part, column| [part.to_sym, column.to_sym] }
-          ensure_columns!("ConcernsOnRails::Models::Addressable", overrides.values)
+          ensure_columns!(LABEL, overrides.values)
           DEFAULT_FIELDS.merge(overrides).select { |_part, column| column_names.include?(column.to_s) }
         end
 
@@ -76,9 +93,86 @@ module ConcernsOnRails
           return if missing.empty?
 
           raise ArgumentError,
-                "ConcernsOnRails::Models::Addressable: required address part(s) #{missing.join(', ')} " \
+                "#{LABEL}: required address part(s) #{missing.join(', ')} " \
                 "have no matching column (table: #{table_name})"
         end
+
+        # Normalize the lengths: option into { part => [min, max] }, where min
+        # defaults to 0 and max to Infinity so the validator needs no nil guards.
+        def resolve_lengths(lengths)
+          raise ArgumentError, "#{LABEL}: lengths: must be a Hash (part => Integer or Range)" unless lengths.is_a?(Hash)
+
+          lengths.to_h do |part, bound|
+            sym = part.to_sym
+            raise ArgumentError, "#{LABEL}: unknown address part in lengths: #{sym}" unless DEFAULT_FIELDS.key?(sym)
+
+            [sym, normalize_length_bound(sym, bound)]
+          end
+        end
+
+        def normalize_length_bound(part, bound)
+          case bound
+          when Integer
+            raise ArgumentError, "#{LABEL}: lengths[#{part}] must be a positive Integer" unless bound.positive?
+
+            [0, bound]
+          when Range then range_bounds(part, bound)
+          else
+            raise ArgumentError, "#{LABEL}: lengths[#{part}] must be an Integer or Range, got #{bound.class}"
+          end
+        end
+
+        # A Range becomes [min, max] (min defaults to 0, an open end becomes
+        # Infinity). Bounds must be non-negative Integers and the range must be
+        # satisfiable (min <= max) — otherwise a typo would silently brick a column.
+        def range_bounds(part, range)
+          min = range.begin || 0
+          max = range.end
+          validate_range_endpoints!(part, min, max)
+          max -= 1 if max && range.exclude_end?
+          max ||= Float::INFINITY
+          raise ArgumentError, "#{LABEL}: lengths[#{part}] range is empty or inverted (#{range})" if min > max
+
+          [min, max]
+        end
+
+        def validate_range_endpoints!(part, min, max)
+          return if min.is_a?(Integer) && !min.negative? && (max.nil? || (max.is_a?(Integer) && !max.negative?))
+
+          raise ArgumentError, "#{LABEL}: lengths[#{part}] range must have non-negative Integer bounds"
+        end
+
+        # Normalize allow_blank: into the list of parts whose length check is skipped when blank.
+        def resolve_allow_blank(allow_blank)
+          case allow_blank
+          when true then DEFAULT_FIELDS.keys
+          when false, nil then []
+          when Array
+            parts = allow_blank.map(&:to_sym)
+            unknown = parts - DEFAULT_FIELDS.keys
+            raise ArgumentError, "#{LABEL}: unknown address part(s) in allow_blank: #{unknown.join(', ')}" if unknown.any?
+
+            parts
+          else
+            raise ArgumentError, "#{LABEL}: allow_blank: must be true, false, or an Array of parts"
+          end
+        end
+
+        # Pull Rails-style `if:` / `unless:` out of the keyword args (they ride in via
+        # **mapping) so the remaining keys are treated as column overrides.
+        def extract_validation_condition!(mapping)
+          { if: mapping.delete(:if), unless: mapping.delete(:unless) }.compact
+        end
+
+        # Register `validate :validate_address` once, forwarding any if:/unless: condition
+        # straight to Rails so it behaves like a normal conditional validation. Normalization
+        # (before_validation) is unconditional; the condition only gates the validations.
+        def register_address_validation(condition)
+          return if addressable_validation_registered
+
+          self.addressable_validation_registered = true
+          validate :validate_address, **condition
+        end
       end
 
       # --- Normalization (before_validation) ------------------------------------
@@ -97,6 +191,7 @@ module ConcernsOnRails
 
       def validate_address
         validate_required_parts
+        validate_lengths
         validate_country_code
         validate_postal_code
         validate_state_code if self.class.addressable_validate_state
@@ -141,26 +236,46 @@ module ConcernsOnRails
         DEFAULT_FIELDS.keys.select { |part| self.class.addressable_fields.key?(part) }
       end
 
-      # The 2-letter country code driving postal/state checks: the record's own
-      # country when it's a recognized code, otherwise the configured default.
+      # The country driving postal-/state-format selection:
+      #   * the record's own country when it's a recognized ISO alpha-2 code
+      #   * the configured default_country when the country column is absent or blank
+      #   * nil ("unknown") when a country is present but unrecognized — so postal/state
+      #     fall back to permissive checks instead of wrongly applying the default's rules
       def resolved_country
         column = self.class.addressable_fields[:country]
         value = column && self[column]
-        return self.class.addressable_default_country unless value.is_a?(String)
+        return self.class.addressable_default_country if value.blank?
 
-        code = value.strip.upcase
-        ConcernsOnRails::Support::AddressData.valid_country?(code) ? code : self.class.addressable_default_country
+        code = canonical_country_code(value)
+        ConcernsOnRails::Support::AddressData.valid_country?(code) ? code : nil
+      end
+
+      # The country value as an alpha-2 candidate, applying name/alpha-3 mapping
+      # when normalize_country is on so postal/state checks recognize it too.
+      def canonical_country_code(value)
+        return ConcernsOnRails::Support::AddressData.normalize_country_code(value).to_s.upcase if self.class.addressable_normalize_country
+
+        value.to_s.strip.upcase
       end
 
       def normalize_part(part, country, value)
         squished = value.strip.squish
         case part
         when :postal_code then ConcernsOnRails::Support::AddressData.normalize_postal(country, value)
-        when :country, :state then squished.length == 2 ? squished.upcase : squished
+        when :country then normalize_country_part(squished)
+        when :state then squished.length == 2 ? squished.upcase : squished
         else squished
         end
       end
 
+      # With normalize_country on, map a name/alpha-3 to its alpha-2 (leaving an
+      # unrecognized value untouched); otherwise just upcase a bare 2-letter code.
+      def normalize_country_part(squished)
+        return ConcernsOnRails::Support::AddressData.normalize_country_code(squished) if self.class.addressable_normalize_country
+
+        squished.length == 2 ? squished.upcase : squished
+      end
+
       def validate_required_parts
         fields = self.class.addressable_fields
         self.class.addressable_required.each do |part|
@@ -169,6 +284,31 @@ module ConcernsOnRails
         end
       end
 
+      def validate_lengths
+        self.class.addressable_lengths.each { |part, bounds| validate_length_of(part, bounds) }
+      end
+
+      # Enforce one part's [min, max] bounds. A blank value skips the check only
+      # when the part is in allow_blank; otherwise the minimum is enforced on blanks
+      # (independent of required:). Length is measured on the normalized value.
+      def validate_length_of(part, (min, max))
+        column = self.class.addressable_fields[part]
+        return unless column
+
+        value = self[column]
+        return if value.blank? && self.class.addressable_allow_blank.include?(part)
+
+        length = value.to_s.length
+        errors.add(column, "is too short (minimum is #{length_phrase(min)})") if length < min
+        errors.add(column, "is too long (maximum is #{length_phrase(max)})") if length > max
+      end
+
+      # "1 character" / "N characters" — mirrors Rails' pluralized length errors
+      # without depending on i18n. (max is only interpolated for finite bounds.)
+      def length_phrase(count)
+        "#{count} #{count == 1 ? 'character' : 'characters'}"
+      end
+
       def validate_country_code
         column = self.class.addressable_fields[:country]
         value = column && self[column]

data/lib/concerns_on_rails/support/address_data.rb

@@ -10,34 +10,270 @@ module ConcernsOnRails
     module AddressData
       module_function
 
-      # ISO 3166-1 alpha-2 country codes.
-      ISO_COUNTRY_CODES = Set.new(%w[
-                                    AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ
-                                    BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ
-                                    CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ
-                                    DE DJ DK DM DO DZ
-                                    EC EE EG EH ER ES ET
-                                    FI FJ FK FM FO FR
-                                    GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY
-                                    HK HM HN HR HT HU
-                                    ID IE IL IM IN IO IQ IR IS IT
-                                    JE JM JO JP
-                                    KE KG KH KI KM KN KP KR KW KY KZ
-                                    LA LB LC LI LK LR LS LT LU LV LY
-                                    MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ
-                                    NA NC NE NF NG NI NL NO NP NR NU NZ
-                                    OM
-                                    PA PE PF PG PH PK PL PM PN PR PS PT PW PY
-                                    QA
-                                    RE RO RS RU RW
-                                    SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ
-                                    TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ
-                                    UA UG UM US UY UZ
-                                    VA VC VE VG VI VN VU
-                                    WF WS
-                                    YE YT
-                                    ZA ZM ZW
-                                  ]).freeze
+      # Source of truth for ISO 3166-1: alpha-2 => [English name, alpha-3].
+      # ISO_COUNTRY_CODES and the name/alpha-3 lookups below are all derived
+      # from this, so the three never drift apart.
+      # Each value is a [name, alpha-3] pair (a tuple), not a list of words.
+      # rubocop:disable Style/WordArray
+      COUNTRY_DATA = {
+        "AD" => ["Andorra", "AND"],
+        "AE" => ["United Arab Emirates", "ARE"],
+        "AF" => ["Afghanistan", "AFG"],
+        "AG" => ["Antigua and Barbuda", "ATG"],
+        "AI" => ["Anguilla", "AIA"],
+        "AL" => ["Albania", "ALB"],
+        "AM" => ["Armenia", "ARM"],
+        "AO" => ["Angola", "AGO"],
+        "AQ" => ["Antarctica", "ATA"],
+        "AR" => ["Argentina", "ARG"],
+        "AS" => ["American Samoa", "ASM"],
+        "AT" => ["Austria", "AUT"],
+        "AU" => ["Australia", "AUS"],
+        "AW" => ["Aruba", "ABW"],
+        "AX" => ["Åland Islands", "ALA"],
+        "AZ" => ["Azerbaijan", "AZE"],
+        "BA" => ["Bosnia and Herzegovina", "BIH"],
+        "BB" => ["Barbados", "BRB"],
+        "BD" => ["Bangladesh", "BGD"],
+        "BE" => ["Belgium", "BEL"],
+        "BF" => ["Burkina Faso", "BFA"],
+        "BG" => ["Bulgaria", "BGR"],
+        "BH" => ["Bahrain", "BHR"],
+        "BI" => ["Burundi", "BDI"],
+        "BJ" => ["Benin", "BEN"],
+        "BL" => ["Saint Barthélemy", "BLM"],
+        "BM" => ["Bermuda", "BMU"],
+        "BN" => ["Brunei", "BRN"],
+        "BO" => ["Bolivia", "BOL"],
+        "BQ" => ["Caribbean Netherlands", "BES"],
+        "BR" => ["Brazil", "BRA"],
+        "BS" => ["Bahamas", "BHS"],
+        "BT" => ["Bhutan", "BTN"],
+        "BV" => ["Bouvet Island", "BVT"],
+        "BW" => ["Botswana", "BWA"],
+        "BY" => ["Belarus", "BLR"],
+        "BZ" => ["Belize", "BLZ"],
+        "CA" => ["Canada", "CAN"],
+        "CC" => ["Cocos (Keeling) Islands", "CCK"],
+        "CD" => ["Democratic Republic of the Congo", "COD"],
+        "CF" => ["Central African Republic", "CAF"],
+        "CG" => ["Republic of the Congo", "COG"],
+        "CH" => ["Switzerland", "CHE"],
+        "CI" => ["Côte d'Ivoire", "CIV"],
+        "CK" => ["Cook Islands", "COK"],
+        "CL" => ["Chile", "CHL"],
+        "CM" => ["Cameroon", "CMR"],
+        "CN" => ["China", "CHN"],
+        "CO" => ["Colombia", "COL"],
+        "CR" => ["Costa Rica", "CRI"],
+        "CU" => ["Cuba", "CUB"],
+        "CV" => ["Cape Verde", "CPV"],
+        "CW" => ["Curaçao", "CUW"],
+        "CX" => ["Christmas Island", "CXR"],
+        "CY" => ["Cyprus", "CYP"],
+        "CZ" => ["Czechia", "CZE"],
+        "DE" => ["Germany", "DEU"],
+        "DJ" => ["Djibouti", "DJI"],
+        "DK" => ["Denmark", "DNK"],
+        "DM" => ["Dominica", "DMA"],
+        "DO" => ["Dominican Republic", "DOM"],
+        "DZ" => ["Algeria", "DZA"],
+        "EC" => ["Ecuador", "ECU"],
+        "EE" => ["Estonia", "EST"],
+        "EG" => ["Egypt", "EGY"],
+        "EH" => ["Western Sahara", "ESH"],
+        "ER" => ["Eritrea", "ERI"],
+        "ES" => ["Spain", "ESP"],
+        "ET" => ["Ethiopia", "ETH"],
+        "FI" => ["Finland", "FIN"],
+        "FJ" => ["Fiji", "FJI"],
+        "FK" => ["Falkland Islands", "FLK"],
+        "FM" => ["Micronesia", "FSM"],
+        "FO" => ["Faroe Islands", "FRO"],
+        "FR" => ["France", "FRA"],
+        "GA" => ["Gabon", "GAB"],
+        "GB" => ["United Kingdom", "GBR"],
+        "GD" => ["Grenada", "GRD"],
+        "GE" => ["Georgia", "GEO"],
+        "GF" => ["French Guiana", "GUF"],
+        "GG" => ["Guernsey", "GGY"],
+        "GH" => ["Ghana", "GHA"],
+        "GI" => ["Gibraltar", "GIB"],
+        "GL" => ["Greenland", "GRL"],
+        "GM" => ["Gambia", "GMB"],
+        "GN" => ["Guinea", "GIN"],
+        "GP" => ["Guadeloupe", "GLP"],
+        "GQ" => ["Equatorial Guinea", "GNQ"],
+        "GR" => ["Greece", "GRC"],
+        "GS" => ["South Georgia and the South Sandwich Islands", "SGS"],
+        "GT" => ["Guatemala", "GTM"],
+        "GU" => ["Guam", "GUM"],
+        "GW" => ["Guinea-Bissau", "GNB"],
+        "GY" => ["Guyana", "GUY"],
+        "HK" => ["Hong Kong", "HKG"],
+        "HM" => ["Heard Island and McDonald Islands", "HMD"],
+        "HN" => ["Honduras", "HND"],
+        "HR" => ["Croatia", "HRV"],
+        "HT" => ["Haiti", "HTI"],
+        "HU" => ["Hungary", "HUN"],
+        "ID" => ["Indonesia", "IDN"],
+        "IE" => ["Ireland", "IRL"],
+        "IL" => ["Israel", "ISR"],
+        "IM" => ["Isle of Man", "IMN"],
+        "IN" => ["India", "IND"],
+        "IO" => ["British Indian Ocean Territory", "IOT"],
+        "IQ" => ["Iraq", "IRQ"],
+        "IR" => ["Iran", "IRN"],
+        "IS" => ["Iceland", "ISL"],
+        "IT" => ["Italy", "ITA"],
+        "JE" => ["Jersey", "JEY"],
+        "JM" => ["Jamaica", "JAM"],
+        "JO" => ["Jordan", "JOR"],
+        "JP" => ["Japan", "JPN"],
+        "KE" => ["Kenya", "KEN"],
+        "KG" => ["Kyrgyzstan", "KGZ"],
+        "KH" => ["Cambodia", "KHM"],
+        "KI" => ["Kiribati", "KIR"],
+        "KM" => ["Comoros", "COM"],
+        "KN" => ["Saint Kitts and Nevis", "KNA"],
+        "KP" => ["North Korea", "PRK"],
+        "KR" => ["South Korea", "KOR"],
+        "KW" => ["Kuwait", "KWT"],
+        "KY" => ["Cayman Islands", "CYM"],
+        "KZ" => ["Kazakhstan", "KAZ"],
+        "LA" => ["Laos", "LAO"],
+        "LB" => ["Lebanon", "LBN"],
+        "LC" => ["Saint Lucia", "LCA"],
+        "LI" => ["Liechtenstein", "LIE"],
+        "LK" => ["Sri Lanka", "LKA"],
+        "LR" => ["Liberia", "LBR"],
+        "LS" => ["Lesotho", "LSO"],
+        "LT" => ["Lithuania", "LTU"],
+        "LU" => ["Luxembourg", "LUX"],
+        "LV" => ["Latvia", "LVA"],
+        "LY" => ["Libya", "LBY"],
+        "MA" => ["Morocco", "MAR"],
+        "MC" => ["Monaco", "MCO"],
+        "MD" => ["Moldova", "MDA"],
+        "ME" => ["Montenegro", "MNE"],
+        "MF" => ["Saint Martin", "MAF"],
+        "MG" => ["Madagascar", "MDG"],
+        "MH" => ["Marshall Islands", "MHL"],
+        "MK" => ["North Macedonia", "MKD"],
+        "ML" => ["Mali", "MLI"],
+        "MM" => ["Myanmar", "MMR"],
+        "MN" => ["Mongolia", "MNG"],
+        "MO" => ["Macao", "MAC"],
+        "MP" => ["Northern Mariana Islands", "MNP"],
+        "MQ" => ["Martinique", "MTQ"],
+        "MR" => ["Mauritania", "MRT"],
+        "MS" => ["Montserrat", "MSR"],
+        "MT" => ["Malta", "MLT"],
+        "MU" => ["Mauritius", "MUS"],
+        "MV" => ["Maldives", "MDV"],
+        "MW" => ["Malawi", "MWI"],
+        "MX" => ["Mexico", "MEX"],
+        "MY" => ["Malaysia", "MYS"],
+        "MZ" => ["Mozambique", "MOZ"],
+        "NA" => ["Namibia", "NAM"],
+        "NC" => ["New Caledonia", "NCL"],
+        "NE" => ["Niger", "NER"],
+        "NF" => ["Norfolk Island", "NFK"],
+        "NG" => ["Nigeria", "NGA"],
+        "NI" => ["Nicaragua", "NIC"],
+        "NL" => ["Netherlands", "NLD"],
+        "NO" => ["Norway", "NOR"],
+        "NP" => ["Nepal", "NPL"],
+        "NR" => ["Nauru", "NRU"],
+        "NU" => ["Niue", "NIU"],
+        "NZ" => ["New Zealand", "NZL"],
+        "OM" => ["Oman", "OMN"],
+        "PA" => ["Panama", "PAN"],
+        "PE" => ["Peru", "PER"],
+        "PF" => ["French Polynesia", "PYF"],
+        "PG" => ["Papua New Guinea", "PNG"],
+        "PH" => ["Philippines", "PHL"],
+        "PK" => ["Pakistan", "PAK"],
+        "PL" => ["Poland", "POL"],
+        "PM" => ["Saint Pierre and Miquelon", "SPM"],
+        "PN" => ["Pitcairn Islands", "PCN"],
+        "PR" => ["Puerto Rico", "PRI"],
+        "PS" => ["Palestine", "PSE"],
+        "PT" => ["Portugal", "PRT"],
+        "PW" => ["Palau", "PLW"],
+        "PY" => ["Paraguay", "PRY"],
+        "QA" => ["Qatar", "QAT"],
+        "RE" => ["Réunion", "REU"],
+        "RO" => ["Romania", "ROU"],
+        "RS" => ["Serbia", "SRB"],
+        "RU" => ["Russia", "RUS"],
+        "RW" => ["Rwanda", "RWA"],
+        "SA" => ["Saudi Arabia", "SAU"],
+        "SB" => ["Solomon Islands", "SLB"],
+        "SC" => ["Seychelles", "SYC"],
+        "SD" => ["Sudan", "SDN"],
+        "SE" => ["Sweden", "SWE"],
+        "SG" => ["Singapore", "SGP"],
+        "SH" => ["Saint Helena", "SHN"],
+        "SI" => ["Slovenia", "SVN"],
+        "SJ" => ["Svalbard and Jan Mayen", "SJM"],
+        "SK" => ["Slovakia", "SVK"],
+        "SL" => ["Sierra Leone", "SLE"],
+        "SM" => ["San Marino", "SMR"],
+        "SN" => ["Senegal", "SEN"],
+        "SO" => ["Somalia", "SOM"],
+        "SR" => ["Suriname", "SUR"],
+        "SS" => ["South Sudan", "SSD"],
+        "ST" => ["São Tomé and Príncipe", "STP"],
+        "SV" => ["El Salvador", "SLV"],
+        "SX" => ["Sint Maarten", "SXM"],
+        "SY" => ["Syria", "SYR"],
+        "SZ" => ["Eswatini", "SWZ"],
+        "TC" => ["Turks and Caicos Islands", "TCA"],
+        "TD" => ["Chad", "TCD"],
+        "TF" => ["French Southern Territories", "ATF"],
+        "TG" => ["Togo", "TGO"],
+        "TH" => ["Thailand", "THA"],
+        "TJ" => ["Tajikistan", "TJK"],
+        "TK" => ["Tokelau", "TKL"],
+        "TL" => ["Timor-Leste", "TLS"],
+        "TM" => ["Turkmenistan", "TKM"],
+        "TN" => ["Tunisia", "TUN"],
+        "TO" => ["Tonga", "TON"],
+        "TR" => ["Turkey", "TUR"],
+        "TT" => ["Trinidad and Tobago", "TTO"],
+        "TV" => ["Tuvalu", "TUV"],
+        "TW" => ["Taiwan", "TWN"],
+        "TZ" => ["Tanzania", "TZA"],
+        "UA" => ["Ukraine", "UKR"],
+        "UG" => ["Uganda", "UGA"],
+        "UM" => ["United States Minor Outlying Islands", "UMI"],
+        "US" => ["United States", "USA"],
+        "UY" => ["Uruguay", "URY"],
+        "UZ" => ["Uzbekistan", "UZB"],
+        "VA" => ["Vatican City", "VAT"],
+        "VC" => ["Saint Vincent and the Grenadines", "VCT"],
+        "VE" => ["Venezuela", "VEN"],
+        "VG" => ["British Virgin Islands", "VGB"],
+        "VI" => ["U.S. Virgin Islands", "VIR"],
+        "VN" => ["Vietnam", "VNM"],
+        "VU" => ["Vanuatu", "VUT"],
+        "WF" => ["Wallis and Futuna", "WLF"],
+        "WS" => ["Samoa", "WSM"],
+        "YE" => ["Yemen", "YEM"],
+        "YT" => ["Mayotte", "MYT"],
+        "ZA" => ["South Africa", "ZAF"],
+        "ZM" => ["Zambia", "ZMB"],
+        "ZW" => ["Zimbabwe", "ZWE"]
+      }.freeze
+      # rubocop:enable Style/WordArray
+
+      # ISO 3166-1 alpha-2 country codes (derived from COUNTRY_DATA).
+      ISO_COUNTRY_CODES = Set.new(COUNTRY_DATA.keys).freeze
+
+      # Downcased English country name => alpha-2, and alpha-3 => alpha-2.
+      NAME_TO_ALPHA2 = COUNTRY_DATA.to_h { |code, (name, _a3)| [name.downcase, code] }.freeze
+      ALPHA3_TO_ALPHA2 = COUNTRY_DATA.to_h { |code, (_name, a3)| [a3, code] }.freeze
 
       # Per-country postal-code patterns (matched against the *normalized*,
       # upcased value). `:default` is a permissive fallback for everything else.
@@ -97,6 +333,23 @@ module ConcernsOnRails
         compact = normalized.delete(" ")
         compact.match?(/\A[A-Z]\d[A-Z]\d[A-Z]\d\z/) ? "#{compact[0, 3]} #{compact[3, 3]}" : normalized
       end
+
+      # Canonicalize a country value to its ISO 3166-1 alpha-2 code: an existing
+      # alpha-2 is upcased; a 3-letter alpha-3 (e.g. "USA") and a recognized
+      # English name (e.g. "Canada") map to the alpha-2. Unrecognized values are
+      # returned unchanged, and non-strings pass through.
+      def normalize_country_code(value)
+        return value unless value.is_a?(String)
+
+        trimmed = value.strip.squish
+        return value if trimmed.empty?
+
+        upper = trimmed.upcase
+        return upper if ISO_COUNTRY_CODES.include?(upper)
+        return ALPHA3_TO_ALPHA2[upper] if ALPHA3_TO_ALPHA2.key?(upper)
+
+        NAME_TO_ALPHA2[trimmed.downcase] || value
+      end
     end
   end
 end

data/lib/concerns_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ConcernsOnRails
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerns_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ethan Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-03 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails