phonelib 0.10.3 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe27c3c85d76103dc9fe5fe1a3877f31fd06cf6b3327b25d4f93aea3238ca63
-  data.tar.gz: 15b2fb31d0e9997d0ef6fef3502a15499d8bd151a05f8ffd6ef08c23729db121
+  metadata.gz: 31ced2b5e00ea0e8386738b673cf28bdebd710f92d2f2581b17e41ddfb78714f
+  data.tar.gz: c713179d0c186a4595dc0927ce214fb3b4eee080bcdba01d97e4d08d58fbe2d7
 SHA512:
-  metadata.gz: 585a0298a4ec578788d3ee34d4c8c567290b9734f051a7bb73e85515b33b54c37792757d91a1c07fead6c9473bc6c5b9913c3313dc45fee03ea5e27e8152adda
-  data.tar.gz: 715cf0441e86fa0d3f8522023ace36fb3fe367e1c84c373d88130d87a8e51d8c8ed40bc17830d875d9c0f3b79d42ca81f3032106dce3964fc88ac3397c369d97
+  metadata.gz: 2e9de11fcf90df49c042ae6e2d443b7f83cb0189fe06629d28fa0e76cbbba499c442db2d2cb8af90b9819024f20cda8d30bd09f8858a7f4111599dd177dff998
+  data.tar.gz: 8cc3662ab6f37b380eb8046876e7ada3e547a48a226105ee852f3b803d319f3defd9f59f912191fc18c6cc53b0899b556a72491677de8e1bcb97bc6f73a15946

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/core.rb

@@ -202,7 +202,7 @@ module Phonelib
     end
 
     def add_additional_regex(country, type, national_regex)
-      return unless Phonelib::Core::TYPES_DESC.keys.include?(type.to_sym)
+      return unless Phonelib::Core::TYPES_DESC.key?(type.to_sym)
       return unless national_regex.is_a?(String)
       @@phone_data = @@data_by_country_codes = nil
       @@additional_regexes[country.to_s.upcase] ||= {}
@@ -381,6 +381,7 @@ module Phonelib
       carrier_selection_codes: 'Carrier Selection codes',
       area_code_optional: 'Are code optional'
     }.freeze
+    TYPES_DESC_KEYS = TYPES_DESC.keys.freeze
 
     # @private short codes types keys
     SHORT_CODES = [
@@ -407,6 +408,13 @@ module Phonelib
     # @private Extended data key for carrier in prefixes hash
     EXT_CARRIER_KEY = :c
 
+    # @private Static arrays used to avoid allocations
+    FIXED_OR_MOBILE_ARRAY = [Core::FIXED_OR_MOBILE].freeze
+    FIXED_LINE_OR_MOBILE_ARRAY = [Core::FIXED_LINE, Core::MOBILE].freeze
+    POSSIBLE_VALID_ARRAY = [:possible, :valid].freeze
+    VALID_POSSIBLE_ARRAY = [:valid, :possible].freeze
+    NIL_RESULT_ARRAY = [nil, nil].freeze
+
     # method for parsing phone number.
     # On first run fills @@phone_data with data present in yaml file
     # @param phone [String] the phone number to be parsed

data/lib/phonelib/data_importer_helper.rb

@@ -103,7 +103,13 @@ module Phonelib
         line = str_clean line, false
         next if line.empty? || line[0] == '#'
         prefix, line_data = line.split('|')
-        data[prefix] = line_data && line_data.strip.split('&')
+        if line_data
+          data[prefix] = if line_data.strip =~ /[^ ]{3,}&[^ ]{3,}/
+                           line_data.strip.split('&')
+                         else
+                           line_data.strip
+                         end
+        end
       end
       data
     end

data/lib/phonelib/phone_analyzer.rb

@@ -33,7 +33,7 @@ module Phonelib
 
     # pick best result when several countries specified
     def pick_results(results)
-      [:valid, :possible].each do |key|
+      Core::VALID_POSSIBLE_ARRAY.each do |key|
         final = results.select { |_k, v| v[key].any? }
         return decorate_analyze_result(final) if final.size > 0
       end
@@ -69,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.delete_prefix(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
@@ -132,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
@@ -153,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}"
@@ -179,7 +188,7 @@ module Phonelib
       if Phonelib.additional_regexes.is_a?(Hash) && Phonelib.additional_regexes[data[:id]]
         index = Phonelib.additional_regexes[data[:id]].values.flatten.join('|').scan(/\(/).size
       end
-      phone = country_match.to_a[-1 - index]
+      phone = country_match[-1 - index]
       result[:national] = phone
       result[:format] = number_format(phone, data[Core::FORMATS])
       result.merge! all_number_types(phone, data[Core::TYPES], not_valid)
@@ -220,7 +229,7 @@ module Phonelib
     def number_format(national, format_data)
       format_data && format_data.find do |format|
         (format[Core::LEADING_DIGITS].nil? || \
-            national.match(cr("^(#{format[Core::LEADING_DIGITS]})"))) && \
+            national.match?(cr("^(#{format[Core::LEADING_DIGITS]})"))) && \
           national.match(cr("^(#{format[Core::PATTERN]})$"))
       end || Core::DEFAULT_NUMBER_FORMAT
     end
@@ -241,7 +250,7 @@ module Phonelib
           type_regex(patterns, Core::VALID_PATTERN)
         ]
       else
