RubyGems - activeadmin - Versions diffs - 0.3.4 → 0.4.0 - Mend

activeadmin 0.3.4 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (244) hide show

data/.gitignore +1 -0
data/.travis.yml +3 -0
data/CHANGELOG.md +164 -5
data/CONTRIBUTING.md +113 -0
data/Gemfile +7 -9
data/LICENSE +1 -1
data/README.rdoc +19 -20
data/activeadmin.gemspec +4 -2
data/app/assets/javascripts/active_admin/application.js +9 -0
data/app/assets/javascripts/active_admin/base.js +4 -12
data/app/assets/stylesheets/active_admin/_base.css.scss +17 -341
data/app/assets/stylesheets/active_admin/_forms.css.scss +13 -7
data/app/assets/stylesheets/active_admin/_header.css.scss +23 -4
data/app/assets/stylesheets/active_admin/components/_blank_slates.scss +31 -0
data/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss +20 -0
data/app/assets/stylesheets/active_admin/components/_buttons.scss +12 -0
data/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss +2 -0
data/app/assets/stylesheets/active_admin/components/_grid.scss +9 -0
data/app/assets/stylesheets/active_admin/components/_links.scss +5 -0
data/app/assets/stylesheets/active_admin/components/_pagination.scss +34 -0
data/app/assets/stylesheets/active_admin/components/_panels.scss +6 -0
data/app/assets/stylesheets/active_admin/components/_scopes.scss +10 -0
data/app/assets/stylesheets/active_admin/components/_status_tags.scss +12 -0
data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss +101 -0
data/app/assets/stylesheets/active_admin/components/_tables.css.scss +43 -2
data/app/assets/stylesheets/active_admin/mixins/_all.css.scss +2 -1
data/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss +50 -13
data/app/assets/stylesheets/active_admin/mixins/_gradients.css.scss +9 -1
data/app/assets/stylesheets/active_admin/mixins/_sections.css.scss +7 -5
data/app/assets/stylesheets/active_admin/mixins/_shadows.css.scss +1 -0
data/app/assets/stylesheets/active_admin/mixins/_typography.scss +3 -0
data/app/assets/stylesheets/active_admin/mixins/_utilities.scss +9 -0
data/app/assets/stylesheets/active_admin/mixins/_variables.css.scss +1 -0
data/app/assets/stylesheets/active_admin/pages/_dashboard.scss +5 -0
data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +44 -0
data/app/assets/stylesheets/active_admin/structure/_footer.scss +14 -0
data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +26 -0
data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +44 -0
data/app/views/active_admin/devise/passwords/edit.html.erb +1 -1
data/app/views/active_admin/devise/passwords/new.html.erb +1 -1
data/app/views/active_admin/devise/sessions/new.html.erb +1 -1
data/app/views/active_admin/devise/shared/_links.erb +1 -1
data/app/views/active_admin/devise/unlocks/new.html.erb +1 -1
data/app/views/active_admin/page/index.html.arb +1 -0
data/app/views/layouts/active_admin_logged_out.html.erb +2 -2
data/cucumber.yml +3 -2
data/docs/1-general-configuration.md +46 -10
data/docs/6-show-screens.md +7 -0
data/docs/8-custom-actions.md +12 -2
data/docs/9-custom-pages.md +84 -0
data/features/belongs_to.feature +27 -0
data/features/comments/commenting.feature +3 -2
data/features/dashboard.feature +18 -0
data/features/development_reloading.feature +43 -0
data/features/index/filter_with_check_boxes.feature +25 -0
data/features/index/index_as_table.feature +14 -0
data/features/index/index_scopes.feature +59 -0
data/features/index/pagination.feature +19 -1
data/features/menu.feature +22 -2
data/features/registering_assets.feature +2 -2
data/features/registering_pages.feature +66 -0
data/features/specifying_actions.feature +5 -0
data/features/step_definitions/action_item_steps.rb +2 -6
data/features/step_definitions/action_link_steps.rb +7 -0
data/features/step_definitions/additional_web_steps.rb +11 -3
data/features/step_definitions/asset_steps.rb +5 -1
data/features/step_definitions/breadcrumb_steps.rb +5 -0
data/features/step_definitions/comment_steps.rb +3 -3
data/features/step_definitions/configuration_steps.rb +69 -13
data/features/step_definitions/dashboard_steps.rb +7 -3
data/features/step_definitions/factory_steps.rb +9 -2
data/features/step_definitions/flash_steps.rb +9 -1
data/features/step_definitions/format_steps.rb +9 -1
data/features/step_definitions/index_scope_steps.rb +18 -6
data/features/step_definitions/member_link_steps.rb +7 -0
data/features/step_definitions/pagination_steps.rb +2 -2
data/features/step_definitions/site_title_steps.rb +15 -0
data/features/step_definitions/tab_steps.rb +1 -1
data/features/step_definitions/user_steps.rb +1 -1
data/features/step_definitions/web_steps.rb +4 -4
data/features/support/paths.rb +6 -0
data/features/users/logging_out.feature +11 -0
data/lib/active_admin.rb +26 -10
data/lib/active_admin/application.rb +64 -22
data/lib/active_admin/arbre.rb +0 -1
data/lib/active_admin/arbre/builder.rb +8 -5
data/lib/active_admin/arbre/context.rb +1 -1
data/lib/active_admin/arbre/html/attributes.rb +1 -1
data/lib/active_admin/arbre/html/class_list.rb +0 -4
data/lib/active_admin/arbre/html/collection.rb +2 -2
data/lib/active_admin/arbre/html/document.rb +1 -1
data/lib/active_admin/arbre/html/element.rb +19 -9
data/lib/active_admin/arbre/html/tag.rb +3 -3
data/lib/active_admin/arbre/html/text_node.rb +2 -2
data/lib/active_admin/asset_registration.rb +15 -2
data/lib/active_admin/base_controller.rb +61 -0
data/lib/active_admin/{resource_controller → base_controller}/menu.rb +1 -1
data/lib/active_admin/callbacks.rb +16 -18
data/lib/active_admin/comments.rb +48 -54
data/lib/active_admin/comments/comment.rb +13 -2
data/lib/active_admin/comments/namespace_helper.rb +1 -1
data/lib/active_admin/comments/views/active_admin_comments.rb +7 -3
data/lib/active_admin/dashboards.rb +4 -0
data/lib/active_admin/dashboards/dashboard_controller.rb +21 -5
data/lib/active_admin/dsl.rb +6 -159
data/lib/active_admin/event.rb +5 -3
data/lib/active_admin/filter_form_builder.rb +53 -0
data/lib/active_admin/form_builder.rb +25 -19
data/lib/active_admin/helpers/settings.rb +6 -10
data/lib/active_admin/inputs.rb +14 -0
data/lib/active_admin/inputs/datepicker_input.rb +11 -0
data/lib/active_admin/inputs/filter_base.rb +46 -0
data/lib/active_admin/inputs/filter_check_boxes_input.rb +40 -0
data/lib/active_admin/inputs/filter_date_range_input.rb +34 -0
data/lib/active_admin/inputs/filter_numeric_input.rb +55 -0
data/lib/active_admin/inputs/filter_select_input.rb +23 -0
data/lib/active_admin/inputs/filter_string_input.rb +22 -0
data/lib/active_admin/locales/ca.yml +44 -0
data/lib/active_admin/locales/cs.yml +14 -10
data/lib/active_admin/locales/de.yml +44 -0
data/lib/active_admin/locales/en.yml +5 -0
data/lib/active_admin/locales/hr.yml +40 -0
data/lib/active_admin/locales/hu.yml +45 -0
data/lib/active_admin/locales/it.yml +11 -6
data/lib/active_admin/locales/ko.yml +40 -0
data/lib/active_admin/locales/lv.yml +43 -0
data/lib/active_admin/locales/nl.yml +40 -0
data/lib/active_admin/locales/no-NB.yml +40 -0
data/lib/active_admin/locales/pl.yml +7 -1
data/lib/active_admin/locales/pt-BR.yml +6 -2
data/lib/active_admin/menu_item.rb +25 -17
data/lib/active_admin/namespace.rb +48 -33
data/lib/active_admin/page.rb +65 -0
data/lib/active_admin/page_controller.rb +15 -0
data/lib/active_admin/page_dsl.rb +21 -0
data/lib/active_admin/page_presenter.rb +30 -0
data/lib/active_admin/reloader.rb +109 -42
data/lib/active_admin/resource.rb +38 -44
data/lib/active_admin/resource/action_items.rb +5 -0
data/lib/active_admin/resource/belongs_to.rb +4 -2
data/lib/active_admin/resource/controllers.rb +35 -0
data/lib/active_admin/resource/menu.rb +1 -2
data/lib/active_admin/resource/naming.rb +53 -31
data/lib/active_admin/resource/page_presenters.rb +28 -0
data/lib/active_admin/resource/scopes.rb +16 -3
data/lib/active_admin/resource/sidebars.rb +4 -0
data/lib/active_admin/resource_collection.rb +88 -0
data/lib/active_admin/resource_controller.rb +18 -54
data/lib/active_admin/resource_controller/action_builder.rb +1 -1
data/lib/active_admin/resource_controller/actions.rb +8 -8
data/lib/active_admin/resource_controller/callbacks.rb +1 -1
data/lib/active_admin/resource_controller/collection.rb +8 -4
data/lib/active_admin/resource_controller/filters.rb +1 -1
data/lib/active_admin/resource_controller/resource_class_methods.rb +24 -0
data/lib/active_admin/resource_controller/scoping.rb +1 -1
data/lib/active_admin/resource_controller/sidebars.rb +1 -1
data/lib/active_admin/resource_dsl.rb +157 -0
data/lib/active_admin/router.rb +21 -14
data/lib/active_admin/scope.rb +15 -3
data/lib/active_admin/version.rb +1 -1
data/lib/active_admin/view_factory.rb +4 -3
data/lib/active_admin/view_helpers/auto_link_helper.rb +1 -10
data/lib/active_admin/view_helpers/breadcrumb_helper.rb +25 -21
data/lib/active_admin/view_helpers/filter_form_helper.rb +0 -150
data/lib/active_admin/views/components/attributes_table.rb +1 -1
data/lib/active_admin/views/components/columns.rb +4 -4
data/lib/active_admin/views/components/paginated_collection.rb +42 -13
data/lib/active_admin/views/components/panel.rb +8 -0
data/lib/active_admin/views/components/scopes.rb +24 -18
data/lib/active_admin/views/components/status_tag.rb +6 -5
data/lib/active_admin/views/components/table_for.rb +6 -2
data/lib/active_admin/views/header_renderer.rb +31 -12
data/lib/active_admin/views/index_as_block.rb +2 -2
data/lib/active_admin/views/index_as_blog.rb +3 -3
data/lib/active_admin/views/index_as_grid.rb +4 -4
data/lib/active_admin/views/index_as_table.rb +13 -6
data/lib/active_admin/views/pages/base.rb +4 -4
data/lib/active_admin/views/pages/form.rb +49 -0
data/lib/active_admin/views/pages/index.rb +18 -6
data/lib/active_admin/views/pages/page.rb +24 -0
data/lib/active_admin/views/pages/show.rb +1 -1
data/lib/generators/active_admin/assets/assets_generator.rb +19 -1
data/lib/generators/active_admin/install/templates/active_admin.rb.erb +38 -12
data/lib/generators/active_admin/install/templates/dashboards.rb +6 -0
data/script/use_rails +14 -7
data/spec/spec_helper.rb +9 -14
data/spec/spec_helper_without_rails.rb +10 -0
data/spec/support/detect_rails_version.rb +22 -3
data/spec/support/integration_example_group.rb +5 -7
data/spec/support/rails_template.rb +11 -0
data/spec/support/rails_template_with_data.rb +25 -0
data/spec/support/templates/cucumber_with_reloading.rb +5 -0
data/spec/unit/active_admin_spec.rb +8 -0
data/spec/unit/application_spec.rb +48 -2
data/spec/unit/arbre/context_spec.rb +1 -1
data/spec/unit/arbre/html/element_finder_methods_spec.rb +58 -2
data/spec/unit/arbre/html/element_spec.rb +18 -5
data/spec/unit/arbre/html/tag_attributes_spec.rb +3 -3
data/spec/unit/arbre/html/tag_spec.rb +1 -1
data/spec/unit/arbre/html_spec.rb +32 -22
data/spec/unit/asset_registration_spec.rb +9 -3
data/spec/unit/auto_link_spec.rb +2 -2
data/spec/unit/base_controller_shared_examples.rb +28 -0
data/spec/unit/base_controller_spec.rb +8 -0
data/spec/unit/belongs_to_spec.rb +30 -33
data/spec/unit/comments_spec.rb +45 -15
data/spec/unit/config_shared_examples.rb +119 -0
data/spec/unit/dashboard_controller_spec.rb +44 -0
data/spec/unit/event_spec.rb +6 -0
data/spec/unit/filter_form_builder_spec.rb +9 -0
data/spec/unit/form_builder_spec.rb +8 -14
data/spec/unit/menu_item_spec.rb +25 -20
data/spec/unit/namespace/register_page_spec.rb +102 -0
data/spec/unit/namespace/register_resource_spec.rb +188 -0
data/spec/unit/namespace_spec.rb +11 -183
data/spec/unit/page_controller_spec.rb +8 -0
data/spec/unit/page_spec.rb +60 -0
data/spec/unit/reloader_spec.rb +82 -38
data/spec/unit/resource/menu_spec.rb +1 -51
data/spec/unit/resource/naming_spec.rb +25 -20
data/spec/unit/resource/page_presenters_spec.rb +32 -0
data/spec/unit/resource/scopes_spec.rb +13 -0
data/spec/unit/resource_collection_spec.rb +101 -0
data/spec/unit/resource_controller_spec.rb +40 -32
data/spec/unit/{registration_spec.rb → resource_registration_spec.rb} +0 -0
data/spec/unit/resource_spec.rb +8 -24
data/spec/unit/routing_spec.rb +50 -1
data/spec/unit/scope_spec.rb +18 -4
data/spec/unit/views/components/paginated_collection_spec.rb +163 -0
data/spec/unit/views/components/panel_spec.rb +9 -0
data/spec/unit/views/components/status_tag_spec.rb +9 -0
data/spec/unit/views/tabbed_navigation_spec.rb +2 -1
data/tasks/test.rake +44 -26
metadata +176 -69
data/app/assets/javascripts/active_admin/vendor.js +0 -382
data/lib/active_admin/arbre/core_extensions.rb +0 -5
data/lib/active_admin/comments/configuration.rb +0 -18
data/lib/active_admin/page_config.rb +0 -15
data/lib/active_admin/resource_controller/form.rb +0 -42
data/lib/active_admin/resource_controller/page_configurations.rb +0 -53
data/lib/active_admin/views/pages/edit.rb +0 -28
data/lib/active_admin/views/pages/new.rb +0 -28
data/lib/generators/active_admin/assets/templates/3.0/active_admin.js +0 -427
data/spec/integration/belongs_to_spec.rb +0 -42

