activeadmin 0.2.2 → 0.3.0

data/lib/active_admin/resource_controller.rb

@@ -1,4 +1,4 @@
-require 'inherited_views'
+require 'inherited_resources'
 require 'active_admin/resource_controller/actions'
 require 'active_admin/resource_controller/action_builder'
 require 'active_admin/resource_controller/callbacks'
@@ -8,23 +8,22 @@ require 'active_admin/resource_controller/form'
 require 'active_admin/resource_controller/menu'
 require 'active_admin/resource_controller/page_configurations'
 require 'active_admin/resource_controller/scoping'
-require 'active_admin/resource_controller/sidebars'
 
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
-    self.default_views = 'active_admin_default'
-    
     helper ::ActiveAdmin::ViewHelpers
 
-    layout false
-    
+    layout :determine_active_admin_layout
+
     respond_to :html, :xml, :json
     respond_to :csv, :only => :index
 
+    before_filter :only_render_implemented_actions
     before_filter :authenticate_active_admin_user
 
-    include ActiveAdmin::ActionItems
+    ACTIVE_ADMIN_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
+
     include Actions
     include ActionBuilder
     include Callbacks
@@ -34,14 +33,15 @@ module ActiveAdmin
     include Menu
     include PageConfigurations
     include Scoping
-    include Sidebars
 
     class << self
+      # Ensure that this method is available for the DSL
+      public :actions
 
       # Reference to the Resource object which initialized
       # this controller
       attr_accessor :active_admin_config
-      
+
       def active_admin_config=(config)
         @active_admin_config = config
         defaults  :resource_class => config.resource,
@@ -52,41 +52,33 @@ module ActiveAdmin
       public :belongs_to
     end
 
-    # Default Sidebar Sections
-    sidebar :filters, :only => :index do
-      active_admin_filters_form_for assigns["search"], filters_config
-    end
+    protected
 
-    # Default Action Item Links
-    action_item :only => :show do
-      if controller.action_methods.include?('edit')
-        link_to("Edit #{active_admin_config.resource_name}", edit_resource_path(resource))
-      end
+    # By default Rails will render un-implemented actions when the view exists. Becuase Active
+    # Admin allows you to not render any of the actions by using the #actions method, we need
+    # to check if they are implemented.
+    def only_render_implemented_actions
+      raise AbstractController::ActionNotFound unless action_methods.include?(params[:action])
     end
 
-    action_item :only => :show do
-      if controller.action_methods.include?("destroy")
-        link_to("Delete #{active_admin_config.resource_name}",
-          resource_path(resource), 
-          :method => :delete, :confirm => "Are you sure you want to delete this?")
-      end
+    # Determine which layout to use.
+    #
+    #   1.  If we're rendering a standard Active Admin action, we want layout(false)
+    #       because these actions are subclasses of the Base page (which implementes
+    #       all the required layout code)
+    #   2.  If we're rendering a custom action, we'll use the active_admin layout so
+    #       that users can render any template inside Active Admin.
+    def determine_active_admin_layout
+      ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : 'active_admin'
     end
 
-    action_item :except => [:new, :show] do
-      if controller.action_methods.include?('new')
-        link_to("New #{active_admin_config.resource_name}", new_resource_path)
-      end
-    end
-
-    protected
-
     # Calls the authentication method as defined in ActiveAdmin.authentication_method
     def authenticate_active_admin_user
-      send(ActiveAdmin.authentication_method) if ActiveAdmin.authentication_method
+      send(active_admin_application.authentication_method) if active_admin_application.authentication_method
     end
 
     def current_active_admin_user
-      send(ActiveAdmin.current_user_method) if ActiveAdmin.current_user_method
+      send(active_admin_application.current_user_method) if active_admin_application.current_user_method
     end
     helper_method :current_active_admin_user
 
@@ -100,11 +92,14 @@ module ActiveAdmin
     end
     helper_method :active_admin_config
 
+    def active_admin_application
+      ActiveAdmin.application
+    end
+
     # Returns the renderer class to use for the given action.
     def renderer_for(action)
-      ActiveAdmin.view_factory["#{action}_page"]
+      active_admin_application.view_factory["#{action}_page"]
     end
     helper_method :renderer_for
-
   end
 end

data/lib/active_admin/resource_controller/action_builder.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     module ActionBuilder
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/actions.rb

