phonelib 0.10.26 → 0.10.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e167c9f5d91a48e5bd9b336f41f95da24b5d147b2a2c5fc22ce9c860e7c105e7
-  data.tar.gz: db640f3955e5c5d4fd907bb25d3c4fa1c0bbb783a5245a5515366e4721e01994
+  metadata.gz: f83c41ac447eda86a265db83bf280bac4a0dcb63c047709c87ed595befedfd6f
+  data.tar.gz: f35bd84877a5999e637f74b037ce2e27b9219cde1a947ef5934266894edafd02
 SHA512:
-  metadata.gz: 81acdf0374d5fb09daa882cb27ec95f79f39bab2ea8539c67f55aca156eb2516ddaa29d6757cc38ce8860feef5aa74654be96cbdc1c83cc000002495195250e8
-  data.tar.gz: 7080901f2d6d0a235f76fc9f1094775190f32e7036b336e1c719f5b2fc1b8412c66d9edea4fa357863a04f916d5c86b20489b2ab36cd3c9b1d2ea35677784fcb
+  metadata.gz: f7bd1ea50bbd2a2b7c51999c7d79e95e2ca68642883e3909babd92508471b3d4dad68499e74b0aac30bcf8d97df1e9111e241e9746041a469e311e76dea4b6d8
+  data.tar.gz: '0593f5cf2fabf0109b59a788757fd8eb81a6860ffb73519ba24303f4d19c30bfc6a7830ee3d264a82f12468652e5a05abc43f8aaf8d1513f911578c385ef7ef1'

data/README.md

@@ -154,13 +154,6 @@ if mixed with <tt>possible</tt> will check if number is possible for specified c
 
 <tt>extensions: false</tt> - set to perform check for phone extension to be blank
 
-<<<<<<< HEAD
-<tt>require_international_prefix: true</tt> - requires the original value to use <tt>+</tt> or <tt>00</tt> as its explicit international marker. The marker may follow leading formatting characters recognized by the parser. This option does not change the parser or the formatted output.
-
-<tt>format: :e164</tt> - requires the original value to match Phonelib's canonical <tt>+</tt>-prefixed E.164 representation: 2 to 15 total ASCII digits, beginning with 1-9, with no spaces, punctuation, or extension. Unsupported formats raise an <tt>ArgumentError</tt> when the validator is configured.
-
-||||||| ec5e850
-=======
 <tt>require_international_prefix: true</tt> - requires the original value to use <tt>+</tt> or <tt>00</tt> as its explicit international marker. The marker may follow leading formatting characters recognized by the parser. This option does not change the parser or the formatted output.
 
 <tt>format: :e164</tt> - requires the original value to match Phonelib's canonical <tt>+</tt>-prefixed E.164 representation: 2 to 15 total ASCII digits, beginning with 1-9, with no spaces, punctuation, or extension. Unsupported formats raise an <tt>ArgumentError</tt> when the validator is configured.
@@ -206,7 +199,6 @@ es:
       phone_invalid: "no es un número telefónico válido"
 ```
 
->>>>>>> salasebas-salasebas/structured-validation-errors
 ### Basic usage
 
 To check if phone number is valid simply run:

data/lib/phonelib/version.rb

@@ -2,5 +2,5 @@
 
 module Phonelib
   # @private
-  VERSION = '0.10.26'
+  VERSION = '0.10.27'
 end

data/lib/validators/phone_validator.rb

@@ -96,7 +96,8 @@ class PhoneValidator < ActiveModel::EachValidator
     end
 
     valid = phone_valid?(phone) && valid_types?(phone) && valid_country?(phone) &&
-            valid_extensions?(phone) && valid_input_format?(value)
+            valid_extensions?(phone) && valid_international_prefix?(phone) &&
+            valid_input_format?(value)
     record.errors.add(attribute, message, **legacy_error_options) unless valid
   end
 
@@ -174,10 +175,10 @@ class PhoneValidator < ActiveModel::EachValidator
     !options.has_key?(:extensions) || !!options[:extensions]
   end
 
-  def valid_international_prefix?
+  def valid_international_prefix?(phone)
     return true unless options[:require_international_prefix]
 
-    @phone.explicit_international_prefix?
+    phone.explicit_international_prefix?
   end
 
   def valid_input_format?(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.10.26
+  version: 0.10.27
 platform: ruby
 authors:
 - Vadim Senderovich
@@ -46,7 +46,7 @@ homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.26
+  changelog_uri: https://github.com/daddyz/phonelib/releases/tag/v0.10.27
 post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"