activeadmin 0.4.4 → 0.5.0.pre

data/lib/active_admin/page.rb

@@ -35,24 +35,29 @@ module ActiveAdmin
     include Resource::Menu
     include Resource::Naming
 
-    # plural_resource_name is singular
-    def resource_name
+    # label is singular
+    def plural_resource_label
       name
     end
 
-    def safe_resource_name
-      name
+    def resource_name
+      @resource_name ||= Resource::Name.new(nil, name)
+    end
+
+    def underscored_resource_name
+      resource_name.parameterize.underscore
     end
 
+    def camelized_resource_name
+      underscored_resource_name.camelize
+    end
 
-    # Force plural to be singular
-    def plural_resource_name
-      name
+    def default_menu_options
+      super.merge(:id => resource_name)
     end
 
-    # Force plural to be singular
-    def plural_safe_resource_name
-      name
+    def controller_name
+      [namespace.module_name, camelized_resource_name + "Controller"].compact.join('::')
     end
 
     def belongs_to?

data/lib/active_admin/resource.rb

@@ -47,6 +47,9 @@ module ActiveAdmin
     # Set the configuration for the CSV
     attr_writer :csv_builder
 
+    # Store a reference to the DSL so that we can dereference it during garbage collection.
+    attr_accessor :dsl
+
     module Base
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
@@ -109,6 +112,11 @@ module ActiveAdmin
       @collection_actions = []
     end
 
+    # Return only defined resource actions
+    def defined_actions
+      controller.instance_methods.map { |m| m.to_sym } & ResourceController::ACTIVE_ADMIN_ACTIONS
+    end
+
     # Are admin notes turned on for this resource
     def admin_notes?
       admin_notes.nil? ? ActiveAdmin.admin_notes : admin_notes
@@ -155,5 +163,6 @@ module ActiveAdmin
     def default_csv_builder
       @default_csv_builder ||= CSVBuilder.default_for_resource(resource_class)
     end
+    
   end # class Resource
 end # module ActiveAdmin

data/lib/active_admin/resource/action_items.rb

@@ -54,23 +54,23 @@ module ActiveAdmin
         # New Link on all actions except :new and :show
         add_action_item :except => [:new, :show] do
           if controller.action_methods.include?('new')
-            link_to(I18n.t('active_admin.new_model', :model => active_admin_config.resource_name), new_resource_path)
+            link_to(I18n.t('active_admin.new_model', :model => active_admin_config.resource_label), new_resource_path)
           end
         end
 
         # Edit link on show
         add_action_item :only => :show do
           if controller.action_methods.include?('edit')
-            link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_name), edit_resource_path(resource))
+            link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_label), edit_resource_path(resource))
           end
         end
 
         # Destroy link on show
         add_action_item :only => :show do
           if controller.action_methods.include?("destroy")
-            link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_name),
+            link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_label),
               resource_path(resource),
-              :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'))
+              :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')})
           end
         end
       end

data/lib/active_admin/resource/controllers.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
       # Returns a properly formatted controller name for this
       # config within its namespace
       def controller_name
-        [namespace.module_name, plural_camelized_resource_name + "Controller"].compact.join('::')
+        [namespace.module_name, resource_name.plural.camelize + "Controller"].compact.join('::')
       end
 
       # Returns the controller for this config

data/lib/active_admin/resource/menu.rb

@@ -5,38 +5,36 @@ module ActiveAdmin
       # Set the menu options. To not add this resource to the menu, just
       # call #menu(false)
       def menu(options = {})
-        options = options == false ? { :display => false } : options
-        @menu_options = options
+        if options == false
+          @display_menu = false
+        else
+          options = default_menu_options.merge(options)
+          @parent_menu_item = options.delete(:parent)
+          @menu_item = MenuItem.new(default_menu_options.merge(options))
+        end
       end
 
-      # The options to use for the menu
-      def menu_options
-        @menu_options ||= {}
+      def menu_item
+        @menu_item ||= MenuItem.new(default_menu_options)
       end
 
-      # Returns the name to put this resource under in the menu
       def parent_menu_item_name
-        menu_options[:parent]
+        return nil unless @parent_menu_item
+        ActiveAdmin::Resource::Name.new(nil, @parent_menu_item)
       end
 
-      # Returns the name to be displayed in the menu for this resource
-      def menu_item_name
-        menu_options[:label] || plural_resource_name
-      end
-
-      # Returns the items priority for altering the default sort order
-      def menu_item_priority
-        menu_options[:priority] || 10
-      end
-
-      # Returns a proc for deciding whether to display the menu item or not in the view
-      def menu_item_display_if
-        menu_options[:if] || proc { true }
+      # The default menu options to pass through to MenuItem.new
+      def default_menu_options
+        {
+          :id => resource_name.plural,
+          :label => proc{ plural_resource_label },
+          :url => route_collection_path
+        }
       end
 
       # Should this resource be added to the menu system?
       def include_in_menu?
