phonelib 0.10.2 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14bd0d38f0006d075d1d7d57c3532826a6cd28797b6b646643cac493d8ec820
-  data.tar.gz: 5d152596149d3c0a8953408917255fc91e1ae8f3ff44a6cf478544f5f75a6619
+  metadata.gz: fb1fdf7dccd5aea928ae10a90c388d762b030e8c4def7a65d877923eeb3a4ca8
+  data.tar.gz: b59f64fb4a31d30dd168673fd1b7449821e49fdb561f41aa81a2441b7cd56cc1
 SHA512:
-  metadata.gz: 2893fd50a54de66f7be75ecd69eeae41899f25a59287bec615a8bd5f362822a014ff05ed79787f49961024758ee10fc9e7ea1d275e8df3a96ef68b12c33cad64
-  data.tar.gz: 9a63ff6d268ef3f986586068ea89c4af549924873c7e230206f1e46a5f66780cb95b96b2627b22b0312580d2d2f52d4c03256d4d9422713f1b380258ac2f7dbb
+  metadata.gz: d66563c8732ed401d1eefc8e2a2bf4339b047e1e5c840f5811cf590901461c403172abbb2fbb820adfaf2fc12ace71f5579d6089f104f9c85b8bc420faf4f2a0
+  data.tar.gz: 0ed58b39980e34e6bf3696c0513f44c284576bafec199cd56baa242589e1b1adce29cadd3621061c33e9bfe1feec2851a839ec665a813d7010660bd5a51e733b

data/README.md

@@ -13,7 +13,7 @@ But it still doesn't include all Google's library functionality.
 
 ## Incorrect parsing or validation
 
-In case your phone number is incorrectly parsed, you can check original libphonenumber for result [here](https://rawgit.com/googlei18n/libphonenumber/master/javascript/i18n/phonenumbers/demo-compiled.html) and in case of same parse result [open an issue for them](https://issuetracker.google.com/issues/new?component=192347&template=829703). This gem's data is based on it.
+In case your phone number is incorrectly parsed, you can check original libphonenumber for result [here](https://htmlpreview.github.io/?https://github.com/google/libphonenumber/blob/master/javascript/i18n/phonenumbers/demo-compiled.html) and in case of same parse result [open an issue for them](http://issuetracker.google.com/issues/new?component=192347). This gem's data is based on it.
 If you can't wait for libphonenumber to resolve the issue, try to use ```Phonelib.add_additional_regex``` and ```Phonelib.additional_regexes``` methods.
 
 ## Information

data/lib/phonelib/phone_analyzer.rb

@@ -19,7 +19,6 @@ module Phonelib
     #   country (2 letters) like 'US', 'us' or :us for United States
     def analyze(phone, passed_country)
       countries = country_or_default_country passed_country
-
       return analyze_single_country(phone, countries.first, passed_country) if countries.size == 1
 
       results = {}
@@ -70,9 +69,15 @@ module Phonelib
     end
 
     # replacing national prefix to simplified format
-    def with_replaced_national_prefix(phone, data)
-      return phone unless data[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
-      phone = phone.gsub(/^#{data[Core::COUNTRY_CODE]}/, '') if phone.start_with?(data[Core::COUNTRY_CODE]) && !data[Core::DOUBLE_COUNTRY_PREFIX_FLAG]
+    def with_replaced_national_prefix(passed_phone, data)
+      return passed_phone unless data[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
+      phone = if passed_phone.start_with?(data[Core::COUNTRY_CODE]) && !data[Core::DOUBLE_COUNTRY_PREFIX_FLAG]
+                passed_phone.gsub(/^#{data[Core::COUNTRY_CODE]}/, '')
+              else
+                passed_phone
+              end
+      return passed_phone unless phone.match? cr("^#{type_regex(data[Core::TYPES][Core::GENERAL], Core::POSSIBLE_PATTERN)}$")
+
       pattern = cr("^(?:#{data[Core::NATIONAL_PREFIX_FOR_PARSING]})")
       match = phone.match pattern
       if match && match.captures.compact.size > 0
@@ -133,8 +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
         if (!Phonelib.strict_double_prefix_check || key == country) && double_prefix_allowed?(data, phone, parsed && parsed[key])
-          parsed = parse_single_country(changed_dp_phone(key, phone), data)
+          parsed2 = parse_single_country(changed_dp_phone(key, phone), data)
+          parsed = parsed2 if parsed2 && parsed2[key] && parsed2[key][:valid].size > 0
         end
         result.merge!(parsed) unless parsed.nil?
       end.compact

data/lib/phonelib/version.rb

@@ -2,5 +2,5 @@
 
 module Phonelib
   # @private
-  VERSION = '0.10.2'
+  VERSION = '0.10.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 2025-02-10 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.2
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.4
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"