-        [nil, nil]
+        Core::NIL_RESULT_ARRAY
       end
     end
   end

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
@@ -119,14 +121,15 @@ module Phonelib
     # * +data+ - country data hash
     # * +country_optional+ - whether to put country code as optional group
     def full_regex_for_data(data, type, country_optional = true)
-      regex = []
-      regex << '0{2}?'
-      regex << "(#{data[Core::INTERNATIONAL_PREFIX]})?"
-      regex << "(#{data[Core::COUNTRY_CODE]})#{country_optional ? '?' : ''}"
-      regex << "(#{data[Core::NATIONAL_PREFIX_FOR_PARSING] || data[Core::NATIONAL_PREFIX]})?"
-      regex << "(#{type_regex(data[Core::TYPES][Core::GENERAL], type)})" if data[Core::TYPES]
+      regex = +"^0{2}?(#{data[Core::INTERNATIONAL_PREFIX]})?(#{data[Core::COUNTRY_CODE]})#{country_optional ? '?' : ''}(#{data[Core::NATIONAL_PREFIX_FOR_PARSING] || data[Core::NATIONAL_PREFIX]})?"
+      if data[Core::TYPES]
+        regex << "("
+        regex << type_regex(data[Core::TYPES][Core::GENERAL], type)
+        regex << ")"
+      end
+      regex << "$"
 
-      cr("^#{regex.join}$")
+      cr(regex)
     end
 
     # Returns regex for type with special types if needed
@@ -136,11 +139,11 @@ module Phonelib
     # * +data+ - country types data for single type
     # * +type+ - possible or valid regex type needed
     def type_regex(data, type)
-      regex = [data[type]]
       if Phonelib.parse_special && data[Core::SHORT] && data[Core::SHORT][type]
-        regex << data[Core::SHORT][type]
+        "#{data[type]}|#{data[Core::SHORT][type]}"
+      else
+        data[type]
       end
-      regex.join('|')
     end
 
     # Check if phone match country data
@@ -150,9 +153,7 @@ module Phonelib
     # * +phone+ - phone number for parsing
     # * +data+  - country data
     def phone_match_data?(phone, data, possible = false)
-      country_code = "#{data[Core::COUNTRY_CODE]}"
-      inter_prefix = "(#{data[Core::INTERNATIONAL_PREFIX]})?"
-      return unless phone.match cr("^0{2}?#{inter_prefix}#{country_code}")
+      return unless phone.match?(cr("^0{2}?(#{data[Core::INTERNATIONAL_PREFIX]})?#{data[Core::COUNTRY_CODE]}"))
 
       type = possible ? Core::POSSIBLE_PATTERN : Core::VALID_PATTERN
       phone.match full_regex_for_data(data, type, false)
@@ -161,10 +162,9 @@ module Phonelib
     # checks if types has both :mobile and :fixed_line and replaces it with
     # :fixed_or_mobile in case both present
     def sanitize_fixed_mobile(types)
