app/controllers/administrate/application_controller.rb in administrate-0.0.11 vs app/controllers/administrate/application_controller.rb in administrate-0.0.12

@@ -1,32 +1,33 @@
 module Administrate
   class ApplicationController < ActionController::Base
     def index
-      @resources = resolver.resource_class.all
-      @page = Administrate::Page::Table.new(dashboard)
+      @search_term = params[:search].to_s.strip
+      @resources = Administrate::Search.new(resource_resolver, @search_term).run
+      @resources = order.apply(@resources)
+      @resources = @resources.page(params[:page]).per(records_per_page)
+      @page = Administrate::Page::Table.new(dashboard, order: order)
     end
 
     def show
       set_resource
 
       @page = Administrate::Page::Show.new(dashboard, resource)
     end
 
     def new
-      @page = Administrate::Page::Form.new(
-        dashboard, resolver.resource_class.new
-      )
+      @page = Administrate::Page::Form.new(dashboard, resource_class.new)
     end
 
     def edit
       set_resource
 
       @page = Administrate::Page::Form.new(dashboard, resource)
     end
 
     def create
-      set_resource(resolver.resource_class.new(resource_params))
+      set_resource(resource_class.new(resource_params))
 
       if resource.save
         redirect_to(
           [Administrate::NAMESPACE, resource],
           notice: translate("create.success"),
@@ -61,57 +62,64 @@
 
     private
 
     helper_method :nav_link_state
     def nav_link_state(resource)
-      if resolver.resource_name.to_s.pluralize == resource.to_s
+      if resource_name.to_s.pluralize == resource.to_s
         :active
       else
         :inactive
       end
     end
 
+    def records_per_page
+      params[:per_page] || 20
+    end
+
+    def order
+      @order ||= Administrate::Order.new(params[:order], params[:direction])
+    end
+
     def dashboard
-      @dashboard ||= resolver.dashboard_class.new
+      @dashboard ||= resource_resolver.dashboard_class.new
     end
 
     def set_resource(resource = nil)
       resource ||= find_resource(params[:id])
       instance_variable_set(instance_variable, resource)
     end
 
     def find_resource(param)
-      resolver.resource_class.find(param)
+      resource_class.find(param)
     end
 
     def resource
       instance_variable_get(instance_variable)
     end
 
     def resource_params
-      params.require(resolver.resource_name).permit(*permitted_attributes)
+      params.require(resource_name).permit(*permitted_attributes)
     end
 
     def permitted_attributes
       dashboard.permitted_attributes
     end
 
     def instance_variable
-      "@#{resolver.resource_name}"
+      "@#{resource_name}"
     end
 
-    def resolver
-      @resolver ||= Administrate::ResourceResolver.new(resource_class)
-    end
+    delegate :resource_class, :resource_name, to: :resource_resolver
 
-    def resource_class
-      params.fetch(:resource_class, controller_path).to_s
+    def resource_resolver
+      @resource_resolver ||=
+        Administrate::ResourceResolver.new(controller_path)
     end
 
     def translate(key)
       t(
         "administrate.controller.#{key}",
-        resource: resolver.resource_title,
+        resource: resource_resolver.resource_title,
       )
     end
   end
 end