data/lib/active_admin/arbre.rb CHANGED

@@ -1,5 +1,4 @@
 require "active_admin/arbre/builder"
-require "active_admin/arbre/core_extensions"
 require "active_admin/arbre/context"
 require "active_admin/arbre/html/element"
 require "active_admin/arbre/html/attributes"

data/lib/active_admin/arbre/builder.rb CHANGED

@@ -65,7 +65,7 @@ module Arbre
           # Render the blocks contents
           if block_given?
             with_current_dom_context tag do
-              insert_text_node_if_string(yield)
+              append_return_block(yield)
             end
           end
         end
@@ -98,10 +98,13 @@ module Arbre
       end
       alias_method :within, :with_current_dom_context
-      # Inserts a text node if the tag is a string
-      def insert_text_node_if_string(tag)
-        if tag.is_a?(String)
-          current_dom_context << Arbre::HTML::TextNode.from_string(tag)
+      # Appends the value to the current DOM element if there are no
+      # existing DOM Children and it responds to #to_s
+      def append_return_block(tag)
+        return nil if current_dom_context.children?
+        if !tag.is_a?(Arbre::HTML::Element) && tag.respond_to?(:to_s)
+          current_dom_context << Arbre::HTML::TextNode.from_string(tag.to_s)
         end
       end
     end

