phonelib 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001c05877dbbe82f805f2e3b59d8f62bb396d0c8
-  data.tar.gz: b6cf5dacd263444fd64366b6157e20f5cad257e8
+  metadata.gz: 964115d75e8eb5754a311ab68f6ac258b2c7229d
+  data.tar.gz: 4ec38c67a691121dc9f0a4fa6a63ac285d3effc8
 SHA512:
-  metadata.gz: b2380e4f7b1049878ef189425fdd2cec0e1608ef963f0c75db1a0d3e66a85db6ead922d6bf1737c6380a6ec01c694e6fd393f0eb4c7a5807731ee420dd71ebac
-  data.tar.gz: 573732cec6ee52fa57142fef1110c0edfba82043e14c499db2863612d2f8111f270c3093ed98116c477754a92c4ab7a59d0b3b91e7beb5cbe644d9852339967c
+  metadata.gz: 96f9fb2295beb53be069d89e3b117f724c582f0477a8e4d233a623c579849b6a29bcca06f9744b80ebceb3e8111e0cb0e118e3aa98fc769585df7658247661ce
+  data.tar.gz: 4f09a4feeadd4025b72556c41e56dbcc3596fdf9302c7a01c134ac8086584c1a3f033974dd553a3f128e76f8cfdbce58ead091f96b39093a8a2dcbcae498398f

data/README.md

@@ -108,7 +108,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>country_specifier: -> phone { phone.country.try(:upcase) }</tt> - allows to specify country for validation dynamically for each validation. 
+<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
 
 ### Basic usage
 
@@ -276,4 +278,4 @@ If you want to run including Rails environment, you need to set <tt>BUNDLE_GEMFI
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-3.2.x bundle exec rake spec
 ```
 
-Gemfiles can be found in <tt>gemfiles</tt> folder, there are gemfiles for Rails 3.1, 3.2 and 4.
+Gemfiles can be found in <tt>gemfiles</tt> folder, there are gemfiles for Rails 3.1, 3.2, 4, 5 and 5.1.

data/lib/phonelib/phone.rb

@@ -147,7 +147,8 @@ module Phonelib
     # @return [Boolean] parsed phone number is valid
     def valid_for_country?(country)
       country = country.to_s.upcase
-      @data.find do |iso2, data|
+      tdata = analyze(sanitized, passed_country(country))
+      tdata.find do |iso2, data|
         country == iso2 && data[:valid].any?
       end.is_a? Array
     end

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.13'
+  VERSION = '0.6.14'
 end

data/lib/validators/phone_validator.rb

@@ -36,6 +36,14 @@
 #     validates :mobile, phone: { possible: true, types: :mobile  }
 #   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
@@ -43,6 +51,7 @@ class PhoneValidator < ActiveModel::EachValidator
   # Validation method
   def validate_each(record, attribute, value)
     return if options[:allow_blank] && value.blank?
+    options[:extensions] ||= true
 
     phone = parse(value, specified_country(record))
     valid = if simple_validation?
@@ -51,6 +60,11 @@ class PhoneValidator < ActiveModel::EachValidator
               (phone_types(phone) & types).size > 0
             end
 
+    # We default to not-allowing extensions for fax numbers
+    if valid && options[:extensions] === false && !phone.extension.empty?
+      valid = false
+    end
+
     record.errors.add(attribute, message, options) unless valid
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake