phonelib 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340a5c0487adffe92db6fbba129f1d79d669e3ca
-  data.tar.gz: 58b742b98ed74a4a8b47573f30b0eb4e4963e4ab
+  metadata.gz: 73b3d8a14f0b8759fd8b6bef0535a46b7a9d0731
+  data.tar.gz: ae495d47f1ad7b0d6c2cd28f54ce665cef40fc22
 SHA512:
-  metadata.gz: 935c0feb67ce471cba7f9e2c4046deba98ea3800e5bbd864ef227ec5503a4fd1b8317d8a00cac190e02c8f161c9c72191f44b4c79129f1436ee2d4d7a7136cf7
-  data.tar.gz: 5377cf7fa504d3538163f7eac8142e8729620c0f558a48f3488e93a4a5ddd786061e2366028b21d525f16d68145b3c295be1dc8a243e11b068c1c3b5555a71f9
+  metadata.gz: da7be7fee93026ad690e049a1e5afe825222756f82c9770a3918d1ef9e31f937c17e5af1fc0377c34b7b97da6a1b9296dfd33e4f4588bf634ca95a453a07a1c4
+  data.tar.gz: 1254c4b20dbdd079151f4bbbf0378192ba0b80d5af02dc9c5f20bc9b6549712bb82d3f596406817b9ff51550fc0192ab01e9051192904f20f41fb29c5dcc2058

data/README.md

@@ -109,6 +109,9 @@ Refer to [Google libphonenumber](http://code.google.com/p/libphonenumber/) for m
 <tt>types: :mobile</tt> or <tt>types: [:voip, :mobile]</tt> - allows to validate against specific phone types patterns,
 if mixed with <tt>possible</tt> will check if number is possible for specified type
 
+<tt>countries: :us</tt> or <tt>countries: [:us, :ca]</tt> - allows to validate against specific countries, 
+if mixed with <tt>possible</tt> will check if number is possible for specified countries
+
 <tt>country_specifier: -> phone { phone.country.try(:upcase) }</tt> - allows to specify country for validation dynamically for each validation.
 
 <tt>extensions: false</tt> - set to perform check for phone extension to be blank

data/lib/phonelib/data_importer.rb

@@ -18,7 +18,7 @@ module Phonelib
       include Phonelib::DataImporterHelper
 
       # countries that can have double country prefix in number
-      DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR IT NO)
+      DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR IT NO PL)
 
       # main data file in repo
       MAIN_FILE = 'resources/PhoneNumberMetadata.xml'

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.21'
+  VERSION = '0.6.22'
 end

data/lib/validators/phone_validator.rb

@@ -36,6 +36,13 @@
 #     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
 #
@@ -51,19 +58,9 @@ class PhoneValidator < ActiveModel::EachValidator
   # Validation method
   def validate_each(record, attribute, value)
     return if options[:allow_blank] && value.blank?
-    allowed_extensions = options.has_key?(:extensions) ? options[:extensions] : true
 
-    phone = parse(value, specified_country(record))
-    valid = if simple_validation?
-              phone.send(validate_method)
-            else
-              (phone_types(phone) & types).size > 0
-            end
-
-    # We default to not-allowing extensions for fax numbers
-    if valid && !allowed_extensions && !phone.extension.empty?
-      valid = false
-    end
+    @phone = parse(value, specified_country(record))
+    valid = phone_valid? && valid_types? && valid_country? && valid_extensions?
 
     record.errors.add(attribute, message, options) unless valid
   end
@@ -74,8 +71,23 @@ class PhoneValidator < ActiveModel::EachValidator
     options[:message] || :invalid
   end
 
-  def validate_method
-    options[:possible] ? :possible? : :valid?
+  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)
@@ -84,24 +96,30 @@ class PhoneValidator < ActiveModel::EachValidator
   end
 
   # @private
-  def simple_validation?
-    options[:types].nil?
-  end
-
-  # @private
-  # @param phone [Phonelib::Phone] parsed phone
-  def phone_types(phone)
+  def phone_types
     method = options[:possible] ? :possible_types : :types
-    phone_types = phone.send(method)
+    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.21
+  version: 0.6.22
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database