data/lib/active_admin/arbre/context.rb CHANGED

@@ -35,7 +35,7 @@ module Arbre
       if defined?(@cached_html)
         @cached_html
       else
-        html = to_html
+        html = to_s
         @cached_html = html if html.length > 0
         html
       end

data/lib/active_admin/arbre/html/attributes.rb CHANGED

@@ -3,7 +3,7 @@ module Arbre
     class Attributes < Hash
-      def to_html
+      def to_s
         self.collect do |name, value|
           "#{html_escape(name)}=\"#{html_escape(value)}\""
         end.join(" ")

data/lib/active_admin/arbre/html/class_list.rb CHANGED

@@ -15,10 +15,6 @@ module Arbre
       alias :<< :add
       def to_s
-        to_html
-      end
-      def to_html
         to_a.join(" ")
       end

data/lib/active_admin/arbre/html/collection.rb CHANGED

@@ -16,9 +16,9 @@ module Arbre
         self.class.new(super)
       end
-      def to_html
+      def to_s
         self.collect do |element|
-          element.to_html
+          element.to_s
         end.join.html_safe
       end
     end

data/lib/active_admin/arbre/html/document.rb CHANGED

@@ -21,7 +21,7 @@ module Arbre
         '<!DOCTYPE html>'.html_safe
       end
