worldwide 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95f2e0fb163b3ca71052724364003e66adaede98d891ba85b9fcb950bb45403
-  data.tar.gz: 87597cf4738a6cad9e32d1a13f1aad9bca0dc67c49999e18ab712fa9bc0b4ced
+  metadata.gz: 7b1b899bdd7349cec9a36e0468737cd103b14587aa6db1eec80199e4240f9d23
+  data.tar.gz: 9a6d60fed160223ada223c51781df60010a8b5b9abd44b58dbef2ccd80bf1d41
 SHA512:
-  metadata.gz: c9d46c593759a7470a3c2c3cab66ea9100f1afdada955c54cdedcb63ab6a9fb1ca2365596e69301fd8f8194f5f82a19a042ea95096cee6c766cad85fc58dbb5a
-  data.tar.gz: 90a72f40fb35d3f782f190833f52c7e09625a32f7972fb757edb3d9ebb097050c0c38037846b293e5e84f637feb3e014faf185b5ea0dffbdba953759ea76b252
+  metadata.gz: a75e2c881aef0bb5ca318696c4e53d14f5524bb67f91737f74bc1ce1a4a30b4903656e2201f4306df463224f04809968ec622671083d1b2910c0c318614f6365
+  data.tar.gz: f44bbef128f4da580f363d32866752c0e1acaea9d04f85cb1113faf4a5cca37ae941581db624740870f20a955e14ffd2ebec466dc4790ee80dc3ebcc86d3a824

data/CHANGELOG.md

@@ -27,9 +27,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 - Nil.
-
 ---
 
+## [1.11.1] - 2024-10-02
+- Configure regexp timeout in Worldwide#Phone [#290](https://github.com/Shopify/worldwide/pull/290)
+
+## [1.11.0] - 2024-10-02
+- Add address1_regex to regions [#281](https://github.com/Shopify/worldwide/pull/281)
+- Add address1_regex for BE, CL, MX, ES, IL [#282](https://github.com/Shopify/worldwide/pull/282)
+- Add address1_regex for DE [#286](https://github.com/Shopify/worldwide/pull/286)
+- Update legacy timezone mappings for Europe/Kiev [#288](https://github.com/Shopify/worldwide/pull/288)
+
+
 ## [1.10.0] - 2024-09-16
 - Add alternate Arabic names for UAE zones [#283](https://github.com/Shopify/worldwide/pull/283)
 

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    worldwide (1.10.0)
+    worldwide (1.11.1)
       activesupport (>= 7.0)
       i18n
       phonelib (~> 0.8)

data/db/data/regions/BE.yml

@@ -31,6 +31,9 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d,]+),? (?<streetNumber>\\d+(?: ?[a-z])?)$"
+  - "^(?<streetNumber>\\d+(?: ?[a-z])?),? (?<streetName>[^\\d,]+)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/BR.yml

@@ -28,6 +28,8 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city} {province}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{zip}_{streetName}{streetNumber}_{line2}{neighborhood}_{city}{province}_{phone}"
+address1_regex:
+  - "^(?<streetName>(?!.*\\bnúmero\\b)[^\\d,]+(?<!\\s))(?:,? ?)(?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/CL.yml

@@ -16,6 +16,8 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{province}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{line2}{neighborhood}_{zip}{city}_{province}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/DE.yml

@@ -29,6 +29,9 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+- "^(?<streetName>[^\\d,]+?\\.?)[, ]{1,2}(?<streetNumber>\\d+(?: ?[a-z])?)$"
+- "^(?<streetName>[^\\d,]+\\.)(?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/ES.yml

@@ -29,6 +29,8 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{province}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}{province}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/IL.yml

@@ -18,6 +18,9 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d,]+),? (?<streetNumber>\\d+(?:\/\\d+)?)$"
+  - "^(?<streetNumber>\\d+(?:\/\\d+)?),? (?<streetName>[^\\d,]+)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/MX.yml

@@ -17,6 +17,8 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city} {province}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{line2}{neighborhood}_{zip}{city}{province}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d,]+?),? (?<streetNumber>(?:n|n\\.|nº|número|no\\.|no|#)? ?\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/db/data/regions/NL.yml

@@ -30,6 +30,8 @@ format:
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
 format_extended:
   edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+address1_regex:
+  - "^(?<streetName>[^\\d]+) (?<streetNumber>\\d+(?: ?[a-z])?)$"
 additional_address_fields:
   - name: streetName
     required: true

data/lib/worldwide/deprecated_time_zone_mapper.rb

@@ -57,6 +57,7 @@ module Worldwide
       "Etc/UCT": "UTC",
       "Etc/Universal": "UTC",
       "Etc/Zulu": "UTC",
+      "Europe/Kiev": "Europe/Kyiv",
       GB: "Europe/London",
       "GB-Eire": "Europe/London",
       "GMT+0": "Etc/GMT",

data/lib/worldwide/phone.rb

@@ -137,14 +137,19 @@ module Worldwide
       number = input.downcase
 
       ["ext", "x", ";"].each do |separator|
-        if number.include?(separator)
-          m = number.match(Regexp.new("(?<base>[0-9a-z +-]*)\\s*#{separator}\\.?\\s*(?<ext>.*)"))
-          return [m["base"], m["ext"]] unless m.nil?
-        end
+        next unless number.include?(separator)
+
+        m = number.match(Regexp.new(
+          "(?<base>[0-9a-z +-]*)\\s*#{separator}\\.?\\s*(?<ext>.*)",
+          timeout: 1,
+        ))
+        return [m["base"], m["ext"]] unless m.nil?
       end
 
       # If we get this far, then we have not found an extension, and assume that the full input is just a public number
       [input, nil]
+    rescue Regexp::TimeoutError
+      [input, nil]
     end
 
     # Convert exotic characters to ASCII

data/lib/worldwide/region.rb

@@ -36,6 +36,7 @@ module Worldwide
       :zip_requirement,
       :additional_address_fields,
       :combined_address_format,
+      :address1_regex,
     ]
 
     # A region may have more than one parent.
@@ -208,6 +209,9 @@ module Worldwide
     # A hash of the rules for concatening the additional address fields into the standard fields
     attr_accessor :combined_address_format
 
+    # An array of regex patterns of the address1 field, capturing the supported additional address fields
+    attr_accessor :address1_regex
+
     def initialize(
       alpha_three: nil,
       continent: false,
@@ -245,6 +249,7 @@ module Worldwide
 
       @additional_address_fields = []
       @combined_address_format = {}
+      @address1_regex = []
       @building_number_required = false
       @building_number_may_be_in_address2 = false
       @currency = nil

data/lib/worldwide/regions_loader.rb

@@ -97,6 +97,7 @@ module Worldwide
     def apply_territory_attributes(region, spec)
       region.additional_address_fields = spec["additional_address_fields"] || []
       region.combined_address_format = spec["combined_address_format"] || {}
+      region.address1_regex = spec["address1_regex"] || []
       region.building_number_required = spec["building_number_required"] || false
       region.building_number_may_be_in_address2 = spec["building_number_may_be_in_address2"] || false
       currency_code = spec["currency"]

data/lib/worldwide/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Worldwide
-  VERSION = "1.10.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -8505,7 +8505,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Internationalization and localization APIs