phonelib 0.7.7 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcdc081295ac56df465d03c3ce7a6662248efd0435418bed4ca9d4b7af4b9177
-  data.tar.gz: 95e6742ba9fe64deabd92d477e41f6a3dc95b9d6d97439721f68d7fb11b5078f
+  metadata.gz: cc68ad6683a9dbc13f88b825e589c1836a31e83b8f67c6e71d54afac44d0fceb
+  data.tar.gz: 39ed9dfdc4bf02a8850c18068be4e24407141734718a71e8fa4779f0f1c4ff17
 SHA512:
-  metadata.gz: 1783e018ef2a0299251a30e9b228964e186c3c88b1603d1b6f9bd068d4ae240a731127730bd1b4748c149c68f394628d5aa8917337452277c8ec18245fe5a89f
-  data.tar.gz: e94e439077eb2e33f1fcdb1d1e735a60968258240ba97fd3c730eb236eb7bb8319cf2f0d8dea40fb3c0a8b549a0730201dd17a8e74c837722edcd087255556a9
+  metadata.gz: 21e94b4cd849e0116189ef7b232dd2d6949b02b9e6e295dfe463272b035669a062d90902e7f4aa6c98001c05dfa2c803f9e83320fe1b32e16f654d88305c62ca
+  data.tar.gz: f05c697263e31b17a6946ac9fda9c52780fa2aaef23b4031ba7eced4b34b5d576a581dbeacda334d962cb64cd46edebc1aa1c0e5fbcdf9661ccc7d0f28448dbd

data/lib/phonelib/core.rb

@@ -10,6 +10,16 @@ module Phonelib
       @@phone_data ||= load_data.freeze
     end
 
+    # @private getter for phone data indexed by country code (internal use only)
+    def data_by_country_codes
+      @@data_by_country_codes ||= phone_data.each_value.group_by { |d| d[COUNTRY_CODE] }.freeze
+    end
+
+    # @private getter for all international prefixes in phone_data
+    def phone_data_int_prefixes
+      @@all_int_prefixes ||= phone_data.map {|k,v| v[:international_prefix] }.select { |v| v != '' }.compact.uniq.join('|').freeze
+    end
+
     # @private used to cache frequently-used regular expressions
     @@phone_regexp_cache = {}
 
@@ -30,14 +40,14 @@ module Phonelib
     @@default_country = nil
 
     # getter method for default_country variable
-    # @return [String|nil] Default country set for parsing or nil
+    # @return [String,Symbol,Array<String,Symbol>,nil] Default country ISO2 code or codes used for parsing
     def default_country
       @@default_country
     end
 
     # setter method for default_country variable
-    # @param country [String|Symbol] default country ISO2 code used for parsing
-    # @return [String|nil] Default country set for parsing or nil
+    # @param country [String,Symbol,Array<String,Symbol>] Default country ISO2 code or codes used for parsing
+    # @return [String,Symbol,Array<String,Symbol>] Default country ISO2 code or codes used for parsing
     def default_country=(country)
       @@default_country = country
     end
@@ -179,7 +189,7 @@ module Phonelib
     def add_additional_regex(country, type, national_regex)
       return unless Phonelib::Core::TYPES_DESC.keys.include?(type.to_sym)
       return unless national_regex.is_a?(String)
-      @@phone_data = nil
+      @@phone_data = @@data_by_country_codes = nil
       @@additional_regexes[country.to_s.upcase] ||= {}
       @@additional_regexes[country.to_s.upcase][type] ||= []
       @@additional_regexes[country.to_s.upcase][type] << national_regex

data/lib/phonelib/data_importer.rb

@@ -45,6 +45,7 @@ module Phonelib
         'TA' => 'SH',
         'TC' => 'US',
         'TT' => 'US',
+        'UM' => 'US',
         'VA' => 'IT',
         'VC' => 'US',
         'VG' => 'US',
@@ -160,6 +161,7 @@ module Phonelib
       # some countries missing formats, and are linking them to another countries
       def process_format_links
         FORMAT_SHARING.each do |destination, source|
+          next unless @data[destination]
           @data[destination][:formats] ||= []
           @data[destination][:formats] = @data[destination][:formats] + @data[source][:formats]
         end

data/lib/phonelib/phone.rb

@@ -178,6 +178,8 @@ module Phonelib
 
     # @private extracts extension from passed phone number if provided
     def separate_extension(original)
+      return [original, ''] unless Phonelib.extension_separate_symbols
+
       regex = if Phonelib.extension_separate_symbols.is_a?(Array)
                 cr("#{Phonelib.extension_separate_symbols.join('|')}")
               else

data/lib/phonelib/phone_analyzer.rb

@@ -124,15 +124,22 @@ module Phonelib
     #
     # * +phone+ - phone number for parsing
     def detect_and_parse(phone, country)
-      result = {}
-      Phonelib.phone_data.each do |key, data|
+      countries_data = country_code_candidates_for(phone).flat_map { |code|
+        Phonelib.data_by_country_codes[code] || []
+      }
+      countries_data.each_with_object({}) do |data, result|
+        key = data[:id]
         parsed = parse_single_country(phone, data)
         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)
         end
         result.merge!(parsed) unless parsed.nil?
-      end
-      result
+      end.compact
+    end
+
+    def country_code_candidates_for(phone)
+      stripped_phone = phone.gsub(/^(#{Phonelib.phone_data_int_prefixes})/, '')
+      ((1..3).map { |length| phone[0, length] } + (1..3).map { |length| stripped_phone[0, length] }).uniq
     end
 
     # Create phone representation in e164 format

data/lib/phonelib/phone_analyzer_helper.rb

@@ -7,6 +7,8 @@ module Phonelib
       if result.size == 1
         result
       else
+        matched_countries = country_or_default_country(nil) & result.keys
+        result = result.keep_if {|k, _v| matched_countries.include?(k) } if matched_countries
         Hash[result.take(1)]
       end
     end
@@ -56,7 +58,7 @@ 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_starts_with_plus? && original_s.start_with?(Phonelib.phone_data[country][Core::COUNTRY_CODE])
     end
 
     # changes phone to with/without double country prefix
@@ -66,6 +68,7 @@ module Phonelib
 
       country_code = Phonelib.phone_data[country][Core::COUNTRY_CODE]
       if phone.start_with? country_code * 2
+        # remove double prefix in case it is there
         phone.gsub(cr("^#{country_code}"), '')
       else
         "#{country_code}#{phone}"

data/lib/phonelib/phone_formatter.rb

@@ -5,7 +5,7 @@ module Phonelib
     # @param formatted [Boolean] whether to return numbers only or formatted
     # @return [String] formatted national number
     def national(formatted = true)
-      return @national_number unless valid?
+      return @national_number unless possible?
       format_match, format_string = formatting_data
 
       if format_match
@@ -52,7 +52,7 @@ module Phonelib
     def international(formatted = true, prefix = '+')
       prefix = formatted if formatted.is_a?(String)
       return nil if sanitized.empty?
-      return "#{prefix}#{country_prefix_or_not}#{sanitized}" unless valid?
+      return "#{prefix}#{country_prefix_or_not}#{sanitized}" unless possible?
       return "#{prefix}#{data_country_code}#{@national_number}" unless formatted
 
       fmt = @data[country][:format]

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.7.7'
+  VERSION = '0.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.4
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-memory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database