Move shared behavior to Config.

Author: pcreux

lib/active_admin/config.rb

@@ -1,9 +1,16 @@
+module ActiveAdmin
+  class Config; end
+end
+
+require 'active_admin/config/naming'
+require 'active_admin/config/menu'
+
 module ActiveAdmin
   class Config
     # Returns a properly formatted controller name for this
     # config within its namespace
     def controller_name
-      [namespace.module_name, camelized_resource_name + "Controller"].compact.join('::')
+      [namespace.module_name, plural_underscored_resource_name.camelize + "Controller"].compact.join('::')
     end
 
     # Returns the controller for this config
@@ -30,5 +37,23 @@ def route_collection_path
       route.compact.join('_').to_sym
     end
 
+    include Menu
+    include Naming
+
+    def belongs_to?
+      false
+    end
+
+    def comments?
+      false
+    end
+
+    def action_items?
+      !!@action_items && @action_items.any?
+    end
+
+    def sidebar_sections?
+      !!@sidebar_sections && @sidebar_sections.any?
+    end
   end
 end

lib/active_admin/resource/menu.rb renamed to lib/active_admin/config/menu.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class Resource < Config
+  class Config
     module Menu
 
       # Set the menu options. To not add this resource to the menu, just

lib/active_admin/config/naming.rb

@@ -0,0 +1,15 @@
+module ActiveAdmin
+  class Config
+    module Naming
+      # A camelized safe representation for this resource
+      def camelized_resource_name
+        underscored_resource_name.camelize
+      end
+
+      # Returns the plural and underscored version of this resource. Useful for element id's.
+      def plural_underscored_resource_name
+        plural_resource_name.underscore.gsub(/\s/, '_')
+      end
+    end
+  end
+end

lib/active_admin/page.rb

@@ -9,48 +9,21 @@ def initialize(namespace, name, options)
       @page_configs = {}
     end
 
-    # Returns a properly formatted controller name for this
-    # resource within its namespace
-    def controller_name
-      [namespace.module_name, camelized_resource_name + "Controller"].compact.join('::')
-    end
-
-    # For Menu#include_in_menu?
-    def belongs_to?
-      false
-    end
-
-    # For Menu#menu_item_name
+    # plural_resource_name is singular
     def plural_resource_name
       name
     end
 
-    include ActiveAdmin::Resource::Menu
-
-    # ############## Naming ###################
-    def underscored_resource_name
-      name.gsub(' ', '').underscore
-    end
-
-    # From Naming.
-    def camelized_resource_name
-      underscored_resource_name.camelize
-    end
-    # ############## Naming ###################
-
-    # ############# From Resource.
-    def comments?
-      false
-    end
-
-    # From Resource::ActionItems
-    def action_items_for(action)
-      []
+    # Overwrite Naming defaults as they require a resource object.
+    # @todo Refactor Naming to remove the dependency with Resources
+    def resource_name
+      name
     end
 
-    # From Resource::Sidebars
-    def sidebar_sections_for(action)
-      []
+    # Overwrite Naming defaults as they require a resource object.
+    # @todo Refactor Naming to remove the dependency with Resources
+    def underscored_resource_name
+      resource_name.underscore
     end
   end
 end

lib/active_admin/resource.rb

@@ -1,5 +1,4 @@
 require 'active_admin/resource/action_items'
-require 'active_admin/resource/menu'
 require 'active_admin/resource/naming'
 require 'active_admin/resource/scopes'
 require 'active_admin/resource/sidebars'
@@ -65,7 +64,6 @@ def initialize(namespace, resource, options = {})
 
     include Base
     include ActionItems
-    include Menu
     include Naming
     include Scopes
     include Sidebars
@@ -75,11 +73,6 @@ def resource_table_name
       resource.quoted_table_name
     end
 
-    # Returns a properly formatted controller name for this
-    # resource within its namespace
-    def controller_name
-      [namespace.module_name, camelized_resource_name.pluralize + "Controller"].compact.join('::')
-    end
 
     # Returns the named route for an instance of this resource
     def route_instance_path

lib/active_admin/resource/naming.rb

@@ -1,7 +1,6 @@
 module ActiveAdmin
   class Resource < Config
     module Naming
-
       # An underscored safe representation internally for this resource
       def underscored_resource_name
         @underscored_resource_name ||= if @options[:as]
@@ -11,11 +10,6 @@ def underscored_resource_name
         end
       end
 
-      # A camelized safe representation for this resource
-      def camelized_resource_name
-        underscored_resource_name.camelize
-      end
-
       # Returns the name to call this resource.
       # By default will use resource.model_name.human
       def resource_name
@@ -40,11 +34,6 @@ def plural_resource_name
           end
         end
       end
-      
-      # Returns the plural and underscored version of this resource. Useful for element id's.
-      def plural_underscored_resource_name
-        plural_resource_name.underscore.gsub(/\s/, '_')
-      end
     end
   end
 end

lib/active_admin/views/pages/base.rb

@@ -86,7 +86,7 @@ def build_title_tag
         end
 
         def build_action_items
-          if active_admin_config
+          if active_admin_config && active_admin_config.action_items?
             items = active_admin_config.action_items_for(params[:action])
             insert_tag view_factory.action_items, items
           end
@@ -134,7 +134,7 @@ def set_page_title
 
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
-          if active_admin_config
+          if active_admin_config && active_admin_config.sidebar_sections?
             active_admin_config.sidebar_sections_for(params[:action])
           else
             []

spec/unit/config_shared_examples.rb

@@ -5,11 +5,14 @@
     end
   end
 
-  it { respond_to :belongs_to? }
-
   it { respond_to :controller_name }
   it { respond_to :controller }
   it { respond_to :route_prefix }
   it { respond_to :route_collection_path }
+  it { respond_to :comments? }
+  it { respond_to :belongs_to? }
+  it { respond_to :comments? }
+  it { respond_to :action_items? }
+  it { respond_to :sidebar_sections? }
 
 end

spec/unit/page_spec.rb

@@ -25,5 +25,40 @@ def config(options = {})
         end
       end
     end
+
+    describe "#resource_name" do
+      it "returns the name" do
+        config.resource_name.should == "Status"
+      end
+    end
+
+    describe "#plural_resource_name" do
+      it "returns the singular name" do
+        config.plural_resource_name.should == "Status"
+      end
+    end
+
+    describe "#underscored_resource_name" do
+      it "returns the underscored name" do
+        config.underscored_resource_name.should == "status"
+      end
+    end
+
+    it "should not belong_to anything" do
+      config.belongs_to?.should == false
+    end
+
+    it "should not have comments" do
+      config.comments?.should == false
+    end
+
+    it "should not have any action_items" do
+      config.action_items?.should == false
+    end
+
+    it "should not have any sidebar_sections" do
+      config.sidebar_sections?.should == false
+    end
+
   end
 end