phonelib 0.9.3 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e5e37ac67277523ec2768078a0c398df1c9d672f6fa1d95f0fb1ac396eb5472
-  data.tar.gz: 331f23d2f63729492ef0f036df74cf6cebab5e61a44adbc294ab949d5ac7f2b0
+  metadata.gz: e14bd0d38f0006d075d1d7d57c3532826a6cd28797b6b646643cac493d8ec820
+  data.tar.gz: 5d152596149d3c0a8953408917255fc91e1ae8f3ff44a6cf478544f5f75a6619
 SHA512:
-  metadata.gz: bebcbf09637c5416820600b368dde2ebe2dfb281c4573ecf310ac7af381dbb35229e3b657e9dd0ec3820c43d7ec70be4afd62f91c1fa9a99d1731e2ae934ebc2
-  data.tar.gz: ae47e8e2b78ec48f76b922bb4d429388b621714c5c14beb6ed89da54568ed2cac5474939928111a5b8d672319ada35f06e5bd05537c2434e3d752157ce1ea2a9
+  metadata.gz: 2893fd50a54de66f7be75ecd69eeae41899f25a59287bec615a8bd5f362822a014ff05ed79787f49961024758ee10fc9e7ea1d275e8df3a96ef68b12c33cad64
+  data.tar.gz: 9a63ff6d268ef3f986586068ea89c4af549924873c7e230206f1e46a5f66780cb95b96b2627b22b0312580d2d2f52d4c03256d4d9422713f1b380258ac2f7dbb

data/lib/phonelib/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # main module that includes all basic data and methods
   module Core

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
@@ -198,7 +203,7 @@ module Phonelib
         require 'open-uri'
         require 'csv'
         io = URI.open('http://download.geonames.org/export/dump/countryInfo.txt')
-        csv = CSV.new(io, {col_sep: "\t"})
+        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/data_importer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private helper module for parsing raw libphonenumber data
   module DataImporterHelper

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
@@ -139,7 +141,7 @@ module Phonelib
     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
 
@@ -172,7 +174,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.to_a[-1 - index]
       result[:national] = phone
       result[:format] = number_format(phone, data[Core::FORMATS])
       result.merge! all_number_types(phone, data[Core::TYPES], not_valid)

data/lib/phonelib/phone_analyzer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # @private helper methods for analyser
   module PhoneAnalyzerHelper
@@ -52,7 +54,7 @@ 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

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

data/lib/phonelib/phone_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phonelib
   # module includes all formatting methods
   module PhoneFormatter
@@ -159,7 +161,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.9.3'
+  VERSION = '0.10.2'
 end

data/lib/phonelib.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # main Phonelib module definition
 module Phonelib
   # load phonelib classes/modules
@@ -12,11 +14,7 @@ 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'
-  end
+  autoload :PhoneValidator, 'validators/phone_validator'
 
   if defined?(Rails)
     class Phonelib::Railtie < Rails::Railtie

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.9.3
+  version: 0.10.2
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-27 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.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !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.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.9
-- !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: 2024-12-15 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.2
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"

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