-      fixed_mobile = [Core::FIXED_LINE, Core::MOBILE]
-      [:possible, :valid].each do |key|
-        if (fixed_mobile - types[key]).empty?
-          types[key] = types[key] - fixed_mobile + [Core::FIXED_OR_MOBILE]
+      Core::POSSIBLE_VALID_ARRAY.each do |key|
+        if (Core::FIXED_LINE_OR_MOBILE_ARRAY - types[key]).empty?
+          types[key] = types[key] - Core::FIXED_LINE_OR_MOBILE_ARRAY + Core::FIXED_OR_MOBILE_ARRAY
         end
       end
       types
@@ -178,7 +178,7 @@ module Phonelib
     def types_for_check(data)
       exclude_list = PhoneAnalyzer::NOT_FOR_CHECK
       exclude_list += Phonelib::Core::SHORT_CODES unless Phonelib.parse_special
-      Core::TYPES_DESC.keys - exclude_list + fixed_and_mobile_keys(data)
+      Core::TYPES_DESC_KEYS - exclude_list + fixed_and_mobile_keys(data)
     end
 
     # Checks if fixed line pattern and mobile pattern are the same and returns
@@ -189,9 +189,9 @@ module Phonelib
     # * +data+  - country data
     def fixed_and_mobile_keys(data)
       if data[Core::FIXED_LINE] == data[Core::MOBILE]
-        [Core::FIXED_OR_MOBILE]
+        Core::FIXED_OR_MOBILE_ARRAY
       else
-        [Core::FIXED_LINE, Core::MOBILE]
+        Core::FIXED_LINE_OR_MOBILE_ARRAY
       end
     end
 

data/lib/phonelib/phone_extended_data.rb

@@ -18,12 +18,19 @@ module Phonelib
                    Phonelib::Core::EXT_GEO_NAME_KEY
     end
 
-    # Returns timezone of parsed phone number or nil if number is invalid or
-    # there is no timezone specified in db for this number
+    # Returns first timezone (in case several match) of parsed phone number or nil
+    # if number is invalid or there is no timezone specified in db for this number
     # @return [String|nil] timezone for parsed phone
     def timezone
-      get_ext_name Phonelib::Core::EXT_TIMEZONES,
-                   Phonelib::Core::EXT_TIMEZONE_KEY
+      timezones.first
+    end
+
+    # Returns timezones of parsed phone number or nil if number is invalid or
+    # there is no timezone specified in db for this number
+    # @return [Array] timezones for parsed phone
+    def timezones
+      res = get_ext_name Phonelib::Core::EXT_TIMEZONES, Phonelib::Core::EXT_TIMEZONE_KEY
+      res.is_a?(Array) ? res : [res]
     end
 
     # Returns carrier of parsed phone number or nil if number is invalid or
@@ -53,9 +60,7 @@ module Phonelib
     def get_ext_name(names_key, id_key)
       return nil unless ext_data[id_key]
 
-      res = Phonelib.phone_ext_data[names_key][ext_data[id_key]]
-      return nil unless res
-      res.size == 1 ? res.first : res
+      Phonelib.phone_ext_data[names_key][ext_data[id_key]]
     end
 
     # @private returns extended data ids for current number

data/lib/phonelib/phone_formatter.rb

@@ -54,7 +54,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 possible?
+      return "#{prefix}#{sanitized}" unless possible?
       return "#{prefix}#{data_country_code}#{@national_number}" unless formatted
 
       fmt = @data[country][:format]
@@ -137,12 +137,6 @@ module Phonelib
       true
     end
 
-    # @private defines whether to put country prefix or not
-    def country_prefix_or_not
-      return '' unless data_country_code
-      sanitized.start_with?(data_country_code) ? '' : data_country_code
-    end
-
     # @private returns extension with separator defined
     def formatted_extension
       return '' if @extension.nil? || @extension.empty?

data/lib/phonelib/version.rb

@@ -2,5 +2,5 @@
 
 module Phonelib
   # @private
-  VERSION = '0.10.3'
+  VERSION = '0.10.8'
 end

metadata

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