From a5f35b1a90e69bf337a73e6fc65d266d1a82fa69 Mon Sep 17 00:00:00 2001
From: Serge Paquet <srgpqt@gmail.com>
Date: Tue, 5 Apr 2022 15:42:51 -0400
Subject: [PATCH] Fix autoload issues (zeitwerk compatibility)

---
 .rubocop_todo.yml                                               | 2 +-
 {app/models => lib}/active_admin_role/dsl.rb                    | 2 ++
 lib/active_admin_role/engine.rb                                 | 1 +
 .../models => lib}/active_admin_role/role_based_authorizable.rb | 0
 4 files changed, 4 insertions(+), 1 deletion(-)
 rename {app/models => lib}/active_admin_role/dsl.rb (72%)
 rename {app/models => lib}/active_admin_role/role_based_authorizable.rb (100%)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 454537e..d1df2e0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -20,4 +20,4 @@ Metrics/AbcSize:
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'app/models/active_admin/manageable_resource.rb'
-    - 'app/models/concerns/active_admin_role/role_based_authorizable.rb'
+    - 'lib/active_admin_role/role_based_authorizable.rb'
diff --git a/app/models/active_admin_role/dsl.rb b/lib/active_admin_role/dsl.rb
similarity index 72%
rename from app/models/active_admin_role/dsl.rb
rename to lib/active_admin_role/dsl.rb
index 92af653..54f58a0 100644
--- a/app/models/active_admin_role/dsl.rb
+++ b/lib/active_admin_role/dsl.rb
@@ -1,3 +1,5 @@
+require "active_admin_role/role_based_authorizable"
+
 module ActiveAdminRole
   module Dsl
     def role_based_authorizable
diff --git a/lib/active_admin_role/engine.rb b/lib/active_admin_role/engine.rb
index 06dcaa3..35ade57 100644
--- a/lib/active_admin_role/engine.rb
+++ b/lib/active_admin_role/engine.rb
@@ -1,4 +1,5 @@
 require "rails/engine"
+require "active_admin_role/dsl"
 require "active_admin_role/active_admin/dsl"
 
 module ActiveAdminRole
diff --git a/app/models/active_admin_role/role_based_authorizable.rb b/lib/active_admin_role/role_based_authorizable.rb
similarity index 100%
rename from app/models/active_admin_role/role_based_authorizable.rb
rename to lib/active_admin_role/role_based_authorizable.rb