activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/lib/active_admin/helpers/routes/url_helpers.rb

@@ -8,7 +8,7 @@ module ActiveAdmin
       extend UrlHelpers
 
       def self.default_url_options
-        Rails.application.config.action_mailer.default_url_options || {}
+        Rails.application.routes.default_url_options || {}
       end
     end
   end

data/lib/active_admin/inputs.rb

@@ -9,6 +9,7 @@ module ActiveAdmin
 
       autoload :Base
       autoload :StringInput
+      autoload :DatePickerInput
       autoload :DateRangeInput
       autoload :NumericInput
       autoload :SelectInput

data/lib/active_admin/inputs/filters/date_picker_input.rb

@@ -0,0 +1,13 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class DatePickerInput < ::Formtastic::Inputs::DatePickerInput
+        include Base
+
+        def input_html_options
+          super.merge(class: "datepicker")
+        end
+      end
+    end
+  end
+end

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -27,7 +27,7 @@ module ActiveAdmin
           current_value = @object.public_send input_name
           { size: 12,
             class: "datepicker",
-            max: 10,
+            maxlength: 10,
             value: current_value.respond_to?(:strftime) ? current_value.strftime("%Y-%m-%d") : "" }
         end
       end

data/lib/active_admin/menu.rb

@@ -27,6 +27,7 @@ module ActiveAdmin
       def [](id)
         @children[normalize_id(id)]
       end
+
       def []=(id, child)
         @children[normalize_id(id)] = child
       end

data/lib/active_admin/menu_item.rb

@@ -79,7 +79,7 @@ module ActiveAdmin
       true
     end
 
-    # Returns an array of the ancestory of this menu item.
+    # Returns an array of the ancestry of this menu item.
     # The first item is the immediate parent of the item.
     def ancestors
       parent ? [parent, parent.ancestors].flatten : []

data/lib/active_admin/namespace.rb

@@ -49,7 +49,7 @@ module ActiveAdmin
       reset_menu!
 
       # Dispatch a registration event
-      ActiveAdmin::Event.dispatch ActiveAdmin::Resource::RegisterEvent, config
+      ActiveSupport::Notifications.publish ActiveAdmin::Resource::RegisterEvent, config
 
       # Return the config
       config
@@ -110,13 +110,13 @@ module ActiveAdmin
     # Add a callback to be ran when we build the menu
     #
     # @param [Symbol] name The name of the menu. Default: :default
-    # @param [Proc] block The block to be ran when the menu is built
+    # @yield [ActiveAdmin::Menu] The block to be ran when the menu is built
     #
     # @return [void]
-    def build_menu(name = DEFAULT_MENU, &block)
+    def build_menu(name = DEFAULT_MENU)
       @menus.before_build do |menus|
         menus.menu name do |menu|
-          block.call(menu)
+          yield menu
         end
       end
     end
@@ -157,7 +157,7 @@ module ActiveAdmin
     def build_menu_collection
       @menus = MenuCollection.new
 
-      @menus.on_build do |menus|
+      @menus.on_build do
         build_default_utility_nav
 
         resources.each do |resource|

data/lib/active_admin/orm/active_record/comments.rb

@@ -7,6 +7,7 @@ require 'active_admin/orm/active_record/comments/resource_helper'
 ActiveAdmin::Application.inheritable_setting :comments,                   true
 ActiveAdmin::Application.inheritable_setting :show_comments_in_menu,      true
 ActiveAdmin::Application.inheritable_setting :comments_registration_name, 'Comment'
+ActiveAdmin::Application.inheritable_setting :comments_order,             "created_at ASC"
 
 # Insert helper modules
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
@@ -20,7 +21,7 @@ ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
 ActiveAdmin.after_load do |app|
   app.namespaces.each do |namespace|
     namespace.register ActiveAdmin::Comment, as: namespace.comments_registration_name do
-      actions :index, :show, :create
+      actions :index, :show, :create, :destroy
 
       menu false unless namespace.comments && namespace.show_comments_in_menu
 
@@ -60,6 +61,13 @@ ActiveAdmin.after_load do |app|
               redirect_to :back
             end
           end
+
+          def destroy
+            destroy! do |success, failure|
+              success.html { redirect_to :back }
+              failure.html { redirect_to :back }
+            end
+          end
         end
       end
 
@@ -74,6 +82,7 @@ ActiveAdmin.after_load do |app|
         column I18n.t('active_admin.comments.resource'),      :resource
         column I18n.t('active_admin.comments.author'),        :author
         column I18n.t('active_admin.comments.body'),          :body
+        column I18n.t('active_admin.comments.created_at'),    :created_at
         actions
       end
     end

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
         resource_type: resource_type(resource),
         resource_id:   resource_id_cast(resource),
         namespace:     namespace.to_s
-      ).order('created_at ASC')
+      ).order(ActiveAdmin.application.namespaces[namespace.to_sym].comments_order)
     end
 
     def self.resource_id_type

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

@@ -35,6 +35,9 @@ module ActiveAdmin
                 comment.author ? auto_link(comment.author) : I18n.t('active_admin.comments.author_missing')
               end
               span pretty_format comment.created_at
