phonelib 0.10.23 → 0.10.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2633488b369e12463c7027ee816032ccc733067cca9292c74ec88f3116b734
-  data.tar.gz: cd120fe2caa70e770c290209cd9293170cb92993c33047d2829c0abcfda36cd8
+  metadata.gz: b57ecb9e7c4eeabbaabb6ae82a15dc4334e0eb9749b87a70cdd3f37be143a6c3
+  data.tar.gz: 3f5c9003d13f07654412a6455a54defd4719d0bf56aec23df720cdb3005b5f5b
 SHA512:
-  metadata.gz: 55754cb48b2c2aad42b617910105dcd66caf92ce0a5b6b8d3987eaa095ba2fd36a42b1a5e08047ae1091c59e2fc66c636f436c31d4de616a2579b8cfc1664d92
-  data.tar.gz: 5ec7b9b789d4e9876d0432c5864415f8227dd3c25fc21fd90dd25715010f63660b5cdf98d640da35edfa960009ead66afb4bf5f3239211774418f8ea48b51fd1
+  metadata.gz: b9d13eb82977f48c7024aaf7f0f5677fd03889e945b8ef8e067975d5b72466903a1d1c46ac7ea483beb41c2f3cd78b8af58da98f1012a41a302b297dde27ea88
+  data.tar.gz: 82cdc51eebad9516e64633116410c3e3056747c32049ad028bdac7359ce8ea5c61dc318cdc8dafcf32b3596b0ddec9226a46d3c0d124ec26cb828334703084d1

data/README.md

@@ -246,10 +246,11 @@ Also you can fetch all matched countries
 
 ``` ruby
 phone.countries       # returns array of all matched countries
-phone.country         # returns first element from array of all matched countries
+phone.country         # returns valid_country when there is one, otherwise the main country for the code among all matched countries
 phone.valid_countries # returns array of countries where phone was matched against valid pattern
-phone.valid_country   # returns first valid country from array of valid countries
+phone.valid_country   # returns the main country for the code among valid countries, or the first of them
 phone.country_code    # returns country phone prefix
+phone.national_number # returns national number of the country returned by phone.country
 ```
 
 Also it is possible to get formatted phone number

data/lib/phonelib/core.rb

@@ -195,6 +195,10 @@ module Phonelib
     def additional_regexes=(data)
       return unless data.is_a?(Array)
       @@additional_regexes = {}
+      # regexes are baked into the cached phone data, so it has to be dropped
+      # even when no new regex is added (add_additional_regex does it too),
+      # otherwise stale capture groups desync the national number offset
+      @@phone_data = @@data_by_country_codes = nil
       data.each do |row|
         next if row.size != 3
         add_additional_regex(*row)

data/lib/phonelib/phone.rb

@@ -32,8 +32,10 @@ module Phonelib
         @data = {}
       else
         @data = analyze(sanitized, passed_country(country))
-        first = @data.values.first
-        @national_number = first ? first[:national] : sanitized
+        # the national number must come from the country #country reports:
+        # another entry can be a possible-only match, and mixing entries makes
+        # e164 splice one country's code onto another's number (issue #355)
+        @national_number = country_data ? country_data[:national] : sanitized
       end
     end
 
@@ -93,7 +95,7 @@ module Phonelib
     # Returns all countries that matched valid patterns
     # @return [Array] Possible ISO2 country codes array
     def countries
-      @data.map { |iso2, _data| iso2 }
+      @countries ||= @data.keys
     end
 
     # Return countries with valid patterns
@@ -107,19 +109,25 @@ module Phonelib
     # Return valid country
     # @return [String] valid ISO2 country code
     def valid_country
-      @valid_country ||= main_country(valid_countries)
+      return @valid_country if defined?(@valid_country)
+
+      @valid_country = main_country(valid_countries)
     end
 
     # Returns first country that matched valid patterns
     # @return [String] valid country ISO2 code or first matched country code
     def country
-      @country ||= valid_country || main_country(countries)
+      return @country if defined?(@country)
+
+      @country = valid_country || main_country(countries)
     end
 
     # Returns whether a current parsed phone number is valid
     # @return [Boolean] parsed phone is valid
     def valid?
-      @valid ||= @data.select { |_iso2, data| data[:valid].any? }.any?
+      return @valid if defined?(@valid)
+
+      @valid = @data.any? { |_iso2, data| data[:valid].any? }
     end
 
     # Returns whether a current parsed phone number is invalid
@@ -131,7 +139,9 @@ module Phonelib
     # Returns whether a current parsed phone number is possible
     # @return [Boolean] parsed phone is possible
     def possible?
