phony_rails 0.14.13 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c65b83fb1c77dccdf0b125fa2195b997067bc06efa4fff2284ab3542e643a7b3
-  data.tar.gz: '09e7d37472c4c0ccfa050f381506c11f2ec5b939c75199c26e2529b531ccfa90'
+  metadata.gz: 9f5029f29270fa190a8d6bb493268065d2abed1652c3bb63622340309018cced
+  data.tar.gz: f6f307074a3348693e6ef4bce515b81b3890ff396a35dd4ed343bcefa3476a8a
 SHA512:
-  metadata.gz: 5b35b337390b7c90d8c1a0d9ef972205089f56a04e1d4e51c59ded39acc7bfee6568fbf7d06e7a603d9091e58bfe0ef8f12f974b2170d55b704bc9d375a23846
-  data.tar.gz: a2cb0e49ce1039adb889b4e080cb5418a0c3ea88bd129edc991028e5aa0b5c6620c7fa4ab0a82316655b00d31d06eda7e9a5eb1cd824e0dc422f0e95506ae272
+  metadata.gz: 9153aa4dfd473744cd30b227d1429b0766fd27a0b58c8003aba6677e851390adc0f1b8c237d8b77e0f386c5e3c5f05958aff5a1f1f842a495b68caba5511ffe5
+  data.tar.gz: 8cc31c41aceec40c3d0ea203a1e8cec344bc9e0e5fbc407bd78456e9a4fe16b020c5b8b4895eedc3a9e19247dd8f55e41e8349283512871a0282289ea825216a

data/.rubocop.yml

@@ -1,5 +1,6 @@
 inherit_from: .rubocop_todo.yml
+require: rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Metrics/BlockLength:
   ExcludedMethods: ['describe', 'context', 'define', 'shared_examples_for']

data/.rubocop_todo.yml

@@ -13,6 +13,13 @@ Lint/AssignmentInCondition:
     - 'lib/phony_rails.rb'
 
 # Offense count: 2
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowKeywordBlockArguments.
 Lint/UnderscorePrefixedVariableName:
   Exclude:
     - 'lib/phony_rails.rb'
@@ -46,6 +53,12 @@ Performance/StartWith:
   Exclude:
     - 'lib/phony_rails.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-- 2.3.7
 - 2.4.4
 - 2.5.5
 - 2.6.2
+- 3.0.0
 script:
 - bundle exec rspec spec
 - bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v0.14.13](https://github.com/joost/phony_rails/tree/v0.14.13) (2019-07-03)
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.12...v0.14.13)
+
+**Closed issues:**
+
+- 0.4.11 was the latest release. However the new normalize\_when\_valid has been sitting here for a while... Release? [\#194](https://github.com/joost/phony_rails/issues/194)
+
+**Merged pull requests:**
+
+- Fixing \#195 - Original value should be cached in correct instance var [\#196](https://github.com/joost/phony_rails/pull/196) ([dlikhten](https://github.com/dlikhten))
+
 ## [v0.14.12](https://github.com/joost/phony_rails/tree/v0.14.12) (2019-06-21)
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.11...v0.14.12)
 

data/Gemfile

@@ -11,3 +11,4 @@ gem 'guard-rspec' # ,    '~> 4.2.0'
 gem 'rake'
 gem 'rspec' # ,          '~> 2.14.0'
 gem 'rubocop'
+gem 'rubocop-performance'

data/README.md

@@ -7,10 +7,10 @@ Find version information in the [CHANGELOG](CHANGELOG.md).
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's Gemfile (requires Ruby > 2.3):
 
 ```ruby
-gem 'phony_rails' # Include phony_rails after mongoid (if you use mongoid, see issue #66 on github).
+gem 'phony_rails'
 ```
 
 And then execute:
