andrewroth_activeadmin 0.3.4 → 0.3.4.1

data/lib/active_admin/{resource_controller → base_controller}/menu.rb

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

data/lib/active_admin/comments.rb

@@ -1,4 +1,3 @@
-require 'active_admin/comments/configuration'
 require 'active_admin/comments/comment'
 require 'active_admin/comments/views'
 require 'active_admin/comments/show_page_helper'
@@ -6,7 +5,7 @@ require 'active_admin/comments/namespace_helper'
 require 'active_admin/comments/resource_helper'
 
 # Add the comments configuration
-ActiveAdmin::Application.send :include, ActiveAdmin::Comments::Configuration
+ActiveAdmin::Application.inheritable_setting :allow_comments, true
 
 # Add the comments module to ActiveAdmin::Namespace
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
@@ -18,71 +17,66 @@ ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Generate a Comment resource when namespaces are registered
-ActiveAdmin::Event.subscribe ActiveAdmin::Namespace::RegisterEvent do |namespace|
-  if namespace.comments?
-    namespace.register ActiveAdmin::Comment, :as => 'Comment' do
-      actions :index, :show, :create
+ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent do |app|
+  app.namespaces.values.each do |namespace|
+    if namespace.comments?
+      namespace.register ActiveAdmin::Comment, :as => 'Comment' do
+        actions :index, :show, :create
 
-      # Don't display in the menu
-      menu false
+        # Don't display in the menu
+        menu false
 
-      # Don't allow comments on comments
-      config.comments = false
+        # Don't allow comments on comments
+        config.comments = false
 
-      # Filter Comments by date
-      filter :resource_type
-      filter :body
-      filter :created_at
+        # Filter Comments by date
+        filter :resource_type
+        filter :body
+        filter :created_at
 
-      # Only view comments in this namespace
-      scope :all, :default => true do |comments|
-        comments.where(:namespace => active_admin_config.namespace.name.to_s)
-      end
+        # Only view comments in this namespace
+        scope :all, :default => true do |comments|
+          comments.where(:namespace => active_admin_config.namespace.name.to_s)
+        end
 
-      # Always redirect to the resource on show
-      before_filter :only => :show do
-        flash[:notice] = flash[:notice].dup if flash[:notice]
-        comment = ActiveAdmin::Comment.find(params[:id])
-        resource_config = active_admin_config.namespace.resource_for(comment.resource.class)
-        redirect_to send(resource_config.route_instance_path, comment.resource)
-      end
+        # Always redirect to the resource on show
+        before_filter :only => :show do
+          flash[:notice] = flash[:notice].dup if flash[:notice]
+          comment = ActiveAdmin::Comment.find(params[:id])
+          resource_config = active_admin_config.namespace.resource_for(comment.resource.class)
+          redirect_to send(resource_config.route_instance_path, comment.resource)
+        end
 
-      # Store the author and namespace
-      before_save do |comment|
-        comment.namespace = active_admin_config.namespace.name
-        comment.author = current_active_admin_user
-      end
+        # Store the author and namespace
+        before_save do |comment|
+          comment.namespace = active_admin_config.namespace.name
+          comment.author = current_active_admin_user
+        end
 
-      # Redirect to the resource show page when failing to add a comment
-      # TODO: Provide helpers to make such kind of customization much simpler
-      controller do
-        def create
-          create! do |success, failure|
-            failure.html do 
-              resource_config = active_admin_config.namespace.resource_for(@comment.resource.class)
-              flash[:error] = "Comment wasn't saved, text was empty."
-              redirect_to send(resource_config.route_instance_path, @comment.resource)
+        # Redirect to the resource show page when failing to add a comment
+        # TODO: Provide helpers to make such kind of customization much simpler
+        controller do
+          def create
+            create! do |success, failure|
+              failure.html do 
+                resource_config = active_admin_config.namespace.resource_for(@comment.resource.class)
+                flash[:error] = "Comment wasn't saved, text was empty."
+                redirect_to send(resource_config.route_instance_path, @comment.resource)
+              end
             end
           end
         end
-      end
-
 
-      # Display as a table
-      index do
-        column("Resource"){|comment| auto_link(comment.resource) }
-        column("Author"){|comment| auto_link(comment.author) }
-        column :body
+        # Display as a table
+        index do
+          column("Resource"){|comment| auto_link(comment.resource) }
+          column("Author"){|comment| auto_link(comment.author) }
+          column :body
+        end
       end
     end
   end
 end
 
-# Register for comments when new resources are registered
-ActiveAdmin::Event.subscribe ActiveAdmin::Resource::RegisterEvent do |resource|
-  if resource.comments?
-    resource.resource.has_many :active_admin_comments, :class_name => "ActiveAdmin::Comment",
-                                                       :as         => :resource, 
-                                                       :dependent  => :destroy
-  end
-end
+# @deprecated #allow_comments_on - Remove in 0.5.0
+ActiveAdmin::Application.deprecated_setting :allow_comments_in, [], 'The "allow_comments_in = []" setting is deprecated and will be remove by Active Admin 0.5.0. Please use "allow_comments = true|false" instead.'