-      @possible ||= @data.select { |_iso2, data| data[:possible].any? }.any?
+      return @possible if defined?(@possible)
+
+      @possible = @data.any? { |_iso2, data| data[:possible].any? }
     end
 
     # Returns whether a current parsed phone number is impossible
@@ -178,6 +188,13 @@ module Phonelib
 
     private
 
+    # @private analyzing results of the country that #country resolved to.
+    # Every value derived from a single country (national number, format,
+    # national prefix) must be read through here so they cannot disagree.
+    def country_data
+      @data[country]
+    end
+
     # @private extracts extension from passed phone number if provided
     def separate_extension(original)
       return [original, ''] unless Phonelib.extension_separate_symbols

data/lib/phonelib/phone_analyzer.rb

@@ -151,8 +151,11 @@ module Phonelib
     end
 
     def country_code_candidates_for(phone)
+      prefixes = (1..3).map { |length| phone[0, length] }
+      return prefixes if !Phonelib.ignore_plus && Core::PLUS_SIGN == @original[0]
+
       stripped_phone = phone.gsub(cr("Phonelib.phone_data_int_prefixes") { /^(#{Phonelib.phone_data_int_prefixes})/ }, '')
-      ((1..3).map { |length| phone[0, length] } + (1..3).map { |length| stripped_phone[0, length] }).uniq
+      (prefixes + (1..3).map { |length| stripped_phone[0, length] }).uniq
     end
 
     # Create phone representation in e164 format

data/lib/phonelib/phone_analyzer_helper.rb

@@ -17,7 +17,7 @@ module Phonelib
     end
 
     def original_starts_with_plus_or_double_zero?
-      original_s[0] == Core::PLUS_SIGN || original_s[0..1] == '00'
+      significant_original_s[0] == Core::PLUS_SIGN || significant_original_s[0..1] == '00'
     end
 
     # converts symbols in phone to numbers
@@ -37,8 +37,9 @@ module Phonelib
     # defines if to validate against single country or not
     def passed_country(country)
       code = country_prefix(country)
-      if !Phonelib.ignore_plus && Core::PLUS_SIGN == @original[0] && code && !sanitized.start_with?(code)
-        # in case number passed with + but it doesn't start with passed
+      if !Phonelib.ignore_plus && original_starts_with_plus_or_double_zero? && code &&
+         !sanitized.delete_prefix('00').start_with?(code)
+        # in case number passed with + or 00 but it doesn't start with passed
         # country prefix
         country = nil
       end
@@ -98,6 +99,15 @@ module Phonelib
       @original_s ||= @original.is_a?(String) ? @original : ''
     end
 
+    # Returns original number without the leading characters that libphonenumber
+    # drops in extractPossibleNumber, so a plus or 00 written behind punctuation
+    # like "(+501) 623-6848" is still recognized as leading. Vanity conversion
+    # runs first, the same way +sanitized+ applies it, so leading letters that
+    # convert to significant digits are not stripped as junk.
+    def significant_original_s
+      @significant_original_s ||= vanity_converted(original_s).sub(cr('\A[^0-9+]+'), '')
+    end
+
     # Get country that was provided or default country in needable format
     #
     # ==== Attributes

data/lib/phonelib/phone_formatter.rb

@@ -57,7 +57,7 @@ module Phonelib
       return "#{prefix}#{sanitized}" unless possible?
       return "#{prefix}#{data_country_code}#{@national_number}" unless formatted
 
-      fmt = @data[country][:format]
+      fmt = country_data[:format]
       national = @national_number
       if (matches = @national_number.match(cr(fmt[Core::PATTERN])))
         fmt = fmt[:intl_format] || fmt[:format]
@@ -129,7 +129,7 @@ module Phonelib
       return false if impossible?
 
       # has national prefix
-      return false unless @data[country][Core::NATIONAL_PREFIX] || country == 'IT'
+      return false unless country_data[Core::NATIONAL_PREFIX] || country == 'IT'
       # fixed or mobile
       return false unless Core::AREA_CODE_TYPES.include?(type)
       # mobile && mexico, argentina, brazil
@@ -148,7 +148,7 @@ module Phonelib
     def formatting_data
       return @formatting_data if defined?(@formatting_data)
 
-      data = @data[country]
+      data = country_data
       format = data[:format]
       prefix = data[Core::NATIONAL_PREFIX]
       rule = format[Core::NATIONAL_PREFIX_RULE] ||

data/lib/phonelib/version.rb

@@ -2,5 +2,5 @@
 
 module Phonelib
   # @private
-  VERSION = '0.10.23'
+  VERSION = '0.10.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.10.23
+  version: 0.10.24
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-08-11 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Google libphonenumber library was taken as a basis for
@@ -40,7 +40,7 @@ homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.23
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.24
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"