lib/ditty/components/app.rb in ditty-0.2.1 vs lib/ditty/components/app.rb in ditty-0.2.2

@@ -2,11 +2,14 @@
 
 require 'ditty'
 
 module Ditty
   class App
-    def self.load_models
+    def self.load
+      controllers = File.expand_path('../../controllers', __FILE__)
+      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+
       require 'ditty/models/user'
       require 'ditty/models/role'
       require 'ditty/models/identity'
       require 'ditty/models/audit_log'
     end
@@ -23,22 +26,21 @@
     def self.view_folder
       File.expand_path('../../../../views', __FILE__)
     end
 
     def self.routes
-      controllers = File.expand_path('../../controllers', __FILE__)
-      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+      load
       {
         '/' => ::Ditty::Main,
         '/users' => ::Ditty::Users,
         '/roles' => ::Ditty::Roles,
         '/audit-logs' => ::Ditty::AuditLogs
       }
     end
 
     def self.navigation
-      load_models
+      load
 
       [
         {
           group: 'User Management',
           order: 10,
@@ -52,10 +54,10 @@
       ]
     end
 
     def self.seeder
       proc do
-        load_models
+        load
 
         ::Ditty::Role.find_or_create(name: 'super_admin')
         ::Ditty::Role.find_or_create(name: 'admin')
         user_role = ::Ditty::Role.find_or_create(name: 'user')