devise-multi_email 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ba4375a3b35995bdfa11564cc3f2a4e879d9731
-  data.tar.gz: 32c1c262c80fbfa87ef8819e40e0821ecc8ce822
+SHA256:
+  metadata.gz: e1f6c20540e06ef03d433a86d14ee5f7300b94146a1b9019b2c81a88edc72925
+  data.tar.gz: 3e14cce59ae14f024bba1213c11b91bf90f839cfe0c01ed4f9fcf0bbdbdd1e12
 SHA512:
-  metadata.gz: 9926f6af62664391396203089a60f9a0876d8b3548898ee5148626e963d4c5bd818ff8db4d20c934cf3d7672f3886274fe68e75465a08cf1fa560b84060cdd61
-  data.tar.gz: 711a2674cee47fb189a46220adf4d32b334609f74ad490016bc4cd87d387ac9c836b5e1eae2165d5478d747e6b0c58971b75c54bad3f522487ca47de349ac063
+  metadata.gz: 3595bdad371be1ca01a2fc6563b8aaba6da01e9c8bca8cf7bec9933d5fb58a8b045cf7b2cddd3440aa7dd623cd64e1d11cc53d8bce1e874d14bed0f54cc39fdd
+  data.tar.gz: 7b75589a85f83282eacdaf95911ac75572e0bc2336fe8f1bcf46e700cab71ffdeb470d36a59c5db55ed132ee6f07449ba57d5a11d4f2efb455c749f127eeb8d3

data/.travis.yml

@@ -1,8 +1,9 @@
 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
+before_install: gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 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

data/devise-multi_email.gemspec

@@ -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.4)
     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.0)
+      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.4)
+      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_5_0.gemfile

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

data/gemfiles/rails_5_2.gemfile

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

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

@@ -42,13 +42,13 @@ 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: false)
+          multi_email.change_primary_email_to(new_email, allow_unconfirmed: Devise.allow_unconfirmed_access_for > 0.days)
         end
 
         # This need to be forwarded to the email that the user logged in with

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,12 +65,24 @@ module Devise
     private
 
       def propagate_email_errors
-        email_error_key = self.class.multi_email_association.name
-        email_errors = errors.delete(email_error_key) ||
-                       errors.delete("#{email_error_key}.email".to_sym) || []
+        association_name = self.class.multi_email_association.name
+        email_error_key = errors.keys.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.each do |error|
-          errors.add(:email, error)
+        email_errors.each do |type, message|
+          errors.add(:email, type, message: message)
         end
       end
 

data/lib/devise/multi_email/parent_model_manager.rb

@@ -62,7 +62,7 @@ module Devise
 
       # Gets the email records that have not been deleted
       def filtered_emails(options = {})
-        emails.lazy.reject(&:destroyed?).reject(&:marked_for_destruction?).to_a
+        emails.to_a.reject(&:destroyed?).reject(&:marked_for_destruction?)
       end
 
       def confirmed_emails

data/lib/devise/multi_email/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_email
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - ALLEN WANG QIANG
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -29,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
@@ -119,7 +119,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -214,6 +213,7 @@ files:
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
 - lib/devise/multi_email.rb
 - lib/devise/multi_email/association_manager.rb
 - lib/devise/multi_email/email_model_extensions.rb
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.9
 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