phony_rails 0.14.4 → 0.14.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzI5ZjE3YTU1MjhiZTRiY2RjZjhhZDg0YjA0MGViZDNkNjI5OWVhYg==
-  data.tar.gz: !binary |-
-    OTc5ZGJhMTAyM2ZhNmVmNWZhODJmN2JiZWVjYzViMzNmMWUyY2NmNQ==
+SHA1:
+  metadata.gz: 6e5820adc5e9ecff0a12904b4b8622784bcc13bf
+  data.tar.gz: 276760afba65090f145ac77fdd6e8bf28a8abf20
 SHA512:
-  metadata.gz: !binary |-
-    ODRhZGZmZDVjNjkxMjJiZjc3NGE3ZjI1NWFhYTg3OWQzMTJlMDc1ZTk0YTJm
-    Y2NjYzQ0MDczZWVjODM0ZDE4MzQ5YjRlNjA5NzIwOTczNWJiOWMxNmE0MTdj
-    Yzg2NjJlMjU5YTJkNDYwMWFlOWFiMDIwMTA3MDFjNWU0Yjk2N2E=
-  data.tar.gz: !binary |-
-    ZmMxYmY5NTU0MDcxOWJkN2JiMjY1NWU3MDhiNDA0MmUxMmZmNDc3OGM0YTMy
-    YmQ2M2M4NGRjNzQ1MzE2Yzg2ODk3ZDVlMGFmZjYyYzY5ZjUzNjA3ODIyM2Fm
-    MjM3MDdjZTU1NTc0OTlhNWU4ZTY1ZWZiMGI4MDI1MDJiOGIyNGM=
+  metadata.gz: a80c625610f3956da0b2841d78f6c6faffe5b66f8b1e24e74024a3071a63f450d221b984bf2d5cd80d3d052b409b9cfe2187bb0cb3536d5d5bf2c080eb7dd133
+  data.tar.gz: 048f69f27476c6590f8ebbef288ce38937821a1b06ef7de7b496e372fa086eb81710f3d864ea662e7cde442693af6efa50f17b0edd85a7a06a1a7531aa4b7f1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.14.4)
+    phony_rails (0.14.5)
       activesupport (>= 3.0)
       phony (~> 2.15)
 

data/README.md

@@ -151,6 +151,8 @@ phony_normalize :phone_number, as: :phone_number_normalized, default_country_cod
 validates_plausible_phone :phone_number, normalized_country_code: 'US'
 ```
 
+Validation supports phone numbers with extension, such as `+18181231234 x1234` or `'+1 (818)151-5483 #4312'` out-of-the-box.
+
 #### Allowing records country codes to not match phone number country codes
 
 You may have a record specifying one country (via a `country_code` attribute) but using a phone number from another country.  For example, your record may be from Japan but have a phone number from the Philippines. By default, `phony_rails` will consider your record's `country_code` as part of the validation.  If that country doesn't match the country code in the phone number, validation will fail.

data/lib/phony_rails.rb

@@ -106,7 +106,7 @@ module PhonyRails
     false
   end
 
-  COMMON_EXTENSIONS = /[ ]*(ext|ex|x|xt|#|:)+[^0-9]*\(*([-0-9]{1,})\)*#?$/i
+  COMMON_EXTENSIONS = /[ ]*(ext|ex|x|xt|#|:)+[^0-9]*\(?([-0-9]{1,})\)?#?$/i
 
   def self.extract_extension(number_and_ext)
     return [nil, nil] if number_and_ext.nil?
@@ -199,7 +199,7 @@ end
 # check whether it is ActiveRecord or Mongoid being used
 ActiveRecord::Base.send :include, PhonyRails::Extension if defined?(ActiveRecord)
 
-ActiveModel::Model.send :include, PhonyRails::Extension if defined?(ActiveModel)
+ActiveModel::Model.send :include, PhonyRails::Extension if defined?(ActiveModel::Model)
 
 if defined?(Mongoid)
   module Mongoid::Phony

data/lib/phony_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PhonyRails
-  VERSION = '0.14.4'.freeze
+  VERSION = '0.14.5'.freeze
 end

data/lib/validators/phony_validator.rb

@@ -10,6 +10,7 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
 
     @record = record
     value = PhonyRails.normalize_number(value.dup, default_country_code: normalized_country_code) if normalized_country_code
+    value = PhonyRails.extract_extension(value).first
     @record.errors.add(attribute, error_message) unless Phony.plausible?(value, cc: country_number)
   end
 

data/spec/lib/validators/phony_validator_spec.rb

@@ -172,6 +172,8 @@ end
 
 I18n.locale = :en
 VALID_NUMBER = '1 555 555 5555'.freeze
+VALID_NUMBER_WITH_EXTENSION = '1 555 555 5555 x123'.freeze
+VALID_NUMBER_WITH_INVALID_EXTENSION = '1 555 555 5555 x1a'.freeze
 NORMALIZABLE_NUMBER = '555 555 5555'.freeze
 AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '61390133997'.freeze
 POLISH_NUMBER_WITH_COUNTRY_CODE = '48600600600'.freeze
@@ -199,12 +201,23 @@ describe PhonyPlausibleValidator do
       expect(@home).to be_valid
     end
 
+    it 'should validate a valid number with extension' do
+      @home.phone_number = VALID_NUMBER_WITH_EXTENSION
+      expect(@home).to be_valid
+    end
+
     it 'should invalidate an invalid number' do
       @home.phone_number = INVALID_NUMBER
       expect(@home).to_not be_valid
       expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
     end
 
+    it 'should invalidate an valid number with invalid extension' do
+      @home.phone_number = VALID_NUMBER_WITH_INVALID_EXTENSION
+      expect(@home).to_not be_valid
+      expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+    end
+
     it 'should invalidate not a number' do
       @home.phone_number = NOT_A_NUMBER
       expect(@home).to_not be_valid

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: This Gem adds useful methods to your Rails app to validate, display and
@@ -74,11 +74,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -117,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This Gem adds useful methods to your Rails app to validate, display and save