devise-multi_email 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f6c20540e06ef03d433a86d14ee5f7300b94146a1b9019b2c81a88edc72925
-  data.tar.gz: 3e14cce59ae14f024bba1213c11b91bf90f839cfe0c01ed4f9fcf0bbdbdd1e12
+  metadata.gz: 2565382823ed8ab4f837160c54a053df8076a441e2f197802e152932b77634f6
+  data.tar.gz: 385ae0a6a352ce1343bea96e30a26fe1d8adf4939615deaf963df87c964b1909
 SHA512:
-  metadata.gz: 3595bdad371be1ca01a2fc6563b8aaba6da01e9c8bca8cf7bec9933d5fb58a8b045cf7b2cddd3440aa7dd623cd64e1d11cc53d8bce1e874d14bed0f54cc39fdd
-  data.tar.gz: 7b75589a85f83282eacdaf95911ac75572e0bc2336fe8f1bcf46e700cab71ffdeb470d36a59c5db55ed132ee6f07449ba57d5a11d4f2efb455c749f127eeb8d3
+  metadata.gz: 5faba7eb1f3f7e04d862954f7cc40d1bf94a08ad7ccbdff2383d6419cb4d5d13f02f3cdf98876275faf3a70be39f6345215440add7cbe888818ead45d05c3855
+  data.tar.gz: 73cf0ce8bff419342f769e61f0c3c7455fec01a3733c17afb6337e7e15e798b5de244971e5dd02889ba7c60cbf7c3f53c35e45ca8bca853f0548362353093529

data/.gitignore

@@ -10,3 +10,4 @@
 /spec/rails_app/log/*
 /.ruby-version
 /.idea/
+/gemfiles/*gemfile.lock

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 2.4
   - 2.5
@@ -6,4 +7,10 @@ rvm:
 gemfile:
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_5_1.gemfile
-before_install: gem install bundler
+  - gemfiles/rails_6_0.gemfile
+
+jobs:
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_0.gemfile 
+

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Unreleased
+* Fix ActiveModel::Errors#keys deprecation in Rails 6.1
+
 ### 3.0.0 - 2019-11-06
 * Deprecate the support of Rails 4 (although it might still work)
 * Fix warnings in Rails 6

data/README.md

@@ -10,7 +10,7 @@ Letting [Devise](https://github.com/plataformatec/devise) support multiple email
 
 ## Getting Started
 
-Add this line to your application's `Gemfile`, _devise-multi_email_ has been tested with Devise 4.0 and rails 4.2:
+Add this line to your application's `Gemfile`:
 
 ```ruby
 gem 'devise-multi_email'
@@ -176,17 +176,17 @@ You can do `email.send_confirmation_instructions` for each email individually, b
 
 ## Wiki
 
-[Migrating exiting user records](https://github.com/allenwq/devise-multi_email/wiki/Migrating-existing-user-records)
+[Migrating existing user records](https://github.com/allenwq/devise-multi_email/wiki/Migrating-existing-user-records)
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+Then, run `bundle exec rake` to run the RSpec test suite. 
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/devise-multi_email. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/allenwq/devise-multi_email. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/examples/rails5_app/Gemfile.lock

@@ -43,7 +43,7 @@ GEM
     builder (3.2.3)
     byebug (9.0.6)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.5)
     debug_inspector (0.0.2)
     devise (4.7.1)
       bcrypt (~> 3.0)
@@ -72,7 +72,7 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.3.0)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -85,7 +85,7 @@ GEM
     minitest (5.12.2)
     multi_json (1.12.1)
     nio4r (2.0.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     puma (3.7.1)

data/gemfiles/{rails_4_2.gemfile → rails_6_0.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.8"
+gem "rails", ">= 6.0.2.1", "< 6.1"
 
 gemspec path: "../"

data/lib/devise/multi_email/models/confirmable.rb

@@ -48,7 +48,7 @@ module Devise
         # In case email updates are being postponed, don't change anything
         # when the postpone feature tries to switch things back
         def email=(new_email)
-          multi_email.change_primary_email_to(new_email, allow_unconfirmed: Devise.allow_unconfirmed_access_for > 0.days)
+          multi_email.change_primary_email_to(new_email, allow_unconfirmed: unconfirmed_access_possible?)
         end
 
         # This need to be forwarded to the email that the user logged in with
@@ -94,6 +94,11 @@ module Devise
 
       private
 
+        def unconfirmed_access_possible?
+          Devise.allow_unconfirmed_access_for.nil? || \
+            Devise.allow_unconfirmed_access_for > 0.days
+        end
+
         module ClassMethods
           delegate :confirm_by_token, :send_confirmation_instructions, to: 'multi_email_association.model_class', allow_nil: false
         end

data/lib/devise/multi_email/models/validatable.rb

@@ -66,7 +66,7 @@ module Devise
 
       def propagate_email_errors
         association_name = self.class.multi_email_association.name
-        email_error_key = errors.keys.detect do |key|
+        email_error_key = errors_attribute_names.detect do |key|
           [association_name.to_s, "#{association_name}.email"].include?(key.to_s)
         end
         return unless email_error_key.present?
@@ -86,6 +86,10 @@ module Devise
         end
       end
 
+      def errors_attribute_names
+        errors.respond_to?(:attribute_names) ? errors.attribute_names : errors.keys
+      end
+
       module ClassMethods
 
         # All validations used by this module.

data/lib/devise/multi_email/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module MultiEmail
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_email
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - ALLEN WANG QIANG
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -210,10 +210,9 @@ files:
 - examples/rails5_app/tmp/.keep
 - examples/rails5_app/vendor/assets/javascripts/.keep
 - examples/rails5_app/vendor/assets/stylesheets/.keep
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/devise/multi_email.rb
 - lib/devise/multi_email/association_manager.rb
 - lib/devise/multi_email/email_model_extensions.rb
@@ -243,8 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Let devise support multiple emails.

data/gemfiles/rails_5_0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.3"
-gem 'sqlite3'
-
-gemspec path: "../"