@@ -1,53 +1,79 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
-
-    # All the controller actions are defined here. They all use
-    # the render_or_default method provided by InheritedViews which
-    # tries to render the view in the user's application, then falls
-    # back the view declared by Active Admin.
-    module Actions
-      def index
-        index! do |format|
-          format.html do
-            render_or_default 'index'
-          end
-          format.csv do 
-            @csv_columns = resource_class.columns.collect{ |column| column.name.to_sym }
-            render_or_default 'index' 
-          end
+  class ResourceController < ::InheritedResources::Base
+
+    # Override the InheritedResources actions to use the
+    # Active Admin templates.
+    #
+    # We ensure that the functionality provided by Inherited
+    # Resources is still available within any ResourceController
+
+    def index(options={}, &block)
+      super(options) do |format|
+        block.call(format) if block
+        format.html { render active_admin_template('index.html.arb') }
+        format.csv do
+          headers['Content-Type'] = 'text/csv; charset=utf-8'
+          headers['Content-Disposition'] = %{attachment; filename="#{csv_filename}"}
+          render active_admin_template('index.csv.erb')
         end
       end
+    end
+    alias :index! :index
 
-      def new
-        new! do |format|
-          format.html { render_or_default 'new' }
-        end
+    def show(options={}, &block)
+      super do |format|
+        block.call(format) if block
+        format.html { render active_admin_template('show.html.arb') }
       end
-      
-      def create
-        create! do |success, failure|
-          failure.html { render_or_default 'new' }
-        end
+    end
+    alias :show! :show
+
+    def new(options={}, &block)
+      super do |format|
+        block.call(format) if block
+        format.html { render active_admin_template('new.html.arb') }
       end
-      
-      def show
-        show! do |format|
-          format.html { render_or_default 'show' }
-        end
+    end
+    alias :new! :new
+
+    def edit(options={}, &block)
+      super do |format|
+        block.call(format) if block
+        format.html { render active_admin_template('edit.html.arb') }
       end
-      
-      def edit
-        edit! do |format|
-          format.html { render_or_default 'edit' }
-        end
+    end
+    alias :edit! :edit
+
+    def create(options={}, &block)
+      super(options) do |success, failure|
+        block.call(success, failure) if block
+        failure.html { render active_admin_template('new.html.arb') }
       end
-      
-      def update
-        update! do |success, failure|
-          failure.html { render_or_default 'edit' }
-        end
+    end
+    alias :create! :create
+
+    def update(options={}, &block)
+      super do |success, failure|
+        block.call(success, failure) if block
+        failure.html { render active_admin_template('edit.html.arb') }
       end
     end
+    alias :update! :update
 
+    # Make aliases protected
+    protected :index!, :show!, :new!, :create!, :edit!, :update!
+
+    protected
+
+    # Returns the full location to the Active Admin template path
+    def active_admin_template(template)
+      "active_admin/resource/#{template}"
+    end
+
+    # Returns a filename for the csv file using the collection_name
+    # and current date such as 'my-articles-2011-06-24.csv'.
+    def csv_filename
+      "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.now.strftime("%Y-%m-%d")}.csv"
+    end
   end
 end

data/lib/active_admin/resource_controller/callbacks.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     module Callbacks
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/collection.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     # This module deals with the retrieval of collections for resources
     # within the resource controller.
@@ -28,7 +28,7 @@ module ActiveAdmin
         # This method should return an ActiveRecord::Relation object so that
         # the searching and filtering can be applied on top
         #
-        # Note, unless you are doing something special, you should use the 
+        # Note, unless you are doing something special, you should use the
         # scope_to method from the Scoping module instead of overriding this
         # method.
         def scoped_collection
@@ -83,26 +83,20 @@ module ActiveAdmin
         protected
 
         def active_admin_collection
-          scope_collection(super)
+          scope_current_collection(super)
         end
 
-        def scope_collection(chain)
+        def scope_current_collection(chain)
           if current_scope
             @before_scope_collection = chain
-
-            # ActiveRecord::Base isn't a relation, so let's help you out
-            return chain if current_scope.scope_method == :all
-
-            if current_scope.scope_method
-              chain.send(current_scope.scope_method)
-            else
-              instance_exec chain, &current_scope.scope_block
-            end
+            scope_chain(current_scope, chain)
           else
             chain
           end
         end
 
