devise-multi_email 2.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae0a4824abdf90e63b3a5027520c2d4ef6465e31
-  data.tar.gz: ae37353431e7e16eb565a0ba27c814020f644f3e
+SHA256:
+  metadata.gz: 2565382823ed8ab4f837160c54a053df8076a441e2f197802e152932b77634f6
+  data.tar.gz: 385ae0a6a352ce1343bea96e30a26fe1d8adf4939615deaf963df87c964b1909
 SHA512:
-  metadata.gz: 232a734290ad0eab39000b8ecb76a3c6fc320ece267fdd43a52a1dadf726ee50cd97dae4c712de750a757ca48bbf72e9b7d6fc59b3e138b32414ee6b9d915e06
-  data.tar.gz: 658d6b2220f1eaf9ca811d4df1b669a938cb7a2911c803abc5546eec9def051756511228eff406b282d7e088084fd8610b7950b88f6d71f2ded2876a187e59f2
+  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,8 +1,16 @@
 language: ruby
+
 rvm:
-  - 2.3.1
-  - 2.4.1
+  - 2.4
+  - 2.5
+  - 2.6
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_4_2.gemfile
-before_install: gem install bundler -v 1.10.6
+  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_6_0.gemfile
+
+jobs:
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_0.gemfile 
+

data/CHANGELOG.md

@@ -1,8 +1,20 @@
+### 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
+
+### 2.0.1 - 2017-05-16
+
+* Refactored to simplify some logic and start moving toward mimicking default Devise lifecycle behavior
+* Added `Devise::MultiEmail.only_login_with_primary_email` option to restrict login to only primary emails
+* Added `Devise::MultiEmail.autosave_emails` option to automatically enable `autosave` on "emails" association
+
 ### 2.0.0 - 2017-05-12
 
-* New `Devise::MultiEmail#configure` setup with options for `user` and `emails` associations and `primary_email` method names
+* New `Devise::MultiEmail#configure` setup with options for `user` and `emails` associations and `primary_email_record` method names
 * Refactor to expose `_multi_email_*` prefixed methods on models