+              if authorized?(ActiveAdmin::Auth::DESTROY, comment)
+                text_node link_to I18n.t('active_admin.comments.delete'), comments_url(comment.id), method: :delete, data: { confirm: I18n.t('active_admin.comments.delete_confirmation') }
+              end
             end
             div class: 'active_admin_comment_body' do
               simple_format comment.body
@@ -46,6 +49,14 @@ module ActiveAdmin
           span I18n.t('active_admin.comments.no_comments_yet'), class: 'empty'
         end
 
+        def comments_url(*args)
+          parts = []
+          parts << active_admin_namespace.name unless active_admin_namespace.root?
+          parts << active_admin_namespace.comments_registration_name.underscore
+          parts << 'path'
+          send parts.join('_'), *args
+        end
+
         def comment_form_url
           parts = []
           parts << active_admin_namespace.name unless active_admin_namespace.root?

data/lib/active_admin/resource.rb

@@ -144,14 +144,20 @@ module ActiveAdmin
     end
 
     def find_resource(id)
-      resource = resource_class.public_send(method_for_find, id)
+      resource = resource_class.public_send *method_for_find(id)
       decorator_class ? decorator_class.new(resource) : resource
     end
 
     private
 
-    def method_for_find
-      resources_configuration[:self][:finder] || :"find_by_#{resource_class.primary_key}"
+    def method_for_find(id)
+      if finder = resources_configuration[:self][:finder]
+        [finder, id]
+      elsif Rails::VERSION::MAJOR >= 4
+        [:find_by, { resource_class.primary_key => id }]
+      else
+        [:"find_by_#{resource_class.primary_key}", id]
+      end
     end
 
     def default_csv_builder

data/lib/active_admin/resource/action_items.rb

@@ -55,21 +55,31 @@ module ActiveAdmin
 
       # Adds the default action items to each resource
       def add_default_action_items
-        # New link on index
+        add_default_new_action_item
+        add_default_edit_action_item
+        add_default_show_action_item
+      end
+
+      # Adds the default New link on index
+      def add_default_new_action_item
         add_action_item :new, only: :index do
           if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
             link_to I18n.t('active_admin.new_model', model: active_admin_config.resource_label), new_resource_path
           end
         end
+      end
 
-        # Edit link on show
+      # Adds the default Edit link on show
+      def add_default_edit_action_item
         add_action_item :edit, only: :show do
           if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
             link_to I18n.t('active_admin.edit_model', model: active_admin_config.resource_label), edit_resource_path(resource)
           end
         end
+      end
 
-        # Destroy link on show
+      # Adds the default Destroy link on show
+      def add_default_show_action_item
         add_action_item :destroy, only: :show do
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             link_to I18n.t('active_admin.delete_model', model: active_admin_config.resource_label), resource_path(resource),

data/lib/active_admin/resource/belongs_to.rb

@@ -20,8 +20,12 @@ module ActiveAdmin
 
       # Returns the target resource class or raises an exception if it doesn't exist
       def target
-        key = @target_name.to_s.camelize
-        namespace.resources[key] or raise TargetNotFound.new key, namespace
+        resource or raise TargetNotFound.new (@options[:class_name] || @target_name.to_s.camelize), namespace
+      end
+
+      def resource
+        namespace.resources[@options[:class_name]] ||
+          namespace.resources[@target_name.to_s.camelize]
       end
 
       def namespace

data/lib/active_admin/resource/pagination.rb

@@ -6,6 +6,9 @@ module ActiveAdmin
       # The default number of records to display per page
       attr_accessor :per_page
 
+      # The default number of records to display per page
+      attr_accessor :max_per_page
+
       # Enable / disable pagination (defaults to true)
       attr_accessor :paginate
 
@@ -13,6 +16,7 @@ module ActiveAdmin
         super
         @paginate = true
         @per_page = namespace.default_per_page
+        @max_per_page = namespace.max_per_page
       end
     end
   end

data/lib/active_admin/resource_collection.rb

@@ -33,7 +33,9 @@ module ActiveAdmin
     # Finds a resource based on the resource name, resource class, or base class.
     def find_resource(obj)
       resources.detect do |r|
-        r.resource_name.to_s == obj.to_s || r.resource_class.to_s == obj.to_s
+        r.resource_name.to_s == obj.to_s
+      end || resources.detect do |r|
+        r.resource_class.to_s == obj.to_s
       end ||
       if obj.respond_to? :base_class
         resources.detect{ |r| r.resource_class.to_s == obj.base_class.to_s }

data/lib/active_admin/resource_controller/data_access.rb

@@ -277,14 +277,17 @@ module ActiveAdmin
       def collection_applies(options = {})
         only = Array(options.fetch(:only, COLLECTION_APPLIES))
         except = Array(options.fetch(:except, []))
-        COLLECTION_APPLIES && only - except
+        
+        # see #4074 for code reasons
+        COLLECTION_APPLIES.select { |applier| only.include? applier }
+                          .reject { |applier| except.include? applier }
       end
 
       def per_page
         if active_admin_config.paginate
           dynamic_per_page || configured_per_page
         else