+        include ActiveAdmin::ScopeChain
+
         def current_scope
           @current_scope ||= if params[:scope]
             active_admin_config.get_scope_by_id(params[:scope]) if params[:scope]
@@ -126,7 +120,7 @@ module ActiveAdmin
         end
 
         def paginate(chain)
-          chain.paginate(:page => params[:page], :per_page => @per_page || ActiveAdmin.default_per_page)
+          chain.page(params[:page]).per(@per_page || active_admin_application.default_per_page)
         end
       end
 
@@ -141,3 +135,4 @@ module ActiveAdmin
     end
   end
 end
+

data/lib/active_admin/resource_controller/filters.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     module Filters
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/form.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
     module Form
       extend ActiveSupport::Concern
 

data/lib/active_admin/resource_controller/menu.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
     module Menu
       extend ActiveSupport::Concern
 

data/lib/active_admin/resource_controller/page_configurations.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
-    
+  class ResourceController < ::InheritedResources::Base
+
     module PageConfigurations
       extend ActiveSupport::Concern
 

data/lib/active_admin/resource_controller/scoping.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     # This module deals with scoping entire controllers to a relation
     module Scoping

data/lib/active_admin/resource_controller/sidebars.rb

@@ -1,27 +1,7 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedViews::Base
+  class ResourceController < ::InheritedResources::Base
 
     module Sidebars
-      extend ActiveSupport::Concern
-
-      included do
-        self.class_inheritable_accessor :sidebar_sections
-        self.sidebar_sections = []
-      end
-
-      module ClassMethods
-        def sidebar(name, options = {}, &block)
-          self.sidebar_sections << ActiveAdmin::Sidebar::Section.new(name, options, &block)
-        end
-
-        def clear_sidebar_sections!
-          self.sidebar_sections = []
-        end
-
-        def sidebar_sections_for(action)
-          sidebar_sections.select{|section| section.display_on?(action) }
-        end
-      end
 
       protected
 

data/lib/active_admin/router.rb

@@ -0,0 +1,85 @@
+module ActiveAdmin
+  class Router
+
+    def initialize(application)
+      @application = application
+    end
+
+    # Creates all the necessary routes for the ActiveAdmin configurations
+    #
+    # Use this within the routes.rb file:
+    #
+    #   Application.routes.draw do |map|
+    #     ActiveAdmin.routes(self)
+    #   end
+    #
+    def apply(router)
+      # Define any necessary dashboard routes
+      router.instance_exec(@application.namespaces.values) do |namespaces|
+        namespaces.each do |namespace|
+          if namespace.root?
+            match '/' => 'dashboard#index', :as => 'dashboard'
+          else
+            name = namespace.name
+            match name.to_s => "#{name}/dashboard#index", :as => "#{name.to_s}_dashboard"
+          end
+        end
+      end
+
+      # Now define the routes for each resource
+      router.instance_exec(@application.namespaces) do |namespaces|
+        resources = namespaces.values.collect{|n| n.resources.values }.flatten
+        resources.each do |config|
+
+          # Define the block the will get eval'd within the namespace
+          route_definition_block = Proc.new do
+            resources config.underscored_resource_name.pluralize do
+
+              # Define any member actions
+              member do
+                config.member_actions.each do |action|
+                  # eg: get :comment
+                  send(action.http_verb, action.name)
+                end
+              end
+
+              # Define any collection actions
+              collection do
+                config.collection_actions.each do |action|
+                  send(action.http_verb, action.name)
+                end
+              end
+            end
+          end
+
+          # Add in the parent if it exists
+          if config.belongs_to?
+            routes_for_belongs_to = route_definition_block.dup
+            route_definition_block = Proc.new do
+              # If its optional, make the normal resource routes
+              instance_eval &routes_for_belongs_to if config.belongs_to_config.optional?
+
+              # Make the nested belongs_to routes
+              resources config.belongs_to_config.target.underscored_resource_name.pluralize do
+                instance_eval &routes_for_belongs_to
+              end
+            end
+          end
+
+          # Add on the namespace if required
+          if !config.namespace.root?
+            routes_in_namespace = route_definition_block.dup
+            route_definition_block = Proc.new do
+              namespace config.namespace.name do
+                instance_eval(&routes_in_namespace)
+              end
+            end
+          end
+
+          instance_eval &route_definition_block
+        end
+      end
+    end
+
+  end
+end