phonelib 0.6.48 → 0.6.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab20ada741b6c807d528b1cd032b4e20ebfbde1bcc8fcd6eeeb7b351ddec3ed
-  data.tar.gz: cc73a6a56939c0ba09f8996fe17a6050db96af0c5e52b6a7b46c8c55bbf9869d
+  metadata.gz: 1cfc6e3a60c622177adbc8caf40673faebc7a4919c766d021a199ec52372a385
+  data.tar.gz: 759d7b9dfa7807dcf33a3b19fc6e3a8d5cb98febe1f9458dced2f7d8a96a40f6
 SHA512:
-  metadata.gz: 54375aea5dd1cf1ddd0d3c51d7ac9a6db4b745e152ef5d1a11c45571ef7f4bfb579e1021a1a9c13dc83ba77e39cca12e19904aba71f632456d15ec1d8e9ec97a
-  data.tar.gz: 85495f7efe0e2f9da9adbbe9b4b4f2e8219fc5f6842ae473a81626c9f8629557351ff025a98794f95ee79c1d661bf4f39ff5c3f4191db36d21d2c14849252d9c
+  metadata.gz: a56a4ad205176638db2a08bb79c8366df4a0d839f971e7b8b38162c2089ad98671602e6a4f128510de78cf4e9fc73762af60e940fe7dcd8b8b9bd00d52f2186e
+  data.tar.gz: b5be23901e6786c28dfa16cd83130256e88a2323dacc7f9b45c5f6baa342b9a379076af3d1a4629b1b4a33b63c5ae11dd91943374b5daa67f85c20ed40704dd7

data/README.md

@@ -92,6 +92,21 @@ In case you need to overwrite some Google's libphonenumber library data, you nee
 Phonelib.override_phone_data = '/path/to/override_phone_data.dat'
 ```
 
+In case you want to add some custom or still not updated regex patterns for certain type you can use additional regexes feature in a following way:
+
+``` ruby
+Phonelib.add_additional_regex :us, Phonelib::Core::MOBILE, '[5]{10}' # this will add number 1-555-555-5555 to be valid
+Phonelib.add_additional_regex :gb, Phonelib::Core::MOBILE, '[1]{5}' # this will add number 44-11-111 to be valid
+# you can also specify all regexes using this method
+Phonelib.additional_regexes = [[:us, :mobile, "[5]{10}"], [:gb, :mobile, "[1]{5}"]]
+# or just use dump method to keep them altogether
+Phonelib.dump_additional_regexes # => [["US", :mobile, "[5]{10}"], ["GB", :mobile, "[1]{5}"]
+```
+
+(!) For a list of available types refer to this readme.
+
+(!) Please note that regex should be added as string
+
 In case phone number that was passed for parsing has "+" sign in the beginning, library will try to detect a country regarding the provided one.
 
 ### ActiveRecord Integration
@@ -237,7 +252,7 @@ phone.full_e164          # returns e164 phone representation with extension
 phone.full_international # returns formatted international number with extension
 ```
 
