phonelib 0.9.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8757503beb87b7e5f68f12655b3e94870db6a71a59e0a00517a8e28e20f0cb4
-  data.tar.gz: 7664e0a713b671f794489a8ea7e6a70638af68192ef733fa0bdc7fe21839673d
+  metadata.gz: 6f74da621590af3b6ba09374d12dcad33370f71e38d8ed5122baafd63ad12e32
+  data.tar.gz: bc722c0d765c923f5f815e77a9803635f80ca58d8dd0792190484d00a4340933
 SHA512:
-  metadata.gz: 96611d6ac22d85ae18a26de3fc1bed00418193775d5a2d815a6b68ff3658bbc61d6794b5d11fd85defa2fb4d6687a7c1dd3c4d14de6279174ae0adcc3a5bd20f
-  data.tar.gz: 9d48a4dfa707f1aaea3fe3932bf0518c1fc2bf59e749c6fe85fb0b343b014541f2d9e3cc549f9b38f97d3ea65c6d8e6ee13cfd27849fc6135c0e80e75e750070
+  metadata.gz: 1c17592015bf5060d0cafa50227a6c8f3f6a97bef71d8993e1915e1a2a6b0e118bb54f26f5ef0f509d631ca8938fccfb3465fcc3561829dd8e30db6652989f5f
+  data.tar.gz: 11fe31137e6468adafe4daecfbefd91c9a246489bcf02f483c1066e41f9a6a343849cd43e0f080187cb6d4eb5fdf924bad0c7d03e7e653c25de7928645856c72

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
@@ -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

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
 

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.2'
+  VERSION = '0.10.1'
 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.2
+  version: 0.10.1
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-08 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-11-20 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.1
 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