-          max_per_page
+          active_admin_config.max_per_page
         end
       end
 
@@ -293,15 +296,7 @@ module ActiveAdmin
       end
 
       def configured_per_page
-        if active_admin_config.per_page.is_a?(Array)
-          active_admin_config.per_page[0]
-        else
-          active_admin_config.per_page
-        end
-      end
-
-      def max_per_page
-        10_000
+        Array(active_admin_config.per_page).first
       end
 
     end

data/lib/active_admin/resource_controller/decorators.rb

@@ -68,7 +68,7 @@ module ActiveAdmin
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
                      :total_count, :num_pages, :to_key, :group_values, :except,
-                     :find_each
+                     :find_each, :ransack
 
             define_singleton_method(:name) { name }
           end

data/lib/active_admin/resource_dsl.rb

@@ -160,8 +160,14 @@ module ActiveAdmin
     delegate :before_destroy, :after_destroy, to: :controller
 
     # Standard rails filters
-    delegate :before_filter, :skip_before_filter, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
-             to: :controller
+    delegate :before_filter,  :skip_before_filter, to: :controller
+    delegate :after_filter,   :skip_after_filter,  to: :controller
+    delegate :around_filter,  :skip_filter,        to: :controller
+    if Rails::VERSION::MAJOR == 4
+      delegate :before_action,  :skip_before_action, to: :controller
+      delegate :after_action,   :skip_after_action,  to: :controller
+      delegate :around_action,  :skip_action,        to: :controller
+    end
 
     # Specify which actions to create in the controller
     #

data/lib/active_admin/sidebar_section.rb

@@ -6,31 +6,23 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name, options, block
+      @name, @options, @block = name.to_s, options, block
       normalize_display_options!
     end
 
     # The id gets used for the div in the view
     def id
-      "#{name.to_s.downcase.underscore}_sidebar_section".parameterize
-    end
-
-    def icon?
-      !!options[:icon]
-    end
-
-    def icon
-      options[:icon] if icon?
+      "#{name.downcase.underscore}_sidebar_section".parameterize
     end
 
     # The title gets displayed within the section in the view
     def title
-      I18n.t("active_admin.sidebars.#{name.to_s}", default: name.to_s.titlecase)
+      I18n.t("active_admin.sidebars.#{name}", default: name.titlecase)
     end
 
     # If a block is not passed in, the name of the partial to render
     def partial_name
-      options[:partial] || "#{name.to_s.downcase.tr(' ', '_')}_sidebar"
+      options[:partial] || "#{name.downcase.tr(' ', '_')}_sidebar"
     end
 
     def custom_class

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre1'
+  VERSION = '1.0.0.pre2'
 end

data/lib/active_admin/view_factory.rb

@@ -13,8 +13,7 @@ module ActiveAdmin
               header:              ActiveAdmin::Views::Header,
               footer:              ActiveAdmin::Views::Footer,
               index_scopes:        ActiveAdmin::Views::Scopes,
-              blank_slate:         ActiveAdmin::Views::BlankSlate,
-              action_list_popover: ActiveAdmin::Views::ActionListPopover
+              blank_slate:         ActiveAdmin::Views::BlankSlate
 
     # Register All The Pages
     register  index_page: ActiveAdmin::Views::Pages::Index,

data/lib/active_admin/view_helpers.rb

@@ -8,7 +8,6 @@ module ActiveAdmin
     include AutoLinkHelper
     include BreadcrumbHelper
     include DisplayHelper
-    include IconHelper
     include MethodOrProcHelper
     include SidebarHelper
     include FormHelper

data/lib/active_admin/view_helpers/display_helper.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        render_in_context resource, display_name_method_for(resource) if resource
+        render_in_context resource, display_name_method_for(resource) unless resource.nil?
       end
 
       # Looks up and caches the first available display name method.
@@ -43,10 +43,10 @@ module ActiveAdmin
       # Attempts to create a human-readable string for any object
       def pretty_format(object)
         case object
-        when String, Numeric, Arbre::Element
+        when String, Numeric, Symbol, Arbre::Element
           object.to_s
         when Date, Time
-          localize object, format: :long
+          localize object, format: active_admin_application.localize_format
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
              defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
@@ -56,7 +56,6 @@ module ActiveAdmin
           end
         end
       end
-
     end
   end
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -76,11 +76,11 @@ module MethodOrProcHelper
     end
   end
 
-  # This method is different from the others in that it calls `instance_exec` on the reciever,
-  # passing it the proc. This evaluates the proc in the context of the reciever, thus changing
+  # This method is different from the others in that it calls `instance_exec` on the receiver,
+  # passing it the proc. This evaluates the proc in the context of the receiver, thus changing
   # what `self` means inside the proc.
   def render_in_context(context, obj, *args)
-    context ||= self # default to `self`
+    context = self if context.nil? # default to `self` only when nil
     case obj
     when Proc
       context.instance_exec *args, &obj