-You can pass <tt>false</tt> to <tt>national</tt> and <tt>international</tt> methods in order to get unformatted representaions
+You can pass <tt>false</tt> to <tt>national</tt> and <tt>international</tt> methods in order to get unformatted representations
 
 ``` ruby
 phone.international(false) # returns unformatted international phone

data/lib/phonelib/core.rb

@@ -149,6 +149,42 @@ module Phonelib
       @@override_phone_data
     end
 
+    @@additional_regexes = {}
+    # setter for data file to use
+    def additional_regexes=(data)
+      return unless data.is_a?(Array)
+      @@additional_regexes = {}
+      data.each do |row|
+        next if row.size != 3
+        add_additional_regex(*row)
+      end
+    end
+
+    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
+      @@additional_regexes[country.to_s.upcase] ||= {}
+      @@additional_regexes[country.to_s.upcase][type] ||= []
+      @@additional_regexes[country.to_s.upcase][type] << national_regex
+    end
+
+    def dump_additional_regexes
+      rows = []
+      @@additional_regexes.each do |country, types|
+        types.each do |type, regexes|
+          regexes.each do |regex|
+            rows << [country, type, regex]
+          end
+        end
+      end
+      rows
+    end
+
+    def additional_regexes
+      @@additional_regexes
+    end
+
     @@vanity_conversion = false
     # setter for vanity phone numbers chars replacement
     def vanity_conversion=(value)
@@ -393,6 +429,21 @@ module Phonelib
         override_data_file = Marshal.load(File.binread(override_phone_data))
         default_data.merge!(override_data_file)
       end
+      additional_regexes.each do |country, types|
+        types.each do |type, regex|
+          default_data[country][Core::TYPES][type] ||= {}
+          [Core::VALID_PATTERN, Core::POSSIBLE_PATTERN].each do |key|
+            if default_data[country][Core::TYPES][type][key]
+              default_data[country][Core::TYPES][type][key] << "|#{regex.join('|')}"
+            else
+              default_data[country][Core::TYPES][type][key] = regex.join('|')
+            end
+            if type != Core::GENERAL
+              default_data[country][Core::TYPES][Core::GENERAL][key] << "|#{regex.join('|')}"
+            end
+          end
+        end
+      end
       default_data
     end
 

data/lib/phonelib/data_importer.rb

@@ -19,6 +19,47 @@ module Phonelib
 
       # countries that can have double country prefix in number
       DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR IT NO PL CU VN)
+      FORMAT_SHARING = {
+        'CA' => 'US',
+        'CC' => 'AU',
+        'CX' => 'AU',
+        'DM' => 'US',
+        'DO' => 'US',
+        'EH' => 'MA',
+        'GD' => 'US',
+        'GG' => 'GB',
+        'GU' => 'US',
+        'IM' => 'GB',
+        'JE' => 'GB',
+        'JM' => 'US',
+        'KN' => 'US',
+        'KY' => 'US',
+        'KZ' => 'RU',
+        'LC' => 'US',
+        'MF' => 'GP',
+        'MP' => 'US',
+        'MS' => 'US',
+        'PR' => 'US',
+        'SJ' => 'NO',
+        'SX' => 'US',
+        'TA' => 'SH',
+        'TC' => 'US',
+        'TT' => 'US',
+        'VA' => 'IT',
+        'VC' => 'US',
+        'VG' => 'US',
+        'VI' => 'US',
+        'YT' => 'RE',
+        'AG' => 'US',
+        'AI' => 'US',
+        'AS' => 'US',
+        'AX' => 'FI',
+        'BB' => 'US',
+        'BL' => 'GP',
+        'BM' => 'US',
+        'BQ' => 'CW',
+        'BS' => 'US',
+      }
 
       # main data file in repo
       MAIN_FILE = 'resources/PhoneNumberMetadata.xml'
@@ -55,6 +96,7 @@ module Phonelib
         import_main_data
         import_short_data
         import_alternate_formats
+        process_format_links
         import_geocoding_data
         import_timezone_data
         import_carrier_data
@@ -115,6 +157,14 @@ module Phonelib
         end
       end
 
+      # some countries missing formats, and are linking them to another countries
+      def process_format_links
+        FORMAT_SHARING.each do |destination, source|
+          @data[destination][:formats] ||= []
+          @data[destination][:formats] = @data[destination][:formats] + @data[source][:formats]
+        end
+      end
+
       # method parses geocoding data dir
       def import_geocoding_data
         puts 'IMPORTING GEOCODING DATA'
@@ -148,7 +198,7 @@ module Phonelib
         io = open('http://api.geonames.org/countryInfoCSV?username=demo&style=full')
         csv = CSV.new(io, {col_sep: "\t"})
         csv.each do |row|
-          next if row[0].nil? || row[0].start_with?('#') || row[0].empty?
+          next if row[0].nil? || row[0].start_with?('#') || row[0].empty? || row[0].size != 2
 
           @countries[row[0]] = row[4]
         end

data/lib/phonelib/phone.rb

@@ -7,6 +7,9 @@ module Phonelib
     # @!attribute [r] extension
     # @return [String] phone extension passed for parsing after a number
     attr_reader :extension
+    # @!attribute [r] national_number
+    # @return [String] phone national number
+    attr_reader :national_number
 
     # including module that has all phone analyzing methods
     include Phonelib::PhoneAnalyzer

data/lib/phonelib/phone_extended_data.rb

@@ -58,7 +58,7 @@ module Phonelib
 
     # @private returns extended data ids for current number
     def ext_data
-      return @ext_data if @ext_data
+      return @ext_data if defined?(@ext_data) && @ext_data
 
       result = default_ext_data
       return result unless possible?

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.48'
+  VERSION = '0.6.58'
 end

data/lib/validators/phone_validator.rb

@@ -62,7 +62,7 @@ class PhoneValidator < ActiveModel::EachValidator
     @phone = parse(value, specified_country(record))
     valid = phone_valid? && valid_types? && valid_country? && valid_extensions?
 
-    record.errors.add(attribute, message, options) unless valid
+    record.errors.add(attribute, message, **options) unless valid
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.48
+  version: 0.6.58
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database