phonelib 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdcde83b646a76dd337ecbb6e7ca8976a23729936d34a0b2734ac6dc76d758e0
-  data.tar.gz: 5f0ef67a10c99e563f52885860e41aefa08c67df4d3593fc9fe515c1479ebc6b
+  metadata.gz: cfc1c4a9625861e072096320aec6b4867d509d47b170fcd0a92c0ffde521f7b5
+  data.tar.gz: f0d3db76ed4614f8667796d79b4166d2827801997b04986429d7b80418337420
 SHA512:
-  metadata.gz: f27ccd04e753eb2349af42ea19710fec3c4d97975e477a380651f51c6d2c47202b5e029f93807659df33aac6cf3817ffda7fc6eeeceb81e02132b6d1d6294f1f
-  data.tar.gz: 3c2049c708d6e938cbbc3459a3bec1ad20a409b797cd4a399586705231e0321a897a9ebe19fd1cfd7e13be9cae22515b08390a323262cb0015a591186632e845
+  metadata.gz: 03fd33d4683e7845bb94c5293ab0d9e28654cf4e9024a60221e62017d60a396c71167382ce40eef5ff60fcc1c2578845a6bdf996050f275e198dc04c280a54b3
+  data.tar.gz: 9fe16f0ecab0ce8f583a61c7516052b59394d11f4555b267c1602cd6c5113fda3b109a8e0e4d6c3624ce2e01c39b3e32e89b52b2f63ffb0e019e7359b6cddb5f

data/lib/phonelib/core.rb

@@ -4,6 +4,19 @@ module Phonelib
     # @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
@@ -40,14 +53,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

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
@@ -195,7 +197,7 @@ module Phonelib
 
         require 'open-uri'
         require 'csv'
-        io = open('http://api.geonames.org/countryInfoCSV?username=demo&style=full')
+        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

data/lib/phonelib/phone_analyzer.rb

@@ -70,10 +70,11 @@ module Phonelib
     # 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])
       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

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.8.0'
+  VERSION = '0.9.0'
 end

data/lib/phonelib.rb

@@ -17,4 +17,12 @@ if defined?(ActiveModel) || defined?(Rails)
   else
     autoload :PhoneValidator, 'validators/phone_validator'
   end
+
+  if defined?(Rails)
+    class Phonelib::Railtie < Rails::Railtie
+      initializer 'phonelib' do |app|
+        app.config.eager_load_namespaces << Phonelib
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -197,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.1.6
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database