-      def to_html
+      def to_s
         doctype + super
       end

data/lib/active_admin/arbre/html/element.rb CHANGED

@@ -35,7 +35,7 @@ module Arbre
       def build(*args, &block)
         # Render the block passing ourselves in
-        insert_text_node_if_string(block.call(self)) if block
+        append_return_block(block.call(self)) if block
       end
       def add_child(child)
@@ -70,6 +70,10 @@ module Arbre
         add_child(child)
       end
+      def children?
+        @children.any?
+      end
       def parent=(parent)
         @parent = parent
       end
@@ -97,12 +101,22 @@ module Arbre
       end
       alias_method :find_by_tag, :get_elements_by_tag_name
+      def get_elements_by_class_name(class_name)
+        elements = Collection.new
+        children.each do |child|
+          elements << child if child.class_list =~ /#{class_name}/
+          elements.concat(child.get_elements_by_tag_name(tag_name))
+        end
+        elements
+      end
+      alias_method :find_by_class, :get_elements_by_class_name
       def content
-        children.to_html
+        children.to_s
       end
       def html_safe
-        to_html
+        to_s
       end
       def indent_level
@@ -110,18 +124,14 @@ module Arbre
       end
       def each(&block)
-        [to_html].each(&block)
-      end
-      def to_s
-        to_html
+        [to_s].each(&block)
       end
       def to_str
         to_s
       end
