activeadmin · javierjulio · Dec 24, 2023 · Dec 16, 2023 · Dec 16, 2023 · Dec 16, 2023
diff --git a/lib/active_admin/base_controller.rb → ...ntrollers/active_admin/base_controller.rb b/lib/active_admin/base_controller.rb → ...ntrollers/active_admin/base_controller.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require "active_admin/base_controller/authorization"
-require "active_admin/base_controller/menu"
-
 module ActiveAdmin
   # BaseController for ActiveAdmin.
   # It implements ActiveAdmin controllers core features.
@@ -22,8 +19,8 @@ class << self
       attr_accessor :active_admin_config
     end
 
-    include Authorization
-    include Menu
+    include BaseController::Authorization
+    include BaseController::Menu
 
     private
 

diff --git a/...ve_admin/base_controller/authorization.rb → ...ve_admin/base_controller/authorization.rb b/...ve_admin/base_controller/authorization.rb → ...ve_admin/base_controller/authorization.rb
diff --git a/lib/active_admin/base_controller/menu.rb → ...lers/active_admin/base_controller/menu.rb b/lib/active_admin/base_controller/menu.rb → ...lers/active_admin/base_controller/menu.rb
diff --git a/lib/active_admin/page_controller.rb → ...ntrollers/active_admin/page_controller.rb b/lib/active_admin/page_controller.rb → ...ntrollers/active_admin/page_controller.rb
diff --git a/lib/active_admin/resource_controller.rb → ...llers/active_admin/resource_controller.rb b/lib/active_admin/resource_controller.rb → ...llers/active_admin/resource_controller.rb
@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 require "active_admin/collection_decorator"
-require "active_admin/resource_controller/action_builder"
-require "active_admin/resource_controller/data_access"
-require "active_admin/resource_controller/decorators"
-require "active_admin/resource_controller/polymorphic_routes"
-require "active_admin/resource_controller/scoping"
-require "active_admin/resource_controller/streaming"
-require "active_admin/resource_controller/resource_class_methods"
 
 module ActiveAdmin
   # All Resources Controller inherits from this controller.
@@ -15,12 +8,12 @@ class ResourceController < BaseController
     respond_to :html, :xml, :json
     respond_to :csv, only: :index
 
-    include ActionBuilder
-    include Decorators
-    include DataAccess
-    include PolymorphicRoutes
-    include Scoping
-    include Streaming
+    include ResourceController::ActionBuilder
+    include ResourceController::Decorators
+    include ResourceController::DataAccess
+    include ResourceController::PolymorphicRoutes
+    include ResourceController::Scoping
+    include ResourceController::Streaming
     include ViewHelpers::DownloadFormatLinksHelper
     extend ResourceClassMethods
 

diff --git a/...min/resource_controller/action_builder.rb → ...min/resource_controller/action_builder.rb b/...min/resource_controller/action_builder.rb → ...min/resource_controller/action_builder.rb
diff --git a/..._admin/resource_controller/data_access.rb → ..._admin/resource_controller/data_access.rb b/..._admin/resource_controller/data_access.rb → ..._admin/resource_controller/data_access.rb
diff --git a/...e_admin/resource_controller/decorators.rb → ...e_admin/resource_controller/decorators.rb b/...e_admin/resource_controller/decorators.rb → ...e_admin/resource_controller/decorators.rb
diff --git a/...resource_controller/polymorphic_routes.rb → ...resource_controller/polymorphic_routes.rb b/...resource_controller/polymorphic_routes.rb → ...resource_controller/polymorphic_routes.rb
diff --git a/...urce_controller/resource_class_methods.rb → ...urce_controller/resource_class_methods.rb b/...urce_controller/resource_class_methods.rb → ...urce_controller/resource_class_methods.rb
diff --git a/...tive_admin/resource_controller/scoping.rb → ...tive_admin/resource_controller/scoping.rb b/...tive_admin/resource_controller/scoping.rb → ...tive_admin/resource_controller/scoping.rb
diff --git a/...ve_admin/resource_controller/streaming.rb → ...ve_admin/resource_controller/streaming.rb b/...ve_admin/resource_controller/streaming.rb → ...ve_admin/resource_controller/streaming.rb
diff --git a/app/views/active_admin/devise/registrations/new.html.erb b/app/views/active_admin/devise/registrations/new.html.erb
@@ -5,7 +5,7 @@
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
   <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
-  <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_registration_path"), html: { id: "registration_new" }) do |f|
+  <%= active_admin_form_for(resource, as: resource_name, url: main_app.send(:"#{scope}_registration_path"), html: { id: "registration_new" }) do |f|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|
         f.input key, label: t('active_admin.devise.'+key.to_s+'.title'), input_html: { autofocus: index.zero? }

diff --git a/app/views/active_admin/devise/sessions/new.html.erb b/app/views/active_admin/devise/sessions/new.html.erb
@@ -4,7 +4,7 @@
   </h2>
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_session_path")) do |f|
+  <%= active_admin_form_for(resource, as: resource_name, url: main_app.send(:"#{scope}_session_path")) do |f|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|
         f.input key, label: t("active_admin.devise.#{key}.title"), input_html: { autofocus: index.zero? }

diff --git a/app/views/active_admin/devise/shared/_links.erb b/app/views/active_admin/devise/shared/_links.erb
@@ -1,7 +1,7 @@
 <div class="mt-6 text-sm link-default">
 <%- if controller_name != 'sessions' %>
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %>
+  <%= link_to t('active_admin.devise.links.sign_in'), main_app.send(:"new_#{scope}_session_path") %>
   <br>
 <% end -%>
 

diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
@@ -9,7 +9,7 @@
 end
 
 When /^I add a comment "([^"]*)"$/ do |comment|
-  step %{I fill in "active_admin_comment_body" with "#{comment}"}
+  step %{I fill in "comment_body" with "#{comment}"}
   step %{I press "Add Comment"}
 end
 

diff --git a/lib/active_admin.rb b/lib/active_admin.rb
@@ -19,7 +19,6 @@ module ActiveAdmin
   autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
   autoload :Callbacks, "active_admin/callbacks"
   autoload :Component, "active_admin/component"
-  autoload :BaseController, "active_admin/base_controller"
   autoload :CanCanAdapter, "active_admin/cancan_adapter"
   autoload :ControllerAction, "active_admin/controller_action"
   autoload :CSVBuilder, "active_admin/csv_builder"
@@ -36,11 +35,9 @@ module ActiveAdmin
   autoload :OrderClause, "active_admin/order_clause"
   autoload :Page, "active_admin/page"
   autoload :PagePresenter, "active_admin/page_presenter"
-  autoload :PageController, "active_admin/page_controller"
   autoload :PageDSL, "active_admin/page_dsl"
   autoload :PunditAdapter, "active_admin/pundit_adapter"
   autoload :Resource, "active_admin/resource"
-  autoload :ResourceController, "active_admin/resource_controller"
   autoload :ResourceDSL, "active_admin/resource_dsl"
   autoload :Scope, "active_admin/scope"
   autoload :ScopeChain, "active_admin/helpers/scope_chain"

diff --git a/lib/active_admin/engine.rb b/lib/active_admin/engine.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module ActiveAdmin
   class Engine < ::Rails::Engine
+    isolate_namespace ActiveAdmin
+
     # Set default values for app_path and load_paths before running initializers
     initializer "active_admin.load_app_path", before: :load_config_initializers do |app|
       ActiveAdmin::Application.setting :app_path, app.root