phonelib 0.10.5 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91ac6f0678295402a73fbefd2e073f04a4fff9240c6fa4f93dbde0bccfe11014
-  data.tar.gz: d9fa26fa4d55bad564e0002ac17694ec20ce59ac5d8a1b20752bdcc6d97ce32c
+  metadata.gz: c3392c3861bbde37edc22277490262ba9575e3fece9af25cc905e7e9818c3dfe
+  data.tar.gz: 341900031e760af19a6ab4f0e00dc7fd1f5d9df54fd3e8489428cefd4f070f42
 SHA512:
-  metadata.gz: 8dd3cdc933f0f820f59eddd5bce35d4d81ec9b8c52085498f0750769a73fecb07f9522a97cfd59e27b29a766f19c422e2f571d59d6488b26898ae34b6fb2a099
-  data.tar.gz: f8c549c48c8d0695c1a204c03cf4cc0189d9a408b72a8bae005b4996eefdf666fdcaa4a4d707849cd51e34ee33e41637845cfa01c8da4225b07bb7de795df3c7
+  metadata.gz: aca95b93fc79099532429253cc5a395e1570b9fa18cf59c52e1c531830cc0664b95c3ed9380d54fb831e517bd78bb4dfcb6a35a7d766a4fd2322d33c1641136d
+  data.tar.gz: 5e2f46e9ba85cdd56f66b48b9edd731229be5f676ba6087a531ec2cf14ed8b8cbc477c17a201b1bae42b4873751a4cd6335f2a118cbb881a3a2bf98095ee3bd0

data/lib/phonelib/phone_analyzer.rb

@@ -138,7 +138,10 @@ module Phonelib
       countries_data.each_with_object({}) do |data, result|
         key = data[:id]
         parsed = parse_single_country(phone, data)
-        parsed = parse_single_country(with_replaced_national_prefix(phone, data), data) unless parsed && parsed[key] && parsed[key][:valid].size > 0
+        unless parsed && parsed[key] && parsed[key][:valid].size > 0
+          replaced_parsed = parse_single_country(with_replaced_national_prefix(phone, data), data)
+          parsed = replaced_parsed unless replaced_parsed.nil?
+        end
         if (!Phonelib.strict_double_prefix_check || key == country) && double_prefix_allowed?(data, phone, parsed && parsed[key])
           parsed2 = parse_single_country(changed_dp_phone(key, phone), data)
           parsed = parsed2 if parsed2 && parsed2[key] && parsed2[key][:valid].size > 0
@@ -159,13 +162,13 @@ module Phonelib
     # * +phone+ - phone number for parsing
     # * +data+  - country data to be based on for creating e164 representation
     def convert_to_e164(phone, data)
-      match = phone.match full_regex_for_data(data, Core::VALID_PATTERN, !original_starts_with_plus?)
+      match = phone.match full_regex_for_data(data, Core::VALID_PATTERN, !original_starts_with_plus_or_double_zero?)
       case
       when match
         "#{data[Core::COUNTRY_CODE]}#{match.to_a.last}"
       when phone.match(cr("^#{data[Core::INTERNATIONAL_PREFIX]}"))
         phone.sub(cr("^#{data[Core::INTERNATIONAL_PREFIX]}"), Core::PLUS_SIGN)
-      when original_starts_with_plus? && phone.start_with?(data[Core::COUNTRY_CODE])
+      when original_starts_with_plus_or_double_zero? && phone.start_with?(data[Core::COUNTRY_CODE])
         phone
       else
         "#{data[Core::COUNTRY_CODE]}#{phone}"

data/lib/phonelib/phone_analyzer_helper.rb

@@ -16,8 +16,8 @@ module Phonelib
       end
     end
 
-    def original_starts_with_plus?
-      original_s[0] == Core::PLUS_SIGN
+    def original_starts_with_plus_or_double_zero?
+      original_s[0] == Core::PLUS_SIGN || original_s[0..1] == '00'
     end
 
     # converts symbols in phone to numbers
@@ -61,7 +61,8 @@ module Phonelib
     def country_can_dp?(country)
       Phonelib.phone_data[country] &&
         Phonelib.phone_data[country][Core::DOUBLE_COUNTRY_PREFIX_FLAG] &&
-        !original_starts_with_plus? && original_s.start_with?(Phonelib.phone_data[country][Core::COUNTRY_CODE])
+        !original_starts_with_plus_or_double_zero? &&
+        original_s.start_with?(Phonelib.phone_data[country][Core::COUNTRY_CODE])
     end
 
     # changes phone to with/without double country prefix
@@ -89,7 +90,7 @@ module Phonelib
       data[Core::DOUBLE_COUNTRY_PREFIX_FLAG] &&
         phone =~ cr("^#{data[Core::COUNTRY_CODE]}") &&
         parsed && (parsed[:valid].nil? || parsed[:valid].empty?) &&
-        !original_starts_with_plus?
+        !original_starts_with_plus_or_double_zero?
     end
 
     # Returns original number passed if it's a string or empty string otherwise
@@ -103,7 +104,8 @@ module Phonelib
     #
     # * +country+ - country passed for parsing
     def country_or_default_country(country)
-      country ||= (original_starts_with_plus? ? nil : Phonelib.default_country)
+      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 }
       else

data/lib/phonelib/version.rb

@@ -2,5 +2,5 @@
 
 module Phonelib
   # @private
-  VERSION = '0.10.5'
+  VERSION = '0.10.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.7
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-04-07 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.5
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.7
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"