phonelib 0.8.4 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc68ad6683a9dbc13f88b825e589c1836a31e83b8f67c6e71d54afac44d0fceb
-  data.tar.gz: 39ed9dfdc4bf02a8850c18068be4e24407141734718a71e8fa4779f0f1c4ff17
+  metadata.gz: 700f7d81fef64c646c34a58849db498373d5dbbd02c1325fc34b57129617adab
+  data.tar.gz: 4d56e6bc50304ffea7aa9a2910b66db0ae154b6846b34186f86b04c24e12cdde
 SHA512:
-  metadata.gz: 21e94b4cd849e0116189ef7b232dd2d6949b02b9e6e295dfe463272b035669a062d90902e7f4aa6c98001c05dfa2c803f9e83320fe1b32e16f654d88305c62ca
-  data.tar.gz: f05c697263e31b17a6946ac9fda9c52780fa2aaef23b4031ba7eced4b34b5d576a581dbeacda334d962cb64cd46edebc1aa1c0e5fbcdf9661ccc7d0f28448dbd
+  metadata.gz: 74c428da069f2eca4919c3db99fd13a18505dc55afa64c6b1f595135dfa2abb33768af6266630f203a03919d94514bf3f28cdb5f5279bd6e81f8e30713424822
+  data.tar.gz: 505ee8b7e47951ad862ca8d586127d93b1850e832130337de320d7e028d32598d96853204fb0e4c8875884c67d2fe7bee7868cdda72f4295461fb0c1db304a82

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

@@ -1,9 +1,24 @@
+# frozen_string_literal: true
+
 module Phonelib
   # main module that includes all basic data and methods
   module Core
     # @private variable will include hash with data for validation
     @@phone_data = nil
 
+    # eagerly initialize the gem, loads data into memory. not required, initialization is done lazily otherwise, but
+    # may be desirable in production enviroments to avoid initialization time on first use.
+    def eager_load!
+      return if @@skip_eager_loading
+      phone_data
+      phone_ext_data
+    end
+
+    @@skip_eager_loading = false
+    def skip_eager_loading!
+      @@skip_eager_loading = true
+    end
+
     # getter for phone data for other modules of gem, can be used outside
     # @return [Hash] all data for phone parsing
     def phone_data
@@ -187,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] ||= {}
@@ -366,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 = [
@@ -392,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.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'phonelib/data_importer_helper'
 
 module Phonelib
@@ -6,7 +8,7 @@ module Phonelib
     require 'nokogiri'
 
     # official libphonenumber repo for cloning
-    REPO = 'https://github.com/googlei18n/libphonenumber.git'
+    REPO = 'https://github.com/google/libphonenumber.git'
 
     # importing function
     def self.import
@@ -126,6 +128,9 @@ module Phonelib
           if country[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
             country[Core::NATIONAL_PREFIX_TRANSFORM_RULE].gsub!('$', '\\')
           end
+          if country[:id] == '001'
+            country[:id] = 'International ' + country[:country_code]
+          end
           @data[country[:id]] = country
         end
       end
@@ -197,8 +202,8 @@ module Phonelib
 
         require 'open-uri'
         require 'csv'
-        io = open('http://api.geonames.org/countryInfoCSV?username=demo&style=full')
-        csv = CSV.new(io, {col_sep: "\t"})
+        io = URI.open('http://download.geonames.org/export/dump/countryInfo.txt')
+        csv = CSV.new(io, **{col_sep: "\t"})
         csv.each do |row|
           next if row[0].nil? || row[0].start_with?('#') || row[0].empty? || row[0].size != 2
 
@@ -209,7 +214,7 @@ module Phonelib
       # adds double country code flag in case country allows
       def add_double_country_flag(country)
         if DOUBLE_COUNTRY_CODES_COUNTRIES.include?(country[:id])
-          country[:double_prefix] = true
+          country[Core::DOUBLE_COUNTRY_PREFIX_FLAG] = true
         end
         country
       end

data/lib/phonelib/data_importer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private helper module for parsing raw libphonenumber data
   module DataImporterHelper
@@ -101,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.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # class for parsed phone number, includes validation and formatting methods
   class Phone
@@ -24,7 +26,7 @@ module Phonelib
     # @return [Phonelib::Phone] parsed phone instance
     def initialize(phone, country = nil)
       @original, @extension = separate_extension(phone.to_s)
-      @extension.gsub!(/[^0-9]/, '') if @extension
+      @extension = @extension.gsub(/[^0-9]/, '') if @extension
 
       if sanitized.empty?
         @data = {}

data/lib/phonelib/phone_analyzer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private phone analyzing methods module
   module PhoneAnalyzer
@@ -17,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 = {}
@@ -32,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
@@ -68,12 +69,19 @@ 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]
+    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
-        phone.gsub(pattern, data[Core::NATIONAL_PREFIX_TRANSFORM_RULE])
+        data[Core::COUNTRY_CODE] + phone.gsub(pattern, data[Core::NATIONAL_PREFIX_TRANSFORM_RULE])
       else
         phone
       end
@@ -130,15 +138,20 @@ module Phonelib
       countries_data.each_with_object({}) do |data, result|
         key = data[:id]
         parsed = parse_single_country(phone, data)
+        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])
-          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
     end
 
     def country_code_candidates_for(phone)
