phonelib 0.10.24 → 0.10.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57ecb9e7c4eeabbaabb6ae82a15dc4334e0eb9749b87a70cdd3f37be143a6c3
-  data.tar.gz: 3f5c9003d13f07654412a6455a54defd4719d0bf56aec23df720cdb3005b5f5b
+  metadata.gz: 84e2a8f47cd1fb8108efa26ab0ba6120bd6e28a420794acf7ee099135618ab1e
+  data.tar.gz: a15e47d9b2a941639e4dc83226143c01b314506482d7fdee63ed95afa0ba78f4
 SHA512:
-  metadata.gz: b9d13eb82977f48c7024aaf7f0f5677fd03889e945b8ef8e067975d5b72466903a1d1c46ac7ea483beb41c2f3cd78b8af58da98f1012a41a302b297dde27ea88
-  data.tar.gz: 82cdc51eebad9516e64633116410c3e3056747c32049ad028bdac7359ce8ea5c61dc318cdc8dafcf32b3596b0ddec9226a46d3c0d124ec26cb828334703084d1
+  metadata.gz: 81a599c8844452b9d0124a8b75315905f85e79a31eedc3e14af66a830885fa0ebbe27aa9ebd65da57c7e710744d9147a1bf6304699049e0cd6452a8d698083bd
+  data.tar.gz: baf0e046b6eea13ae466c97b6a065f2fe9bf6fc496992424ebe78fd51d177acf72cefe8b53bdcae07d0fc2b6a6e42323966558fe593a4f57f22780d7aecf3fd5

data/lib/phonelib/data_importer_helper.rb

@@ -22,7 +22,7 @@ module Phonelib
     # method saves extended data file
     def save_extended_data_file
       extended = {
-        Phonelib::Core::EXT_PREFIXES => @prefixes,
+        Phonelib::Core::EXT_PREFIXES => intern_hashes(@prefixes),
         Phonelib::Core::EXT_GEO_NAMES => @geo_names,
         Phonelib::Core::EXT_COUNTRY_NAMES => @countries,
         Phonelib::Core::EXT_TIMEZONES => @timezones,
@@ -34,6 +34,14 @@ module Phonelib
       puts 'DATA SAVED'
     end
 
+    def intern_hashes(hash, table = {})
+      canonical = {}
+      hash.each do |k, v|
+        canonical[k] = v.is_a?(Hash) ? intern_hashes(v, table) : v
+      end
+      table[canonical] ||= canonical
+    end
+
     # method updates prefixes hash recursively
     def fill_prefixes(key, value, prefix, prefixes)
       prefixes = {} if prefixes.nil?

data/lib/phonelib/phone_analyzer.rb

@@ -139,7 +139,9 @@ module Phonelib
         key = data[:id]
         parsed = parse_single_country(phone, data)
         unless parsed && parsed[key] && parsed[key][:valid].size > 0
-          replaced_parsed = parse_single_country(with_replaced_national_prefix(phone, data), data)
+          replaced = with_replaced_national_prefix(phone, data)
+          # re-parsing an unchanged phone cannot change the result
+          replaced_parsed = parse_single_country(replaced, data) unless replaced == phone
           parsed = replaced_parsed unless replaced_parsed.nil?
         end
         if (!Phonelib.strict_double_prefix_check || key == country) && double_prefix_allowed?(data, phone, parsed && parsed[key])

data/lib/phonelib/phone_analyzer_helper.rb

@@ -17,7 +17,7 @@ module Phonelib
     end
 
     def original_starts_with_plus_or_double_zero?
-      significant_original_s[0] == Core::PLUS_SIGN || significant_original_s[0..1] == '00'
+      significant_original_s[0] == Core::PLUS_SIGN || significant_original_s[0..1] == '00' && significant_original_s[2..-1] =~ cr('[1-9]+')
     end
 
     # converts symbols in phone to numbers
@@ -48,7 +48,7 @@ module Phonelib
 
     # returns country prefix for provided country or nil
     def country_prefix(country)
-      country = country.to_s.upcase
+      country = normalize_passed_country(country)
       Phonelib.phone_data[country] && \
         Phonelib.phone_data[country][Core::COUNTRY_CODE]
     end
@@ -117,9 +117,9 @@ module Phonelib
       country ||= (original_starts_with_plus_or_double_zero? ? nil : Phonelib.default_country)
 
       if country.is_a?(Array)
-        country.compact.map { |e| e.to_s.upcase }
+        country.compact.map { |e| normalize_passed_country(e) }
       else
-        [country && country.to_s.upcase]
+        [country && normalize_passed_country(country)]
       end
     end
 
@@ -232,5 +232,14 @@ module Phonelib
       match = number.match(cr("^(?:#{regex})$"))
       match && match.to_s.length == number.length
     end
+
+    # normalization for passed country unless we are not talking about International XXX
+    def normalize_passed_country(country)
+      return country if country.nil?
+      country = country.to_s
+      return country if country.start_with?('International')
+      country.upcase
+    end
+
   end
 end

data/lib/phonelib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.10.24
+  version: 0.10.25
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-08-11 00:00:00.000000000 Z
+date: 2026-08-18 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.24
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.25
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"