-      def to_html
+      def to_s
         content
       end

data/lib/active_admin/arbre/html/tag.rb CHANGED

@@ -65,14 +65,14 @@ module Arbre
       # Returns a string of classes
       def class_names
-        class_list.to_html
+        class_list.to_s
       end
       def class_list
         get_attribute(:class) || set_attribute(:class, ClassList.new)
       end
-      def to_html
+      def to_s
         indent("<#{tag_name}#{attributes_html}>", content, "</#{tag_name}>").html_safe
       end
@@ -118,7 +118,7 @@ module Arbre
       def attributes_html
-        attributes.any? ? " " + attributes.to_html : nil
+        attributes.any? ? " " + attributes.to_s : nil
       end
       def set_for_attribute(record)

data/lib/active_admin/arbre/html/text_node.rb CHANGED

@@ -26,8 +26,8 @@ module Arbre
         nil
       end
-      def to_html
-        ERB::Util.html_escape(@content.to_html)
+      def to_s
+        ERB::Util.html_escape(@content.to_s)
       end
     end

data/lib/active_admin/asset_registration.rb CHANGED

@@ -3,8 +3,8 @@ module ActiveAdmin
     # Stylesheets
-    def register_stylesheet(name)
-      stylesheets << name
+    def register_stylesheet(*args)
+      stylesheets << ActiveAdmin::Stylesheet.new(*args)
     end
     def stylesheets