@@ -66,18 +66,10 @@ class SomeModel
 end
 ```
 
-#### Mongoid
+#### Mongoid (DEPRECATED)
 
-For **Mongoid**, in keeping with Mongoid plug-in conventions you must include the `Mongoid::Phony` module:
+WARNING: From v0.15.0 Mongoid support has been removed!
 
-```ruby
-class SomeModel
-  include Mongoid::Document
-  include Mongoid::Phony
-
-  # methods are same as ActiveRecord usage
-end
-```
 #### General info
 
 The `:default_country_code` options is used to specify a country_code when normalizing.
@@ -114,6 +106,7 @@ In your model use the Phony.plausible method to validate an attribute:
 ```ruby
 validates :phone_number, phony_plausible: true
 ```
+
 or the helper method:
 
 ```ruby
@@ -121,8 +114,9 @@ validates_plausible_phone :phone_number
 ```
 
 this method use other validators under the hood to provide:
-* presence validation using `ActiveModel::Validations::PresenceValidator`
-* format validation using `ActiveModel::Validations::FormatValidator`
+
+- presence validation using `ActiveModel::Validations::PresenceValidator`
+- format validation using `ActiveModel::Validations::FormatValidator`
 
 so we can use:
 
@@ -174,11 +168,11 @@ When number is valid, it will save the normalized number (e.g. `+48 888 888 888`
 
 #### 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.
+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.
 
 Additionally, `phony_normalize` will always add the records country code as the country number (eg. the user enters '+81xxx' for Japan and the records `country_code` is 'DE' then `phony_normalize` will change the number to '+4981'). You can turn this off by adding `enforce_record_country: false` to the validation options. The country_code will then only be added if no country code is specified.
 
-If you want to allow records from one country to have phone numbers from a different one, there are a couple of options you can use: `ignore_record_country_number` and `ignore_record_country_code`.  Use them like so:
+If you want to allow records from one country to have phone numbers from a different one, there are a couple of options you can use: `ignore_record_country_number` and `ignore_record_country_code`. Use them like so:
 
 ```ruby
 validates :phone_number, phony_plausible: { ignore_record_country_code: true, ignore_record_country_number: true }