-* New `primary_email` method to get primary email record (however, can be configured as `primary_email_record` for backwards-compatibility)
 * Changed logic when changing an email address to look up existing email record, otherwise creating a new one, then marking it "primary"
 * Changed logic when changing an email address to mark all others as `primary = false`
 * Changed logic when changing an email address to `nil` to mark as `primary = false` rather than deleting records

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'
@@ -49,6 +49,31 @@ create_table :emails do |t|
  end
 ```
 
+You can choose whether or not users can login with an email address that is not the primary email address.
+
+```ruby
+Devise::MultiEmail.configure do |config|
+  # Default is `false`
+  config.only_login_with_primary_email = true
+end
+```
+
+The `autosave` is automatically enabled on the `emails` association by default. This is to ensure the `primary`
+flag is persisted for all emails when the primary email is changed. When `autosave` is not enabled on the association,
+only new emails are saved when the parent (e.g. `User`) record is saved. (Updates to already-persisted email records
+are not saved.)
+
+If you don't want `autosave` to be enabled automatically, you can disable this feature. What this will do is
+enable alternative behavior, which adds an `after_save` callback to the parent record and calls `email.save` on each email
+record where the `primary` value has changed.
+
+```ruby
+Devise::MultiEmail.configure do |config|
+  # Default is `true`
+  config.autosave_emails = false
+end
+```
+
 ### Configure custom association names
 
 You may not want to use the association `user.emails` or `email.users`. You can customize the name of the associations used. Add your custom configurations to an initializer file such as `config/initializers/devise-multi_email.rb`.
@@ -61,9 +86,8 @@ Devise::MultiEmail.configure do |config|
   config.parent_association_name = :team
   # Default is :emails for parent (e.g. User) model
   config.emails_association_name = :email_addresses
-  # For backwards-compatibility, specify :primary_email_record
-  # Default is :primary_email
-  config.primary_email_method_name = :primary_email_record
+  # Default is :primary_email_record
+  config.primary_email_method_name = :primary_email
 end
 
 # Example use of custom association names
@@ -152,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/devise-multi_email.gemspec

@@ -6,8 +6,8 @@ require 'devise/multi_email/version'
 Gem::Specification.new do |spec|
   spec.name          = 'devise-multi_email'
   spec.version       = Devise::MultiEmail::VERSION
-  spec.authors       = ['ALLEN WANG QIANG']
-  spec.email         = ['rovingbreeze@gmail.com']
+  spec.authors       = ['ALLEN WANG QIANG', 'Joel Van Horn']
+  spec.email         = ['rovingbreeze@gmail.com', 'joel@joelvanhorn.com']
 
   spec.summary       = %q{Let devise support multiple emails.}
   spec.description   = %q{Devise authenticatable, confirmable and validatable with multiple emails.}
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'devise'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'

data/examples/rails5_app/Gemfile.lock

@@ -39,15 +39,16 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    bcrypt (3.1.11)
+    bcrypt (3.1.13)
     builder (3.2.3)
     byebug (9.0.6)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
     debug_inspector (0.0.2)
-    devise (4.2.0)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
@@ -56,10 +57,11 @@ GEM
       devise
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.9.18)
+    ffi (1.11.1)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    i18n (0.8.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jbuilder (2.6.3)
       activesupport (>= 3.0.0, < 5.2)
       multi_json (~> 1.2)
@@ -70,23 +72,24 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.0.3)
+    loofah (2.3.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
+    method_source (0.9.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
     multi_json (1.12.1)
     nio4r (2.0.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.10.5)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     puma (3.7.1)
-    rack (2.0.1)
+    rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.2)
@@ -101,23 +104,24 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (5.0.2)
       actionpack (= 5.0.2)
       activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (13.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
     sass (3.4.23)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -130,7 +134,7 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -138,18 +142,18 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.6)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.1.4)
       execjs (>= 0.3.0, < 3)
-    warden (1.2.7)
-      rack (>= 1.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
     web-console (3.4.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)

data/examples/rails5_app/app/models/email.rb

@@ -1,3 +1,5 @@
 class Email < ApplicationRecord
   belongs_to :user
+
+  table_name 'user_emails'
 end

data/examples/rails5_app/db/migrate/20170307140813_devise_create_users.rb

@@ -30,7 +30,7 @@ class DeviseCreateUsers < ActiveRecord::Migration[5.0]
     add_index :users, :reset_password_token, unique: true
     # add_index :users, :unlock_token,         unique: true
 
-    create_table :emails do |t|
+    create_table :user_emails do |t|
       t.integer :user_id, null: false
       t.string :email, null: false
       t.string :unconfirmed_email
@@ -44,6 +44,6 @@ class DeviseCreateUsers < ActiveRecord::Migration[5.0]
       t.timestamps null: false
     end
 
-    add_index :emails, :confirmation_token, unique: true
+    add_index :user_emails, :confirmation_token, unique: true
   end
 end

data/examples/rails5_app/db/schema.rb

@@ -12,7 +12,7 @@
 
 ActiveRecord::Schema.define(version: 20170307145547) do
 
-  create_table "emails", force: :cascade do |t|
+  create_table "user_emails", force: :cascade do |t|
     t.integer  "user_id",                              null: false
     t.string   "email",                                null: false
     t.string   "unconfirmed_email"

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

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

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

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

data/lib/devise/multi_email/association_manager.rb

@@ -14,16 +14,29 @@ module Devise
         model_class.__send__ :include, mod
       end
 
-      def model_class
-        unless reflection
-          raise "#{@klass}##{name} association not found: It might be because your declaration is after `devise :multi_email_confirmable`."
+      # Specify a block with alternative behavior which should be
+      # run when `autosave` is not enabled.
+      def configure_autosave!(&block)
+        unless autosave_enabled?
+          if Devise::MultiEmail.autosave_emails?
+            reflection.autosave = true
+          else
+            yield if block_given?
+          end
         end
+      end
 
+      def autosave_enabled?
+        reflection.options[:autosave] == true
+      end
+
+      def model_class
         @model_class ||= reflection.class_name.constantize
       end
 
       def reflection
-        @reflection ||= @klass.reflect_on_association(name)
+        @reflection ||= @klass.reflect_on_association(name) ||
+                        raise("#{@klass}##{name} association not found: It might be because your declaration is after `devise :multi_email_confirmable`.")
       end
     end
   end

data/lib/devise/multi_email/email_model_manager.rb

@@ -4,14 +4,12 @@ module Devise
   module MultiEmail
     class EmailModelManager
 
-      attr_reader :record
-
-      def initialize(record)
-        @record = record
+      def initialize(email_record)
+        @email_record = email_record
       end
 
       def parent
-        record.__send__(record.class.multi_email_association.name)
+        @email_record.__send__(@email_record.class.multi_email_association.name)
       end
     end
   end

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

@@ -29,6 +29,7 @@ module Devise
         extend ActiveSupport::Concern
 
         included do
+          multi_email_association.configure_autosave!{ include AuthenticatableAutosaveExtensions }
           multi_email_association.include_module(EmailAuthenticatable)
         end
 
@@ -36,26 +37,40 @@ module Devise
 
         # Gets the primary email address of the user.
         def email
-          multi_email.primary_email.try(:email)
+          multi_email.primary_email_record.try(:email)
         end
 
         # Sets the default email address of the user.
         def email=(new_email)
-          multi_email.change_primary_email_to(new_email)
+          multi_email.change_primary_email_to(new_email, allow_unconfirmed: true)
+        end
+      end
+
+      module AuthenticatableAutosaveExtensions
+        extend ActiveSupport::Concern
+
+        included do
+          # Toggle `primary` value for all emails if `autosave` is not on
+          after_save do
+            multi_email.filtered_emails.each do |email|
+              # update value in database without persisting any other changes
+              email.save if email.changes.key?(:primary)
+            end
+          end
         end
       end
 
       module ClassMethods
         def find_first_by_auth_conditions(tainted_conditions, opts = {})
           filtered_conditions = devise_parameter_filter.filter(tainted_conditions.dup)
-          email = filtered_conditions.delete(:email)
+          criteria = filtered_conditions.extract!(:email, :unconfirmed_email)
 
-          if email && email.is_a?(String)
+          if criteria.keys.any?
             conditions = filtered_conditions.to_h.merge(opts).
-              reverse_merge(multi_email_association.reflection.table_name => { email: email })
+              reverse_merge(build_conditions(criteria))
 
             resource = joins(multi_email_association.name).find_by(conditions)
-            resource.current_login_email = email if resource.respond_to?(:current_login_email=)
+            resource.current_login_email = criteria.values.first if resource
             resource
           else
             super(tainted_conditions, opts)
@@ -63,7 +78,17 @@ module Devise
         end
 
         def find_by_email(email)
-          joins(multi_email_association.name).where(multi_email_association.reflection.table_name => { email: email.downcase }).first
+          joins(multi_email_association.name).where(build_conditions email: email).first
+        end
+
+        def build_conditions(criteria)
+          criteria = devise_parameter_filter.filter(criteria)
+          # match the primary email record if the `unconfirmed_email` column is specified
+          if Devise::MultiEmail.only_login_with_primary_email? || criteria[:unconfirmed_email]
+            criteria.merge!(primary: true)
+          end
+
+          { multi_email_association.reflection.table_name.to_sym => criteria }
         end
       end
     end

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

@@ -8,12 +8,12 @@ module Devise
       included do
         devise :confirmable
 
-        extend ClassReplacementMethods
+        include ConfirmableExtensions
       end
 
-      module ClassReplacementMethods
-        def allow_unconfirmed_access_for
-          0.days
+      module ConfirmableExtensions
+        def confirmation_period_valid?
+          primary? ? super : false
         end
       end
     end
@@ -42,12 +42,18 @@ module Devise
 
         # delegate before creating overriding methods
         delegate :skip_confirmation!, :skip_confirmation_notification!, :skip_reconfirmation!, :confirmation_required?,
-                 :confirmation_token, :confirmed_at, :confirmation_sent_at, :confirm, :confirmed?, :unconfirmed_email,
-                 :reconfirmation_required?, :pending_reconfirmation?, to: :primary_email_record, allow_nil: true
+                 :confirmation_token, :confirmed_at, :confirmed_at=, :confirmation_sent_at, :confirm, :confirmed?, :unconfirmed_email,
+                 :reconfirmation_required?, :pending_reconfirmation?, to: Devise::MultiEmail.primary_email_method_name, allow_nil: true
+
+        # 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: unconfirmed_access_possible?)
+        end
 
         # This need to be forwarded to the email that the user logged in with
         def active_for_authentication?
-          login_email = current_login_email_record
+          login_email = multi_email.login_email_record
 
           if login_email && !login_email.primary?
             super && login_email.active_for_authentication?
@@ -58,7 +64,7 @@ module Devise
 
         # Shows email not confirmed instead of account inactive when the email that user used to login is not confirmed
         def inactive_message
-          login_email = current_login_email_record
+          login_email = multi_email.login_email_record
 
           if login_email && !login_email.primary? && !login_email.confirmed?
             :unconfirmed
@@ -88,10 +94,9 @@ module Devise
 
       private
 
-        def current_login_email_record
-          if respond_to?(:current_login_email) && current_login_email
-            multi_email.emails.find_by(email: current_login_email)
-          end
+        def unconfirmed_access_possible?
+          Devise.allow_unconfirmed_access_for.nil? || \
+            Devise.allow_unconfirmed_access_for > 0.days
         end
 
         module ClassMethods

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

@@ -7,8 +7,13 @@ module Devise
 
       included do
         validates_presence_of   :email, if: :email_required?
-        validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-        validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+        if Devise.activerecord51?
+          validates_uniqueness_of :email, allow_blank: true, case_sensitive: true, if: :will_save_change_to_email?
+          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :will_save_change_to_email?
+        else
+          validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
+          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+        end
       end
 
       def email_required?
@@ -60,19 +65,31 @@ module Devise
     private
 
       def propagate_email_errors
-        email_error_key = self.class.multi_email_association.name
-
-        if respond_to?("#{email_error_key}_attributes=")
-          email_error_key = "#{email_error_key}.email".to_sym
+        association_name = self.class.multi_email_association.name
+        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?
+
+        email_errors =
+          if errors.respond_to?(:details)
+            errors
+              .details[email_error_key]
+              .map { |e| e[:error] }
+              .zip(errors.delete(email_error_key) || [])
+          else
+            errors.delete(email_error_key)
+          end
 
-        email_errors = errors.delete(email_error_key) || []
-
-        email_errors.each do |error|
-          errors.add(:email, error)
+        email_errors.each do |type, message|
+          errors.add(:email, type, message: message)
         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.
@@ -80,7 +97,7 @@ module Devise
                        :validates_confirmation_of, :validates_length_of].freeze
 
         def assert_validations_api!(base) #:nodoc:
-          unavailable_validations = VALIDATIONS.select{ |v| !base.respond_to?(v) }
+          unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
 
           unless unavailable_validations.empty?
             raise "Could not use :validatable module since #{base} does not respond " <<

data/lib/devise/multi_email/parent_model_extensions.rb

@@ -8,9 +8,10 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
+        multi_email_association.configure_autosave!
         multi_email_association.include_module(EmailModelExtensions)
       end
-      
+
       delegate Devise::MultiEmail.primary_email_method_name, to: :multi_email, allow_nil: false
 
       def multi_email

data/lib/devise/multi_email/parent_model_manager.rb

@@ -4,51 +4,86 @@ module Devise
   module MultiEmail
     class ParentModelManager
 
-      attr_reader :record
+      def initialize(parent_record)
+        @parent_record = parent_record
+      end
 
-      def initialize(record)
-        @record = record
+      def current_email_record
+        login_email_record || primary_email_record
       end
 
-      # Gets the email records that have not been deleted
-      def filtered_emails
-        emails.reject(&:destroyed?).reject(&:marked_for_destruction?)
+      def login_email_record
+        if @parent_record.current_login_email.present?
+          formatted_email = format_email(@parent_record.current_login_email)
+          filtered_emails.find { |item| item.email == formatted_email }
+        end
       end
 
       # Gets the primary email record.
-      def primary_email
+      def primary_email_record
         filtered_emails.find(&:primary?)
       end
-      alias_method Devise::MultiEmail.primary_email_method_name, :primary_email
-
-      def change_primary_email_to(new_email)
-        # Use Devise formatting settings for emails
-        formatted_email = record.class.send(:devise_parameter_filter).filter(email: new_email)[:email]
-
-        valid_emails = filtered_emails
+      alias_method Devise::MultiEmail.primary_email_method_name, :primary_email_record
 
+      # :allow_unconfirmed option sets this email record to primary
+      # :skip_confirmations option confirms this email record (without saving)
+      # @see `set_primary_record_to`
+      def change_primary_email_to(new_email, options = {})
         # mark none as primary when set to nil
         if new_email.nil?
-          valid_emails.each{ |record| record.primary = false }
+          filtered_emails.each { |item| item.primary = false }
 
         # select or build an email record
         else
-          record = valid_emails.find{ |record| record.email == formatted_email }
+          record = find_or_build_for_email(new_email)
 
-          unless record
-            record = emails.build(email: formatted_email)
-            valid_emails << record
+          if record.try(:confirmed?) || primary_email_record.nil? || options[:allow_unconfirmed]
+            set_primary_record_to(record, options)
           end
-
-          # toggle the selected record as primary and others as not
-          valid_emails.each{ |other| other.primary = (other == record) }
         end
 
         record
       end
 
+      # Use Devise formatting settings for emails
+      def format_email(email)
+        @parent_record.class.__send__(:devise_parameter_filter).filter(email: email)[:email]
+      end
+
+      def find_or_build_for_email(email)
+        formatted_email = format_email(email)
+        record = filtered_emails.find { |item| item.email == formatted_email }
+        record || emails.build(email: formatted_email)
+      end
+
       def emails
-        record.__send__(record.class.multi_email_association.name)
+        @parent_record.__send__(@parent_record.class.multi_email_association.name)
+      end
+
+      # Gets the email records that have not been deleted
+      def filtered_emails(options = {})
+        emails.to_a.reject(&:destroyed?).reject(&:marked_for_destruction?)
+      end
+
+      def confirmed_emails
+        filtered_emails.select { |record| record.try(:confirmed?) }
+      end
+
+      def unconfirmed_emails
+        filtered_emails.reject { |record| record.try(:confirmed?) }
+      end
+
+    protected
+
+      # :skip_confirmations option confirms this email record (without saving)
+      def set_primary_record_to(record, options = {})
+        # Toggle primary flag for all emails
+        filtered_emails.each { |other| other.primary = (other.email == record.email) }
+
+        if options[:skip_confirmations]
+          record.try(:skip_confirmation!)
+          record.try(:skip_reconfirmation!)
+        end
       end
     end
   end

data/lib/devise/multi_email/version.rb

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

data/lib/devise/multi_email.rb

@@ -3,32 +3,54 @@ require 'devise'
 
 module Devise
   module MultiEmail
-    def self.configure(&block)
-      yield self
-    end
+    class << self
+      def configure(&block)
+        yield self
+      end
 
-    def self.parent_association_name
-      @parent_association_name ||= :user
-    end
+      @autosave_emails = false
 
-    def self.parent_association_name=(name)
-      @parent_association_name = name.try(:to_sym)
-    end
+      def autosave_emails?
+        @autosave_emails == true
+      end
 
-    def self.emails_association_name
-      @emails_association_name ||= :emails
-    end
+      def autosave_emails=(value)
+        @autosave_emails = (value == true)
+      end
 
-    def self.emails_association_name=(name)
-      @emails_association_name = name.try(:to_sym)
-    end
+      @only_login_with_primary_email = false
 
-    def self.primary_email_method_name
-      @primary_email_method_name ||= :primary_email
-    end
+      def only_login_with_primary_email?
+        @only_login_with_primary_email == true
+      end
+
+      def only_login_with_primary_email=(value)
+        @only_login_with_primary_email = (value == true)
+      end
+
+      def parent_association_name
+        @parent_association_name ||= :user
+      end
+
+      def parent_association_name=(name)
+        @parent_association_name = name.try(:to_sym)
+      end
+
+      def emails_association_name
+        @emails_association_name ||= :emails
+      end
+
+      def emails_association_name=(name)
+        @emails_association_name = name.try(:to_sym)
+      end
+
+      def primary_email_method_name
+        @primary_email_method_name ||= :primary_email_record
+      end
 
-    def self.primary_email_method_name=(name)
-      @primary_email_method_name = name.try(:to_sym)
+      def primary_email_method_name=(name)
+        @primary_email_method_name = name.try(:to_sym)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_email
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - ALLEN WANG QIANG
+- Joel Van Horn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -28,16 +29,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,13 +112,13 @@ dependencies:
 description: Devise authenticatable, confirmable and validatable with multiple emails.
 email:
 - rovingbreeze@gmail.com
+- joel@joelvanhorn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -209,9 +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
@@ -241,8 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Let devise support multiple emails.

data/.simplecov

@@ -1,6 +0,0 @@
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.start do
-   add_filter 'spec/'
-end