worldwide 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 201314dc59d2e10fb46c16cd4cac2ddb6a345074226567b221340660f53d6936
-  data.tar.gz: 0acd813a2beea616bff276a474783d38f101dd6d875d24fbbc34862a7b3c1844
+  metadata.gz: dbd0868290580c52211d482478466332dc15728b688a53b966eccbc82fc9a4b8
+  data.tar.gz: 24ef5f713338348f9708b6c70c17e758ea613d654f8d0c07f87f7e73c4c778fd
 SHA512:
-  metadata.gz: b8d0b34eccbde7cbf76254c9ca50e21d4a1bfd93f9b0ba7a75a12532d8152378572c184fccdb6749e3ee2efa7d62d9586a904333583d293acd3f6968c1da592d
-  data.tar.gz: cfbfeebf34e7b3c4b68d6c9c0e5da78fa1627b0fe7248a3cdc3ea74cde3292adbeab3be86c97391e56f32016de23fa357cc9c265e070fc90896f3c6782b7eb77
+  metadata.gz: 75a75cfec661ab1c9a1690e8aa01b0b803d2e0cd33da6f6f26853360f7ee837134236db8a64c1f7ce0716c69f374664c5ee8c1f0a9090dab4027e6d2785d401c
+  data.tar.gz: 8529dc4dce8a96795c801b2c80d95c0e862d3fdf652433248f09be1ff6fe8bad0b3cd49a7162ee36059659d5ef6ceba9b79c84c3c2f756647b9d46df663a2dc7

data/CHANGELOG.md

@@ -26,9 +26,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Security in case of vulnerabilities.
 
 ## [Unreleased]
-
+- Nil.
 ---
 
+## [1.12.0] - 2024-10-11
+- Update Address splitting methods to split on the first delimiter [#291](https://github.com/Shopify/worldwide/pull/291)
+
+## [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)

data/Gemfile.lock

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

data/lib/worldwide/address.rb

@@ -167,13 +167,15 @@ module Worldwide
 
     def split_address1
       additional_fields = region.combined_address_format.dig(script_from_string(address1), "address1") || []
-      split_fields_arr = address1&.split(RESERVED_DELIMITER) || []
+      number_of_fields = additional_fields.size
+      split_fields_arr = address1&.split(RESERVED_DELIMITER, number_of_fields) || []
       split_fields(additional_fields, split_fields_arr)
     end
 
     def split_address2
       additional_fields = region.combined_address_format.dig(script_from_string(address2), "address2") || []
-      split_fields_arr = address2&.split(RESERVED_DELIMITER) || []
+      number_of_fields = additional_fields.size
+      split_fields_arr = address2&.split(RESERVED_DELIMITER, number_of_fields) || []
       split_fields(additional_fields, split_fields_arr)
     end
 

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-15 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.20
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Internationalization and localization APIs