lib/catche/controller.rb in catche-0.2.3 vs lib/catche/controller.rb in catche-0.2.4

@@ -1,16 +1,14 @@
+require 'catche/controller/actions'
+require 'catche/controller/pages'
+
 module Catche
   module Controller
 
     extend ActiveSupport::Concern
-    extend ActiveSupport::Autoload
 
-    eager_autoload do
-      autoload :Action
-      autoload :Page
-    end
-
-    include Action, Page
+    include Catche::Controller::Actions
+    include Catche::Controller::Pages
 
     included do
 
       class_attribute :catche_model,
                       :catche_resource_name,
\ No newline at end of file