@@ -31,4 +31,17 @@ module ActiveAdmin
     end
   end
+  # Wrapper class for stylesheet registration
+  class Stylesheet
+    attr_reader :options, :path
+    def initialize(*args)
+      @options = args.extract_options!
+      @path = args.first if args.first
+    end
+  end
 end

data/lib/active_admin/base_controller.rb ADDED

@@ -0,0 +1,61 @@
+require 'inherited_resources'
+require 'active_admin/base_controller/menu'
+module ActiveAdmin
+  # BaseController for ActiveAdmin.
+  # It implements ActiveAdmin controllers core features.
+  class BaseController < ::InheritedResources::Base
+    helper ::ActiveAdmin::ViewHelpers
+    layout 'active_admin'
+    before_filter :only_render_implemented_actions
+    before_filter :authenticate_active_admin_user
+    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
+    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
+    include Menu
+    private
+    # Calls the authentication method as defined in ActiveAdmin.authentication_method
+    def authenticate_active_admin_user
+      send(active_admin_namespace.authentication_method) if active_admin_namespace.authentication_method
+    end
+    def current_active_admin_user
+      send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
+    end
+    helper_method :current_active_admin_user
+    def current_active_admin_user?
+      !current_active_admin_user.nil?
+    end
+    helper_method :current_active_admin_user?
+    def active_admin_config
+      self.class.active_admin_config
+    end
+    helper_method :active_admin_config
+    def active_admin_namespace
+      active_admin_config.namespace
+    end
+    helper_method :active_admin_namespace
+  end
+end

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

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

data/lib/active_admin/callbacks.rb CHANGED

@@ -2,25 +2,23 @@ module ActiveAdmin
   module Callbacks
     extend ActiveSupport::Concern
-    module InstanceMethods
-      protected
+    protected
-      # Simple callback system. Implements before and after callbacks for
-      # use within the controllers.
-      #
-      # We didn't use the ActiveSupport callbacks becuase they do not support
-      # passing in any arbitrary object into the callback method (which we
-      # need to do)
-      def call_callback_with(method, *args)
-        case method
-        when Symbol
-          send(method, *args)
-        when Proc
-          instance_exec(*args, &method)
-        else
-          raise "Please register with callbacks using a symbol or a block/proc."
-        end
+    # Simple callback system. Implements before and after callbacks for
+    # use within the controllers.
+    #
+    # We didn't use the ActiveSupport callbacks becuase they do not support
+    # passing in any arbitrary object into the callback method (which we
+    # need to do)
+    def call_callback_with(method, *args)
+      case method
+      when Symbol
+        send(method, *args)
+      when Proc
+        instance_exec(*args, &method)
+      else
+        raise "Please register with callbacks using a symbol or a block/proc."
       end
     end

data/lib/active_admin/comments.rb CHANGED

@@ -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.'