-        menu_options[:display] != false
+        @display_menu != false
       end
 
     end

data/lib/active_admin/resource/naming.rb

@@ -1,72 +1,82 @@
 module ActiveAdmin
   class Resource
+
     module Naming
-      # Returns the user facing name. Example: "Bank Account"
-      def resource_name
-        @resource_name ||= @options[:as]
-        @resource_name ||= singular_human_name
-        @resource_name ||= safe_resource_name
-      end
 
-      # Returns the plural version of the user facing name. Example: "Bank Accounts"
-      def plural_resource_name
-        @plural_resource_name ||= @options[:as].pluralize if @options[:as]
-        @plural_resource_name ||= plural_human_name
-        @plural_resource_name ||= resource_name.pluralize
+      # Returns a name used to uniquely identify this resource
+      # this should be an instance of ActiveAdmin:Resource::Name, which responds to
+      # #singular, #plural, #route_key, #human etc.
+      def resource_name
+        custom_name = @options[:as] && @options[:as].gsub(/\s/,'')
+        @resource_name ||= if custom_name || !resource_class.respond_to?(:model_name)
+            Resource::Name.new(resource_class, custom_name)
+          else
+            Resource::Name.new(resource_class)
+          end
       end
 
-      # A name used internally to uniquely identify this resource
-      def resource_key
-        camelized_resource_name
+      # Returns the name to call this resource such as "Bank Account"
+      def resource_label
+        if @options[:as]
+          @options[:as]
+        else
+           resource_name.human(:default => resource_name.gsub('::', ' ').titleize)
+         end
       end
 
-      def safe_resource_name
-        @safe_resource_name ||= @options[:as]
-        @safe_resource_name ||= resource_class.name.gsub('::',' ')
+      # Returns the plural version of this resource such as "Bank Accounts"
+      def plural_resource_label
+        if @options[:as]
+          @options[:as].pluralize
+        else
+          resource_name.human(:count => 1.1, :default => resource_label.pluralize.titleize)
+        end
       end
+    end
 
-      def plural_safe_resource_name
-        safe_resource_name.pluralize
-      end
+    # A subclass of ActiveModel::Name which supports the different APIs presented
+    # in Rails < 3.1 and > 3.1.
+    class Name < ActiveModel::Name
 
-      # A camelized safe representation for this resource
-      def camelized_resource_name
-        safe_resource_name.titleize.gsub(' ', '')
+      def initialize(klass, name = nil)
+        if ActiveModel::Name.instance_method(:initialize).arity == 1
+          super(proxy_for_initializer(klass, name))
+        else
+          super(klass, nil, name)
+        end
       end
 
-      def plural_camelized_resource_name
-        plural_safe_resource_name.titleize.gsub(' ', '')
-      end
+      def proxy_for_initializer(klass, name)
+        return klass unless name
+        return StringClassProxy.new(klass, name) if klass
 
-      # An underscored safe representation internally for this resource
-      def underscored_resource_name
-        camelized_resource_name.underscore
+        StringProxy.new(name)
       end
 
-      # Returns the plural and underscored version of this resource. Useful for element id's.
-      def plural_underscored_resource_name
-        plural_camelized_resource_name.underscore
+      def route_key
+        plural
       end
 
+      class StringProxy
+        def initialize(name)
+          @name = name
+        end
 
-      private
-
-      # @return [String] Titleized human name via ActiveRecord I18n or nil
-      def singular_human_name
-        return nil unless resource_class.respond_to?(:model_name)
-        resource_class.model_name.human.titleize
+        def name
+          @name
+        end
       end
 
-      # @return [String] Titleized plural human name via ActiveRecord I18n or nil
-      def plural_human_name
-        return nil unless resource_class.respond_to?(:model_name)
+      class StringClassProxy < StringProxy
+        delegate :lookup_ancestors, :i18n_scope, :to => :"@klass"
 
-        begin
-          I18n.translate!("activerecord.models.#{resource_class.model_name.underscore}.other").titleize
-        rescue I18n::MissingTranslationData
-          nil
+        def initialize(klass, name)
+          @klass = klass || name
+          super(name)
         end
       end
+
     end
+
   end
 end

data/lib/active_admin/resource/sidebars.rb

@@ -5,11 +5,6 @@ module ActiveAdmin
   class Resource
     module Sidebars
 
-      def initialize(*args)
-        super
-        add_default_sidebar_sections
-      end
-
       def sidebar_sections
         @sidebar_sections ||= []
       end
@@ -26,14 +21,6 @@ module ActiveAdmin
         !!@sidebar_sections && @sidebar_sections.any?
       end
 
-      private
-
-      def add_default_sidebar_sections
-        self.sidebar_sections << ActiveAdmin::SidebarSection.new(:filters, :only => :index) do
-          active_admin_filters_form_for assigns["search"], filters_config
-        end
-      end
-
     end
   end
 