@@ -232,7 +226,6 @@ Extensions are supported (identified by "ext", "ex", "x", "xt", "#", or ":") and
 "+31 (0)30 1234 123 #999".phony_normalized # => '31301234123 x999'
 ```
 
-
 ### Find by normalized number
 
 Say you want to find a record by a phone number. Best is to normalize user input and compare to an attribute stored in the db.

data/lib/phony_rails.rb

@@ -50,7 +50,7 @@ module PhonyRails
     original_number = number
     number = number.dup # Just to be sure, we don't want to change the original.
     number, ext = extract_extension(number)
-    number.gsub!(/[^\(\)\d\+]/, '') # Strips weird stuff from the number
+    number.gsub!(/[^()\d+]/, '') # Strips weird stuff from the number
     return if number.blank?
 
     if _country_number = options[:country_number] || country_number_for(options[:country_code])
@@ -67,8 +67,7 @@ module PhonyRails
     normalized_number = options[:add_plus] ? "+#{normalized_number}" : normalized_number
 
     options[:extension] = true if options[:extension].nil?
-    normalized_number = options[:extension] ? format_extension(normalized_number, ext) : normalized_number
-    normalized_number
+    options[:extension] ? format_extension(normalized_number, ext) : normalized_number
   rescue StandardError
     original_number # If all goes wrong .. we still return the original input.
   end
@@ -129,7 +128,7 @@ module PhonyRails
     false
   end
 
-  COMMON_EXTENSIONS = /[ ]*(ext|ex|x|xt|#|:)+[^0-9]*\(?([-0-9]{1,})\)?#?$/i.freeze
+  COMMON_EXTENSIONS = / *(ext|ex|x|xt|#|:)+[^0-9]*\(?([-0-9]{1,})\)?#?$/i.freeze
 
   def self.extract_extension(number_and_ext)
     return [nil, nil] if number_and_ext.nil?
@@ -203,9 +202,7 @@ module PhonyRails
       def phony_normalize(*attributes)
         options = attributes.last.is_a?(Hash) ? attributes.pop : {}
         options.assert_valid_keys(*PHONY_RAILS_COLLECTION_VALID_KEYS)
-        if options[:as].present?
-          raise ArgumentError, ':as option can not be used on phony_normalize with multiple attribute names! (PhonyRails)' if attributes.size > 1
-        end
+        raise ArgumentError, ':as option can not be used on phony_normalize with multiple attribute names! (PhonyRails)' if options[:as].present? && (attributes.size > 1)
 
         options[:enforce_record_country] = true if options[:enforce_record_country].nil?
 
@@ -278,12 +275,12 @@ end
 
 ActiveModel::Model.send :include, PhonyRails::Extension if defined?(ActiveModel::Model)
 
-if defined?(Mongoid)
-  module Mongoid::Phony
-    extend ActiveSupport::Concern
-    include PhonyRails::Extension
-  end
-end
+# if defined?(Mongoid)
+#   module Mongoid::Phony
+#     extend ActiveSupport::Concern
+#     include PhonyRails::Extension
+#   end
+# end
 
 Dir["#{File.dirname(__FILE__)}/phony_rails/locales/*.yml"].each do |file|
   I18n.load_path << file

data/lib/phony_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhonyRails
-  VERSION = '0.14.13'
+  VERSION = '0.15.0'
 end

data/phony_rails.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.name          = 'phony_rails'
   gem.require_paths = ['lib']
   gem.version       = PhonyRails::VERSION
+  gem.required_ruby_version = '>= 2.4'
 
   gem.post_install_message = "PhonyRails v0.10.0 changes the way numbers are stored!\nIt now adds a ' + ' to the normalized number when it starts with a country number!"
 
   gem.add_runtime_dependency 'activesupport', '>= 3.0'
-  gem.add_runtime_dependency 'phony', '> 2.15'
+  gem.add_runtime_dependency 'phony', '>= 2.18.12'
   gem.add_development_dependency 'activerecord', '>= 3.0'
-  gem.add_development_dependency 'mongoid', '>= 3.0'
 
   # For testing
-  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
+  gem.add_development_dependency 'sqlite3', '>= 1.4.0'
 end

data/spec/lib/phony_rails_spec.rb

@@ -2,9 +2,8 @@
 
 require 'spec_helper'
 
+EXT_PREFIXES = %w[ext ex x xt # :].freeze
 describe PhonyRails do
-  EXT_PREFIXES = %w[ext ex x xt # :].freeze
-
   it 'should not pollute the global namespace with a Country class' do
     should_not be_const_defined 'Country'
   end
@@ -200,17 +199,20 @@ describe PhonyRails do
             end
           end
 
+          # rubocop:disable Lint/ConstantDefinitionInBlock
           class NormalHome < ActiveRecord::Base
             attr_accessor :phone_number
+
             phony_normalize :phone_number, default_country_code: 'US'
             validates :phone_number, phony_plausible: true
           end
+          # rubocop:enable Lint/ConstantDefinitionInBlock
 
           normal = NormalHome.new
           normal.phone_number = 'HAHA'
           expect(normal).to_not be_valid
           expect(normal.phone_number).to eq('HAHA')
-          expect(normal.errors.messages).to include(phone_number: ['is an invalid number'])
+          expect(normal.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
         end
 
         it 'should pass Github issue #170' do
@@ -510,7 +512,7 @@ describe PhonyRails do
     after { PhonyRails.default_country_code = nil }
 
     it 'can set a global default country code' do
-      expect(PhonyRails.default_country_code). to eq 'US'
+      expect(PhonyRails.default_country_code).to eq 'US'
     end
 
     it 'can set a global default country code' do
@@ -923,9 +925,9 @@ describe PhonyRails do
     end
   end
 
-  describe 'Mongoid' do
-    let(:model_klass) { MongoidModel }
-    let(:dummy_klass) { MongoidDummy }
-    it_behaves_like 'model with PhonyRails'
-  end
+  # describe 'Mongoid' do
+  #   let(:model_klass) { MongoidModel }
+  #   let(:dummy_klass) { MongoidDummy }
+  #   it_behaves_like 'model with PhonyRails'
+  # end
 end

data/spec/lib/validators/phony_validator_spec.rb

@@ -69,66 +69,77 @@ end
 #--------------------
 class SimpleHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates :phone_number, phony_plausible: true
 end
 
 #--------------------
 class HelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number
 end
 
 #--------------------
 class RequiredHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, presence: true
 end
 
 #--------------------
 class OptionalHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, presence: false
 end
 
 #--------------------
 class FormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, with: /\A\+\d+/
 end
 
 #--------------------
 class NotFormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, without: /\A\+\d+/
 end
 
 #--------------------
 class NormalizableHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, normalized_country_code: 'US'
 end
 
 #--------------------
 class AustralianHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, country_number: '61'
 end
 
 #--------------------
 class PolishHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, country_code: 'PL'
 end
 
 #--------------------
 class BigHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, presence: true, with: /\A\+\d+/, country_number: '33'
 end
 
 #--------------------
 class MismatchedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :country_code
+
   validates :phone_number, phony_plausible: { ignore_record_country_code: true }
 end
 
@@ -136,6 +147,7 @@ end
 
 class InvalidCountryCodeHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number
 
   def country_code
@@ -146,33 +158,39 @@ end
 #--------------------
 class SymbolizableHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :phone_number_country_code
+
   validates_plausible_phone :phone_number, country_code: :phone_number_country_code
 end
 
 #--------------------
 class NoModelMethod < HelpfulHome
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, country_code: :nonexistent_method
 end
 
 #--------------------
 class MessageOptionUndefinedInModel < HelpfulHome
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, message: :email
 end
 
 #--------------------
 class MessageOptionSameAsModelMethod < HelpfulHome
   attr_accessor :phone_number
+
   validates_plausible_phone :phone_number, message: :email
 
   def email
     'user@example.com'
   end
 end
+
 #--------------------
 class NormalizabledPhoneHome < ActiveRecord::Base
   attr_accessor :phone_number, :phone_number2, :country_code
+
   validates_plausible_phone :phone_number
   validates_plausible_phone :phone_number2
   phony_normalize :phone_number, country_code: 'PL', normalize_when_valid: true
@@ -223,26 +241,26 @@ describe PhonyPlausibleValidator do
     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'])
+      expect(@home.errors.messages.to_hash).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'])
+      expect(@home.errors.messages.to_hash).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
-      expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+      expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
     end
 
     it 'should translate the error message in Dutch' do
       I18n.with_locale(:nl) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['is geen geldig nummer'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is geen geldig nummer'])
       end
     end
 
@@ -250,7 +268,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:en) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -258,7 +276,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:es) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['es un número inválido'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['es un número inválido'])
       end
     end
 
@@ -266,7 +284,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:fr) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['est un numéro invalide'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['est un numéro invalide'])
       end
     end
 
@@ -274,7 +292,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:ja) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['は正しい電話番号ではありません'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['は正しい電話番号ではありません'])
       end
     end
 
@@ -282,7 +300,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:km) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['គឺជាលេខមិនត្រឹមត្រូវ'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['គឺជាលេខមិនត្រឹមត្រូវ'])
       end
     end
 
@@ -290,7 +308,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:ko) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['는 올바른 전화번호가 아닙니다'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['는 올바른 전화번호가 아닙니다'])
       end
     end
 
@@ -298,7 +316,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:uk) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['є недійсним номером'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['є недійсним номером'])
       end
     end
 
@@ -306,7 +324,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:ru) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ['является недействительным номером'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['является недействительным номером'])
       end
     end
   end
@@ -334,7 +352,7 @@ describe ActiveModel::Validations::HelperMethods do
       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'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -346,7 +364,7 @@ describe ActiveModel::Validations::HelperMethods do
 
       it 'should invalidate an empty number' do
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["can't be blank"])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ["can't be blank"])
       end
 
       it 'should validate a valid number' do
@@ -357,7 +375,7 @@ describe ActiveModel::Validations::HelperMethods do
       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'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -385,7 +403,7 @@ describe ActiveModel::Validations::HelperMethods do
       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'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -397,7 +415,7 @@ describe ActiveModel::Validations::HelperMethods do
 
       it 'should invalidate an empty number' do
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is invalid'])
       end
 
       it 'should validate a well formatted valid number' do
@@ -408,7 +426,7 @@ describe ActiveModel::Validations::HelperMethods do
       it 'should invalidate a bad formatted valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is invalid'])
       end
     end
 
@@ -430,7 +448,7 @@ describe ActiveModel::Validations::HelperMethods do
       it 'should invalidate a bad formatted valid number' do
         @home.phone_number =  "+#{VALID_NUMBER}"
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is invalid'])
       end
     end
 
@@ -452,13 +470,13 @@ describe ActiveModel::Validations::HelperMethods do
       it 'should invalidate a valid number with the wrong country code' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
 
       it 'should invalidate a valid number without a country code' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -485,7 +503,7 @@ describe ActiveModel::Validations::HelperMethods do
       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'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -507,13 +525,13 @@ describe ActiveModel::Validations::HelperMethods do
       it 'should invalidate a valid number with the wrong country code' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
 
       it 'should invalidate a valid number without a country code' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
     end
 
@@ -606,14 +624,14 @@ describe ActiveModel::Validations::HelperMethods do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         @home.phone_number_country_code = 'PL'
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
 
       it 'should invalidate a valid number without a country code' do
         @home.phone_number = VALID_NUMBER
         @home.phone_number_country_code = 'PL'
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
+        expect(@home.errors.messages.to_hash).to include(phone_number: ['is an invalid number'])
       end
 
       it 'should pass Gitlab issue #165' do

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'active_record'
-require 'mongoid'
+# require 'mongoid'
 require 'phony_rails'
 
 ActiveRecord::Base.establish_connection(
@@ -35,6 +35,7 @@ module SharedModelMethods
       :country_code, :country_code_attribute, :custom_country_code, :delivery_method,
       :home_country, :phone_method, :phone1_method, :recipient, :symboled_phone_method
     )
+
     phony_normalized_method :phone_attribute # adds normalized_phone_attribute method
     phony_normalized_method :phone_method # adds normalized_phone_method method
     phony_normalized_method :phone1_method, default_country_code: 'DE' # adds normalized_phone_method method
@@ -80,20 +81,20 @@ end
 class ActiveModelDummy < ActiveModelModel
 end
 
-class MongoidModel
-  include Mongoid::Document
-  include Mongoid::Phony
-  field :phone_attribute, type: String
-  field :phone_number,    type: String
-  field :phone_number_as_normalized, type: String
-  field :fax_number
-  field :country_code_attribute, type: String
-  field :symboled_phone, type: String
-  include SharedModelMethods
-end
+# class MongoidModel
+#   include Mongoid::Document
+#   include Mongoid::Phony
+#   field :phone_attribute, type: String
+#   field :phone_number,    type: String
+#   field :phone_number_as_normalized, type: String
+#   field :fax_number
+#   field :country_code_attribute, type: String
+#   field :symboled_phone, type: String
+#   include SharedModelMethods
+# end
 
-class MongoidDummy < MongoidModel
-end
+# class MongoidDummy < MongoidModel
+# end
 
 I18n.config.enforce_available_locales = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.13
+  version: 0.15.0
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: phony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 2.18.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 2.18.12
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.0
 description: This Gem adds useful methods to your Rails app to validate, display and
   save phone numbers.
 email:
@@ -135,15 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This Gem adds useful methods to your Rails app to validate, display and save