Refactor ActiveAdminRole::Engine

hole19 · Apr 8, 2018 · ff72062 · ff72062
1 parent bf57ac9
commit ff72062
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/active_admin_role/engine.rb b/lib/active_admin_role/engine.rb
@@ -4,11 +4,15 @@ module ActiveAdminRole
   class Engine < ::Rails::Engine
     initializer "active_admin_role" do
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send :extend, ::ActiveAdminRole::Model
+        require "active_admin_role/monkey/active_record_dsl"
+        extend ActiveAdminRole::ActiveRecordDsl
       end
 
       ActiveSupport.on_load :after_initialize do
-        ::ActiveAdmin::ResourceController.send :include, ::ActiveAdminRole::ActiveAdmin::ResourceController
+        require "active_admin_role/monkey/active_admin_dsl"
+        require "active_admin_role/monkey/active_admin_controller"
+        ActiveAdmin::DSL.send :include, ActiveAdminRole::ActiveAdminDsl
+        ActiveAdmin::ResourceController.send :include, ActiveAdminRole::ActiveAdminController
       end
     end
   end