phonelib 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0683165e1d17e555f17a0ed2c73bd103b97e0c591485c75ae31f037c1111c62f'
-  data.tar.gz: 9024af8cda171f5da213ba0c6de0832a3ba6900bde08f8cfb52c5c7f0baba2f8
+  metadata.gz: bdcde83b646a76dd337ecbb6e7ca8976a23729936d34a0b2734ac6dc76d758e0
+  data.tar.gz: 5f0ef67a10c99e563f52885860e41aefa08c67df4d3593fc9fe515c1479ebc6b
 SHA512:
-  metadata.gz: 898910034bad98e8eb27383df6dac169353ff0906eeb4fcb0284ea6c3b890bae7343d456646047be3488dc023ae62b2fab7aeaa0ecd32ec0f989d42e8202add0
-  data.tar.gz: c4588aa08410f57b735035365222d8256f996eb4b06d1a7f052ea987070df710d2d506e6b108c576856d609cd7785616231850e5da940d4f915caf68113379be
+  metadata.gz: f27ccd04e753eb2349af42ea19710fec3c4d97975e477a380651f51c6d2c47202b5e029f93807659df33aac6cf3817ffda7fc6eeeceb81e02132b6d1d6294f1f
+  data.tar.gz: 3c2049c708d6e938cbbc3459a3bec1ad20a409b797cd4a399586705231e0321a897a9ebe19fd1cfd7e13be9cae22515b08390a323262cb0015a591186632e845

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 = {}
 
@@ -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/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/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.7.6'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-04-04 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