Add guards in boot#start

dry-rb · Dec 28, 2021 · 480d19f · 480d19f
1 parent 35d2a5a
commit 480d19f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/dry/rails/boot/controller_helpers.rb b/lib/dry/rails/boot/controller_helpers.rb
@@ -6,9 +6,12 @@
   end
 
   start do
-    ApplicationController.include(Dry::Rails::Features::ControllerHelpers)
+    unless ApplicationController.include?(Dry::Rails::Features::ControllerHelpers)
+      ApplicationController.include(Dry::Rails::Features::ControllerHelpers)
+    end
 
-    if defined?(ActionController::API)
+    if defined?(ActionController::API) &&
+       !ActionController::API.include?(Dry::Rails::Features::ControllerHelpers)
       ActionController::API.include(Dry::Rails::Features::ControllerHelpers)
     end
   end

diff --git a/lib/dry/rails/boot/safe_params.rb b/lib/dry/rails/boot/safe_params.rb
@@ -6,9 +6,12 @@
   end
 
   start do
-    ActionController::Base.include(Dry::Rails::Features::SafeParams)
+    unless ActionController::Base.include?(Dry::Rails::Features::SafeParams)
+      ActionController::Base.include(Dry::Rails::Features::SafeParams)
+    end
 
-    if defined?(ActionController::API)
+    if defined?(ActionController::API) &&
+       !ActionController::API.include?(Dry::Rails::Features::SafeParams)
       ActionController::API.include(Dry::Rails::Features::SafeParams)
     end
   end