data/lib/active_admin/resource_collection.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
   # Holds on to a collection of Resources. Is an Enumerable object
   # so it has some Array like qualities.
   #
-  # Adding a resource assumes that the object responds to #resource_key
+  # Adding a resource assumes that the object responds to #resource_name
   class ResourceCollection
     include Enumerable
 
@@ -13,19 +13,19 @@ module ActiveAdmin
       @resource_hash = {}
     end
 
-    # Add a new resource to the collection. If the resource_key already
+    # Add a new resource to the collection. If the resource_name already
     # exists, the exiting resource is returned.
     #
     # @param [Resource, Page] resource The resource to add to the collection
     #
     # @returns [Resource, Page] Either the existing resource or the new one
     def add(resource)
-      if has_key?(resource.resource_key)
-        existing_resource = find_by_key(resource.resource_key)
+      if has_key?(resource.resource_name)
+        existing_resource = find_by_key(resource.resource_name)
         ensure_resource_classes_match!(existing_resource, resource)
         existing_resource
       else
-        @resource_hash[resource.resource_key] = resource
+        @resource_hash[resource.resource_name] = resource
       end
     end
 
@@ -45,13 +45,13 @@ module ActiveAdmin
     end
 
     # @returns [Boolean] If the key has been registered in the collection
-    def has_key?(resource_key)
-      @resource_hash.has_key?(resource_key)
+    def has_key?(resource_name)
+      @resource_hash.has_key?(resource_name)
     end
 
     # Finds a resource by a given key
-    def find_by_key(resource_key)
-      @resource_hash[resource_key]
+    def find_by_key(resource_name)
+      @resource_hash[resource_name]
     end
 
     # Finds a resource based on it's class. Looks up the class Heirarchy if its
@@ -80,7 +80,7 @@ module ActiveAdmin
 
       if existing_resource.resource_class != resource.resource_class
         raise ActiveAdmin::ResourceMismatchError, 
-          "Tried to register #{resource.resource_class} as #{resource.resource_key} but already registered to #{existing_resource.resource_class}"
+          "Tried to register #{resource.resource_class} as #{resource.resource_name} but already registered to #{existing_resource.resource_class}"
       end
     end
 

data/lib/active_admin/resource_controller.rb

@@ -3,8 +3,8 @@ require 'active_admin/resource_controller/actions'
 require 'active_admin/resource_controller/action_builder'
 require 'active_admin/resource_controller/callbacks'
 require 'active_admin/resource_controller/collection'
-require 'active_admin/resource_controller/filters'
 require 'active_admin/resource_controller/scoping'
+require 'active_admin/resource_controller/sidebars'
 require 'active_admin/resource_controller/resource_class_methods'
 
 module ActiveAdmin
@@ -22,17 +22,17 @@ module ActiveAdmin
     include ActionBuilder
     include Callbacks
     include Collection
-    include Filters
     include Scoping
+    include Sidebars
     extend  ResourceClassMethods
 
     class << self
       def active_admin_config=(config)
         @active_admin_config = config
 
-        defaults  :resource_class => config.resource_class,
-                  :route_prefix => config.route_prefix,
-                  :instance_name => config.underscored_resource_name
+        unless config.nil?
+          defaults :resource_class => config.resource_class, :route_prefix => config.route_prefix, :instance_name => config.resource_name.singular
+        end
       end
 
       # Inherited Resources uses the inherited(base) hook method to 

data/lib/active_admin/resource_controller/actions.rb

@@ -60,6 +60,7 @@ module ActiveAdmin
     end
     alias :update! :update
 
+
     # Make aliases protected
     protected :index!, :show!, :new!, :create!, :edit!, :update!
 
@@ -75,5 +76,6 @@ module ActiveAdmin
     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/collection.rb

@@ -49,7 +49,7 @@ module ActiveAdmin
             table_column = (column =~ /\./) ? column :
               "#{table}.#{active_admin_config.resource_quoted_column_name(column)}"
 
-            chain.order("#{table_column} #{order}")
+            chain.reorder("#{table_column} #{order}")
           else
             chain # just return the chain
           end
@@ -88,14 +88,20 @@ module ActiveAdmin
         end
 
         def scope_current_collection(chain)
+          @collection_before_scope = chain
+
           if current_scope
-            @before_scope_collection = chain
             scope_chain(current_scope, chain)
           else
             chain
           end
         end
 
+        def collection_before_scope
+          @collection_before_scope
+        end
+
+
         include ActiveAdmin::ScopeChain
 
         def current_scope
@@ -116,8 +122,11 @@ module ActiveAdmin
         end
 
         def paginate(chain)
-          chain.send(Kaminari.config.page_method_name, params[:page]).per(per_page)
-        end
+          page_method_name = Kaminari.config.page_method_name
+          page = params[Kaminari.config.param_name]
+
+          chain.send(page_method_name, page).per(per_page)
+	end
 
         def per_page
           return max_csv_records if request.format == 'text/csv'