phonelib 0.6.47 → 0.6.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a9dc3f92bdda4df449b88b989c0b90f79b1fcdd6f4ffe1729aa4b9aefb2992
-  data.tar.gz: 01c8f2034b5451b696ba58be76db5cf4d61be25d467e46b57fd4cfee455e3325
+  metadata.gz: 9ab20ada741b6c807d528b1cd032b4e20ebfbde1bcc8fcd6eeeb7b351ddec3ed
+  data.tar.gz: cc73a6a56939c0ba09f8996fe17a6050db96af0c5e52b6a7b46c8c55bbf9869d
 SHA512:
-  metadata.gz: 6fa5f840b24ffbb506292a9577fb9832bc374dd22bc9096bef6f0685e9a86ba94ebf2230685790b5b4f046b64f19d7b90725ae15b2a36fa76fe5a511048fa563
-  data.tar.gz: 95841918b7173a4b8f93ad4939acc121a07cbb1c99a29064333666f50cad5548e02d4a4ad4f5afdaf34c0612cc3f563ba279cd9373157fbcaae8aed0224993d4
+  metadata.gz: 54375aea5dd1cf1ddd0d3c51d7ac9a6db4b745e152ef5d1a11c45571ef7f4bfb579e1021a1a9c13dc83ba77e39cca12e19904aba71f632456d15ec1d8e9ec97a
+  data.tar.gz: 85495f7efe0e2f9da9adbbe9b4b4f2e8219fc5f6842ae473a81626c9f8629557351ff025a98794f95ee79c1d661bf4f39ff5c3f4191db36d21d2c14849252d9c

data/README.md

@@ -2,7 +2,7 @@
 
 [![Built in integration with JetBrains RubyMine](https://github.com/daddyz/phonelib/blob/master/icon_RubyMine.png?raw=true)](https://www.jetbrains.com/ruby/)
 [![Gem Version](https://badge.fury.io/rb/phonelib.svg)](http://badge.fury.io/rb/phonelib)
-[![Build Status](https://travis-ci.org/daddyz/phonelib.png?branch=master)](http://travis-ci.org/daddyz/phonelib)
+[![Build Status](https://travis-ci.com/daddyz/phonelib.svg?branch=master)](http://travis-ci.com/daddyz/phonelib)
 [![](https://codeclimate.com/github/daddyz/phonelib/badges/coverage.svg)](https://codeclimate.com/github/daddyz/phonelib/coverage)
 [![](https://codeclimate.com/github/daddyz/phonelib/badges/gpa.svg)](https://codeclimate.com/github/daddyz/phonelib)
 [![Inline docs](http://inch-ci.org/github/daddyz/phonelib.svg?branch=master)](http://inch-ci.org/github/daddyz/phonelib)

data/lib/phonelib.rb

@@ -12,5 +12,9 @@ module Phonelib
 end
 
 if defined?(ActiveModel) || defined?(Rails)
-  autoload :PhoneValidator, 'validators/phone_validator'
+  if RUBY_VERSION >= '3.0.0'
+    autoload :PhoneValidator, 'validators/phone_validator3'
+  else
+    autoload :PhoneValidator, 'validators/phone_validator'
+  end
 end

data/lib/phonelib/version.rb

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

data/lib/validators/phone_validator3.rb

@@ -0,0 +1,130 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.47
+  version: 0.6.48
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,6 +148,7 @@ 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