devise_invitable 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d960efc9d5ef35fa1fdfefbde6fa6ab687d0c3d0de519a1112d1dec57224bd
-  data.tar.gz: 9e6e81c91625d7bce472c5055d0f9f16bfc349d462eb90bbfa57bc33c766cded
+  metadata.gz: e29dc7f305f5cb11941463a2115645c6de83ac0fde470243f8c4ee9c23535c7f
+  data.tar.gz: 1351e523f14e6dcb0243df3a6b0eca0156e0185e25fd488335c8acf4b260c7b7
 SHA512:
-  metadata.gz: 9745971bbb21f82d7f3659f594ef9ad4621844df9af9a8c0f58dd6df6f436bcf256b100712233db860a124b104185478c9efcce46d37df639ccbc57d9bc1fd06
-  data.tar.gz: 373944acfbdb815a64aa86832be27ca6c02c0e9a70b0b6a82ec738a5bb807b27f4f9908aa4bf6f9cfdd01194d8bfa84ac287454c01d390237e54bf26d66a46f9
+  metadata.gz: 667c2b93fe46151947c3845fd19c4b370d5c9435331cc84ef52e2d375ba06e9748aa57539333b7951dd8b6a09ae6ebdc8ad8e9bb177b5e5d7741bec1691f9b6a
+  data.tar.gz: a7403ae4e341a1a1eaf8431addfc9336534ef1fbaacee60614880f0fa94d772bface4433929088c7025766c264c8820b5608914eabb1f8a76624b2ea6116a62c

data/lib/devise_invitable/rails.rb

@@ -5,22 +5,11 @@ module DeviseInvitable
       include DeviseInvitable::Controllers::Helpers
     end
 
-    # We use to_prepare instead of after_initialize here because Devise is a Rails engine; its
-    # mailer is reloaded like the rest of the user's app.  Got to make sure that our mailer methods
-    # are included each time Devise.mailer is (re)loaded.
-    #
-    # The work is wrapped in ActiveSupport.on_load(:action_mailer) so that resolving
-    # Devise.mailer (a String#constantize) doesn't force ActionMailer::Base to load
-    # before app initialization completes. Without this wrapper, Rails edge's
-    # guard_load_hooks support (rails/rails#56201) logs an early-load-hook warning
-    # for :action_mailer (and :active_job, via MailDeliveryJob) on every boot.
-    config.to_prepare do
-      ActiveSupport.on_load(:action_mailer) do
-        Devise.mailer.send :include, DeviseInvitable::Mailer
-        unless Devise.mailer.ancestors.include?(Devise::Mailers::Helpers)
-          Devise.mailer.send :include, Devise::Mailers::Helpers
-        end
-      end
+    # Devise::Mailer includes Devise::Mailers::Helpers, so adding our mailer methods there reaches every
+    # (re)loaded Devise.mailer without resolving it at boot. Resolving it from an on_load(:action_mailer)
+    # hook re-enters the app's parent_mailer while it is still loading (#929).
+    initializer "devise_invitable.mailer" do
+      Devise::Mailers::Helpers.include DeviseInvitable::Mailer
     end
     # extend mapping with after_initialize because it's not reloaded
     config.after_initialize do

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '2.0.13'.freeze
+  VERSION = '2.0.14'.freeze
 end

data/test/mailers/parent_mailer_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'open3'
+
+class ParentMailerTest < ActiveSupport::TestCase
+  APPLICATION = File.expand_path('../rails_app/config/application', __dir__)
+
+  # Each boot runs in a fresh process: the failure only shows up when nothing has loaded
+  # ActionMailer::Base yet, which is never the case inside this test process.
+  def boot_with_app_parent_mailer(first_reference)
+    script = <<~RUBY
+      require #{APPLICATION.inspect}
+      Devise.parent_mailer = 'ApplicationMailer'
+      RailsApp::Application.initialize!
+      #{first_reference}
+      print "invitation_instructions=\#{Devise.mailer.method_defined?(:invitation_instructions)}"
+    RUBY
+    Open3.capture3({ 'RAILS_ENV' => 'test' }, RbConfig.ruby, '-e', script)
+  end
+
+  test 'Devise.mailer resolves when the parent mailer is an app mailer' do
+    stdout, stderr, status = boot_with_app_parent_mailer('Devise.mailer')
+    assert status.success?, stderr
+    assert_match(/invitation_instructions=true\z/, stdout)
+  end
+
+  test 'the parent mailer can be the first mailer loaded, as with eager loading' do
+    stdout, stderr, status = boot_with_app_parent_mailer('ApplicationMailer')
+    assert status.success?, stderr
+    assert_match(/invitation_instructions=true\z/, stdout)
+  end
+end

data/test/rails_app/app/mailers/application_mailer.rb

@@ -0,0 +1,2 @@
+class ApplicationMailer < ActionMailer::Base
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Sergio Cambra
@@ -120,6 +120,7 @@ files:
 - test/integration/invitation_test.rb
 - test/integration_tests_helper.rb
 - test/mailers/invitation_mail_test.rb
+- test/mailers/parent_mailer_test.rb
 - test/model_tests_helper.rb
 - test/models/invitable_test.rb
 - test/models_test.rb
@@ -132,6 +133,7 @@ files:
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/application_mailer.rb
 - test/rails_app/app/models/admin.rb
 - test/rails_app/app/models/octopussy.rb
 - test/rails_app/app/models/user.rb
@@ -199,6 +201,7 @@ test_files:
 - test/integration/invitation_test.rb
 - test/integration_tests_helper.rb
 - test/mailers/invitation_mail_test.rb
+- test/mailers/parent_mailer_test.rb
 - test/model_tests_helper.rb
 - test/models/invitable_test.rb
 - test/models_test.rb
@@ -211,6 +214,7 @@ test_files:
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/mailers/application_mailer.rb
 - test/rails_app/app/models/admin.rb
 - test/rails_app/app/models/octopussy.rb
 - test/rails_app/app/models/user.rb