-      stripped_phone = phone.gsub(/^(#{Phonelib.phone_data_int_prefixes})/, '')
+      stripped_phone = phone.gsub(cr("Phonelib.phone_data_int_prefixes") { /^(#{Phonelib.phone_data_int_prefixes})/ }, '')
       ((1..3).map { |length| phone[0, length] } + (1..3).map { |length| stripped_phone[0, length] }).uniq
     end
 
@@ -149,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}"
@@ -171,7 +184,11 @@ module Phonelib
     # * +not_valid+ - specifies that number is not valid by general desc pattern
     def national_and_data(data, country_match, not_valid = false)
       result = data.select { |k, _v| k != :types && k != :formats }
-      phone = country_match.to_a.last
+      index = 0
+      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[-1 - index]
       result[:national] = phone
       result[:format] = number_format(phone, data[Core::FORMATS])
       result.merge! all_number_types(phone, data[Core::TYPES], not_valid)
@@ -212,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
@@ -233,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private helper methods for analyser
   module PhoneAnalyzerHelper
@@ -8,13 +10,14 @@ module Phonelib
         result
       else
         matched_countries = country_or_default_country(nil) & result.keys
+        matched_countries = result.keys.take(1) if matched_countries.size == 0
         result = result.keep_if {|k, _v| matched_countries.include?(k) } if matched_countries
         Hash[result.take(1)]
       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
@@ -51,14 +54,15 @@ module Phonelib
 
     # caches regular expression, reusing it for later lookups
     def cr(regexp)
-      Phonelib.phone_regexp_cache[regexp] ||= Regexp.new(regexp).freeze
+      Phonelib.phone_regexp_cache[regexp] ||= Regexp.new(block_given? ? yield(regexp) : regexp).freeze
     end
 
     # defines whether country can have double country prefix in number
     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
@@ -86,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
@@ -100,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
@@ -116,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
@@ -133,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
@@ -147,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)
@@ -158,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
@@ -175,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
@@ -186,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # module provides extended data methods for parsed phone
   module PhoneExtendedData
@@ -16,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
@@ -51,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # module includes all formatting methods
   module PhoneFormatter
@@ -35,7 +37,7 @@ module Phonelib
       return @country_code if @country_code
 
       code = Phonelib.phone_data[country] && Phonelib.phone_data[country][Core::COUNTRY_CODE]
-      return @country_code = code unless code == '1' && Phonelib.phone_data[country][Core::LEADING_DIGITS]
+      return @country_code = code unless code == '1' && Phonelib.phone_data[country][Core::LEADING_DIGITS] && Phonelib.phone_data[country][Core::LEADING_DIGITS] =~ /[\[\|]/
 
       match = e164.match(/\A\+(1(#{Phonelib.phone_data[country][Core::LEADING_DIGITS]}))/)
       if match
@@ -52,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]
@@ -135,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?
@@ -159,7 +155,7 @@ module Phonelib
              data[Core::NATIONAL_PREFIX_RULE] || '$1'
 
       # change rule's constants to values
-      rule.gsub!(/(\$NP|\$FG)/, '$NP' => prefix, '$FG' => '$1')
+      rule = rule.gsub(/(\$NP|\$FG)/, '$NP' => prefix, '$FG' => '$1')
 
       # add space to format groups, change first group to rule,
       format_string = format[:format].gsub(/(\d)\$/, '\\1 $')

data/lib/phonelib/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private
-  VERSION = '0.8.4'
+  VERSION = '0.10.11'
 end

data/lib/phonelib.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # main Phonelib module definition
 module Phonelib
   # load phonelib classes/modules
@@ -12,9 +14,13 @@ module Phonelib
 end
 
 if defined?(ActiveModel) || defined?(Rails)
-  if RUBY_VERSION >= '3.0.0'
-    autoload :PhoneValidator, 'validators/phone_validator3'
-  else
-    autoload :PhoneValidator, 'validators/phone_validator'
+  autoload :PhoneValidator, 'validators/phone_validator'
+
+  if defined?(Rails)
+    class Phonelib::Railtie < Rails::Railtie
+      initializer 'phonelib' do |app|
+        app.config.eager_load_namespaces << Phonelib
+      end
+    end
   end
 end

data/lib/tasks/phonelib_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :phonelib do
   desc 'Create database for tests in Rails dummy application'
   task :create_test_db do

data/lib/validators/phone_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Validator class for phone validations
 #
 # ==== Examples

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.10.11
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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-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
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.1
+date: 2025-07-24 00:00:00.000000000 Z
+dependencies: []
 description: |2
       Google libphonenumber library was taken as a basis for
       this gem. Gem uses its data file for validations and number formatting.
@@ -176,11 +36,11 @@ files:
 - lib/phonelib/version.rb
 - lib/tasks/phonelib_tasks.rake
 - lib/validators/phone_validator.rb
-- lib/validators/phone_validator3.rb
 homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.11
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"
@@ -197,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database

data/lib/validators/phone_validator3.rb

@@ -1,130 +0,0 @@
-# Validator class for phone validations
-#
-# ==== Examples
-#
-# Validates that attribute is a valid phone number.
-# If empty value passed for attribute it fails.
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number
-#     validates :number, phone: true
-#   end
-#
-# Validates that attribute is a possible phone number.
-# If empty value passed for attribute it fails.
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number
-#     validates :number, phone: { possible: true }
-#   end
-#
-# Validates that attribute is a valid phone number.
-# Empty value is allowed to be passed.
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number
-#     validates :number, phone: { allow_blank: true }
-#   end
-#
-# Validates that attribute is a valid phone number of specified type(s).
-# It is also possible to check that attribute is a possible number of specified
-# type(s). Symbol or array accepted.
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number, :mobile
-#     validates :number, phone: { types: [:mobile, :fixed], allow_blank: true }
-#     validates :mobile, phone: { possible: true, types: :mobile  }
-#   end
-#
-# validates that phone is valid and it is from specified country or countries
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number
-#     validates :number, phone: { countries: [:us, :ca] }
-#   end
-#
-# Validates that attribute does not include an extension.
-# The default setting is to allow extensions
-#
-#   class Phone < ActiveRecord::Base
-#     attr_accessible :number
-#     validates :number, phone: { extensions: false }
-#   end
-#
-class PhoneValidator < ActiveModel::EachValidator
-  # Include all core methods
-  include Phonelib::Core
-
-  # Validation method
-  def validate_each(record, attribute, value)
-    return if options[:allow_blank] && value.blank?
-
-    @phone = parse(value, specified_country(record))
-    valid = phone_valid? && valid_types? && valid_country? && valid_extensions?
-
-    record.errors.add(attribute, message, **options) unless valid
-  end
-
-  private
-
-  def message
-    options[:message] || :invalid
-  end
-
-  def phone_valid?
-    @phone.send(options[:possible] ? :possible? : :valid?)
-  end
-
-  def valid_types?
-    return true unless options[:types]
-    (phone_types & types).size > 0
-  end
-
-  def valid_country?
-    return true unless options[:countries]
-    (phone_countries & countries).size > 0
-  end
-
-  def valid_extensions?
-    return true if !options.has_key?(:extensions) || options[:extensions]
-    @phone.extension.empty?
-  end
-
-  def specified_country(record)
-    return unless options[:country_specifier]
-
-    if options[:country_specifier].is_a?(Symbol)
-      record.send(options[:country_specifier])
-    else
-      options[:country_specifier].call(record)
-    end
-  end
-
-  # @private
-  def phone_types
-    method = options[:possible] ? :possible_types : :types
-    phone_types = @phone.send(method)
-    if (phone_types & [Phonelib::Core::FIXED_OR_MOBILE]).size > 0
-      phone_types += [Phonelib::Core::FIXED_LINE, Phonelib::Core::MOBILE]
-    end
-    phone_types
-  end
-
-  # @private
-  def phone_countries
-    method = options[:possible] ? :countries : :valid_countries
-    @phone.send(method)
-  end
-
-  # @private
-  def types
-    types = options[:types].is_a?(Array) ? options[:types] : [options[:types]]
-    types.map(&:to_sym)
-  end
-
-  # @private
-  def countries
-    countries = options[:countries].is_a?(Array) ? options[:countries] : [options[:countries]]
-    countries.map { |c| c.to_s.upcase }
-  end
-end