data/lib/active_admin/comments/comment.rb

@@ -11,10 +11,21 @@ module ActiveAdmin
     belongs_to :resource, :polymorphic => true
     belongs_to :author, :polymorphic => true
 
-    validates_presence_of :resource_id
-    validates_presence_of :resource_type
+    validates_presence_of :resource
     validates_presence_of :body
     validates_presence_of :namespace
+
+    # @returns [String] The name of the record to use for the polymorphic relationship
+    def self.resource_type(record)
+      record.class.base_class.name.to_s
+    end
+
+    def self.find_for_resource_in_namespace(resource, namespace)
+      where(:resource_type => resource_type(resource),
+            :resource_id => resource.id, 
+            :namespace => namespace.to_s)
+    end
+
   end
 
 end

data/lib/active_admin/comments/namespace_helper.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
 
       # Returns true of the namespace allows comments
       def comments?
-        application.allow_comments_in && application.allow_comments_in.include?(name)
+        allow_comments == true
       end
 
     end

data/lib/active_admin/comments/views/active_admin_comments.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         end
 
         def record_comments
-          @record_comments ||= @record.active_admin_comments.where(:namespace => active_admin_namespace.name.to_s)
+          @record_comments ||= ActiveAdmin::Comment.find_for_resource_in_namespace(@record, active_admin_namespace.name)
         end
 
         def build_comments
@@ -56,13 +56,17 @@ module ActiveAdmin
         end
 
         def comment_form_url
-          send(:"#{active_admin_namespace.name}_comments_path")
+          if active_admin_namespace.root?
+            comments_path
+          else
+            send(:"#{active_admin_namespace.name}_comments_path")
+          end
         end
 
         def build_comment_form
           self << active_admin_form_for(ActiveAdmin::Comment.new, :url => comment_form_url, :html => {:class => "inline_form"}) do |form|
             form.inputs do
-              form.input :resource_type, :value => @record.class.base_class.name.to_s, :as => :hidden
+              form.input :resource_type, :value => ActiveAdmin::Comment.resource_type(@record), :as => :hidden
               form.input :resource_id, :value => @record.id, :as => :hidden
               form.input :body, :input_html => {:size => "80x8"}, :label => false
             end

data/lib/active_admin/dashboards.rb

@@ -26,6 +26,10 @@ module ActiveAdmin
 
       # Add a new dashboard section to a namespace. If no namespace is given
       # it will be added to the default namespace.
+      #
+      # Options include:
+      #   :namespace => only display for specified namespace.
+      #   :if        => specify a method or block to determine whether the section is rendered at run time.
       def add_section(name, options = {}, &block)
         namespace = options.delete(:namespace) || ActiveAdmin.application.default_namespace || :root
         self.sections[namespace] ||= [] 

data/lib/active_admin/dashboards/dashboard_controller.rb

@@ -9,16 +9,28 @@ module ActiveAdmin
         render 'active_admin/dashboard/index.html.arb'
       end
 
-      protected
+      private
 
       def set_current_tab
         @current_tab = I18n.t("active_admin.dashboard")
       end
 
       def find_sections
-        ActiveAdmin::Dashboards.sections_for_namespace(namespace)
+        sections = ActiveAdmin::Dashboards.sections_for_namespace(namespace)        
+        sections.select do |section|
+          if section.options.has_key?(:if)
+            symbol_or_proc = section.options[:if]
+            case symbol_or_proc
+            when Symbol, String then self.send(symbol_or_proc)
+            when Proc           then instance_exec(&symbol_or_proc)
+            else symbol_or_proc
+            end
+          else
+            true
+          end
+        end
       end
-
+      
       def namespace
         class_name = self.class.name
         if class_name.include?('::')
@@ -30,7 +42,11 @@ module ActiveAdmin
 
       # Return the current menu for the view. This is a helper method
       def current_menu
-        ActiveAdmin.application.namespaces[namespace].menu
+        active_admin_namespace.menu
+      end
+
+      def active_admin_namespace
+        ActiveAdmin.application.namespace(namespace)
       end
 
     end

data/lib/active_admin/dsl.rb

@@ -15,14 +15,14 @@ module ActiveAdmin
 
     private
 
-    # The instance of ActiveAdmin::Resource that's being registered
+    # The instance of ActiveAdmin::Config that's being registered
     # currently. You can use this within your registration blocks to
     # modify options:
     #
     # eg:
-    #   
+    # 
     #   ActiveAdmin.register Post do
-    #     config.admin_notes = false
+    #     config.sort_order = "id_desc"
     #   end
     #
     def config
@@ -33,7 +33,7 @@ module ActiveAdmin
     # block, it will be eval'd in the controller
     #
     # Example:
-    #   
+    #
     #   ActiveAdmin.register Post do
     #
     #     controller do
@@ -49,51 +49,6 @@ module ActiveAdmin
       @config.controller
     end
 
-    def belongs_to(target, options = {})
-      config.belongs_to(target, options)
-    end
-
-    def menu(options = {})
-      config.menu(options)
-    end
-
-    # Scope this controller to some object which has a relation
-    # to the resource. Can either accept a block or a symbol 
-    # of a method to call.
-    #
-    # Eg:
-    #
-    #   ActiveAdmin.register Post do
-    #     scope_to :current_user
-    #   end
-    #
-    # Then every time we instantiate and object, it would call
-    #   
-    #   current_user.posts.build
-    #
-    # By default Active Admin will use the resource name to build a
-    # method to call as the association. If its different, you can 
-    # pass in the association_method as an option.
-    #
-    #   scope_to :current_user, :association_method => :blog_posts
-    #
-    # will result in the following
-    # 
-    #   current_user.blog_posts.build
-    #
-    def scope_to(*args, &block)
-      options = args.extract_options!
-      method = args.first
-
-      config.scope_to = block_given? ? block : method
-      config.scope_to_association_method = options[:association_method]
-    end
-
-    # Create a scope
-    def scope(*args, &block)
-      config.scope(*args, &block)
-    end
-
     # Add a new action item to the resource
     #
     # @param [Hash] options valid keys include:
@@ -105,120 +60,12 @@ module ActiveAdmin
       config.add_action_item(options, &block)
     end
 
-    # Configure the index page for the resource
-    def index(options = {}, &block)
-      options[:as] ||= :table
-      controller.set_page_config :index, options, &block
-    end
-
-    # Configure the show page for the resource
-    def show(options = {}, &block)
-      # TODO: controller.set_page_config just sets page_configs on the Resource (config) obj
-      controller.set_page_config :show, options, &block
-    end
-
-    def form(options = {}, &block)
-      options[:block] = block
-      controller.form_config = options
+    def menu(options = {})
+      config.menu(options)
     end
 
     def sidebar(name, options = {}, &block)
       config.sidebar_sections << ActiveAdmin::SidebarSection.new(name, options, &block)
     end
-
-    # Configure the CSV format
-    #
-    # For example:
-    #
-    #   csv do
-    #     column :name
-    #     column("Author") { |post| post.author.full_name }
-    #   end
-    #
-    def csv(&block)
-      config.csv_builder = CSVBuilder.new(&block)
-    end
-
-    # Member Actions give you the functionality of defining both the
-    # action and the route directly from your ActiveAdmin registration
-    # block.
-    #
-    # For example:
-    #
-    #   ActiveAdmin.register Post do
-    #     member_action :comments do
-    #       @post = Post.find(params[:id]
-    #       @comments = @post.comments
-    #     end
-    #   end
-    #
-    # Will create a new controller action comments and will hook it up to
-    # the named route (comments_admin_post_path) /admin/posts/:id/comments
-    #
-    # You can treat everything within the block as a standard Rails controller
-    # action.
-    # 
-    def member_action(name, options = {}, &block)
-      config.member_actions << ControllerAction.new(name, options)
-      controller do
-        define_method(name, &block || Proc.new{})
-      end
-    end
-
-    def collection_action(name, options = {}, &block)
-      config.collection_actions << ControllerAction.new(name, options)
-      controller do
-        define_method(name, &block || Proc.new{})
-      end
-    end
-
-    # Defined Callbacks
-    #
-    # == After Build
-    # Called after the resource is built in the new and create actions.
-    #
-    # ActiveAdmin.register Post do
-    #   after_build do |post|
-    #     post.author = current_user
-    #   end
-    # end
-    #
-    # == Before / After Create
-    # Called before and after a resource is saved to the db on the create action.
-    #
-    # == Before / After Update
-    # Called before and after a resource is saved to the db on the update action.
-    #
-    # == Before / After Save
-    # Called before and after the object is saved in the create and update action.
-    # Note: Gets called after the create and update callbacks
-    #
-    # == Before / After Destroy
-    # Called before and after the object is destroyed from the database.
-    #
-    delegate :before_build,   :after_build,   :to => :controller
-    delegate :before_create,  :after_create,  :to => :controller
-    delegate :before_update,  :after_update,  :to => :controller
-    delegate :before_save,    :after_save,    :to => :controller
-    delegate :before_destroy, :after_destroy, :to => :controller
-
-    # Filters
-    delegate :filter, :to => :controller
-
-
-    # Standard rails filters
-    delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :to => :controller
-
-    # Specify which actions to create in the controller
-    #
-    # Eg:
-    #   
-    #   ActiveAdmin.register Post do
-    #     actions :index, :show
-    #   end
-    #
-    # Will only create the index and show actions (no create, update or delete)
-    delegate :actions, :to => :controller
-
   end
 end