activeadmin 0.6.0 → 0.6.1

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -4,16 +4,16 @@ module ActiveAdmin
 
       # Returns an array of links to use in a breadcrumb
       def breadcrumb_links(path = request.path)
-        parts = path[1..-1].split('/')                        # remove leading "/" and split up URL path
-        parts.pop unless params[:action] =~ /^create|update$/ # remove last if not create/update
+        parts = path[1..-1].split('/') # remove leading "/" and split up the URL
+        parts.pop                      # remove last since it's used as the page title
 
         parts.each_with_index.map do |part, index|
-          # If an object (users/23), look it up via ActiveRecord and capture its name.
-          # If name is nil, look up the model translation, using `titlecase` as the backup.
-          if part =~ /^\d|^[a-f0-9]{24}$/ && parent = parts[index-1]
-            klass = parent.singularize.camelcase.constantize rescue nil
-            obj   = klass.find_by_id(part) if klass
-            name  = display_name(obj)      if obj
+          # 1. try using `display_name` if we can locate a DB object
+          # 2. try using the model name translation
+          # 3. default to calling `titlecase` on the URL fragment
+          if part =~ /\A(\d+|[a-f0-9]{24})\z/ && parts[index-1]
+            config = active_admin_config.belongs_to_config.try(:target) || active_admin_config
+            name   = display_name config.find_resource(part)
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
 

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,16 +2,25 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
+      # 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)
+        resource.send display_name_method_for resource if resource
+      end
+
+      # Looks up and caches the first available display name method.
       def display_name_method_for(resource)
         @@display_name_methods_cache ||= {}
-        @@display_name_methods_cache[resource.class] ||= 
-          active_admin_application.display_name_methods.find{|method| resource.respond_to? method }
+        @@display_name_methods_cache[resource.class] ||= begin
+          methods = active_admin_application.display_name_methods - association_methods_for(resource)
+          methods.detect{ |method| resource.respond_to? method }
+        end
       end
 
-      # Tries to display an object with as friendly of output
-      # as possible.
-      def display_name(resource)
-        resource.send(display_name_method_for(resource))
+      # To prevent conflicts, we exclude any methods that happen to be associations.
+      def association_methods_for(resource)
+        return [] unless resource.class.respond_to? :reflect_on_all_associations
+        resource.class.reflect_on_all_associations.map(&:name)
       end
 
       # Return a pretty string for any object

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -13,10 +13,10 @@ module ActiveAdmin
           @formats ||= [:csv, :xml, :json]
           @formats.clone
         end
-        
+
         # Adds a mime type extension to the list of available formats.
         # You must register the extension prior to adding it to the list
-        # of avilable formats. This should be used by plugins that want 
+        # of avilable formats. This should be used by plugins that want
         # to add additional formats to the download format links.
         # @param [Symbol] extension the mime extension to add
         # @return [Array] A copy of the updated formats array.

data/lib/active_admin/view_helpers/form_helper.rb

@@ -1,10 +1,15 @@
 module ActiveAdmin
   module ViewHelpers
     module FormHelper
-      
+
       def active_admin_form_for(resource, options = {}, &block)
         options = Marshal.load( Marshal.dump(options) )
         options[:builder] ||= ActiveAdmin::FormBuilder
+
+        if ! options.fetch(:decorate, true)
+          resource = resource.model
+        end
+
         semantic_form_for resource, options, &block
       end
 

data/lib/active_admin/view_helpers/icon_helper.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   module ViewHelpers
     module IconHelper
-      
+
       # Render an icon from the Iconic icon set
       def icon(*args)
         ActiveAdmin::Iconic.icon(*args)

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -41,7 +41,7 @@ module MethodOrProcHelper
   #     proc = Proc.new{|s| s.size }
   #     call_method_or_proc_on(@my_obj, proc, :exec => false)
   #
-  # You can pass along any necessary arguments to the method / Proc as arguments. For 
+  # You can pass along any necessary arguments to the method / Proc as arguments. For
   # example:
   #
   #     call_method_or_proc_on(@my_obj, :find, 1) #=> @my_obj.find(1)
@@ -76,16 +76,16 @@ module MethodOrProcHelper
     end
   end
 
-  # This method is different from the others in that it calls `instance_eval` on the reciever,
+  # 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
   # what `self` means inside the proc.
-  def render_in_context(context, obj)
+  def render_in_context(context, obj, *args)
     context ||= self # default to `self`
     case obj
     when Proc
-      context.instance_exec &obj
+      context.instance_exec *args, &obj
     when Symbol
-      context.send obj
+      context.send obj, *args
     else
       obj
     end

data/lib/active_admin/view_helpers/title_helper.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     module TitleHelper
 
       def title(_title)
-        @page_title = _title 
+        @page_title = _title
       end
 
     end

data/lib/active_admin/views/components/action_list_popover.rb

@@ -5,16 +5,16 @@ module ActiveAdmin
     # Build an ActionListPopover
     class ActionListPopover < ActiveAdmin::Views::Popover
       builder_method :action_list_popover
-      
-      
+
+
       def build(*args, &block)
         @contents = ul :class => "popover_contents"
-        
+
         options = args.extract_options!
-        
+
         super(options)
       end
-      
+
       def action(title, url, *args)
         options = args.extract_options!
         within @contents do
@@ -26,4 +26,4 @@ module ActiveAdmin
 
     end
   end
-end
+end

data/lib/active_admin/views/components/attributes_table.rb

@@ -49,20 +49,17 @@ module ActiveAdmin
         span I18n.t('active_admin.empty'), :class => "empty"
       end
 
-      def content_for(attr_or_proc)
-        value = case attr_or_proc
-                when Proc
-                  attr_or_proc.call(@record)
-                else
-                  content_for_attribute(attr_or_proc)
-                end
-        value = pretty_format(value)
-        value == "" || value.nil? ? empty_value : value
+      def content_for(attr)
+        previous = current_arbre_element.to_s
+        value    = pretty_format find_attr_value attr
+        value.blank? && previous == current_arbre_element.to_s ? empty_value : value
       end
 
-      def content_for_attribute(attr)
-        if attr.to_s =~ /^([\w]+)_id$/ && @record.respond_to?($1.to_sym)
-          content_for_attribute($1)
+      def find_attr_value(attr)
+        if attr.is_a?(Proc)
+          attr.call(@record)
+        elsif attr.to_s[/\A(.+)_id\z/] && @record.respond_to?($1.to_sym)
+          @record.send($1.to_sym)
         else
           @record.send(attr.to_sym)
         end

data/lib/active_admin/views/components/blank_slate.rb

@@ -3,15 +3,15 @@ module ActiveAdmin
     # Build a Blank Slate
     class BlankSlate < ActiveAdmin::Component
       builder_method :blank_slate
-      
+
       def default_class_name
         'blank_slate_container'
       end
-      
+
       def build(content)
         super(span(content.html_safe, :class => "blank_slate"))
       end
-      
+
     end
   end
-end
+end

data/lib/active_admin/views/components/columns.rb

@@ -9,7 +9,7 @@ module ActiveAdmin
     #
     # == Simple Columns
     #
-    # To display columns, use the #columns method. Within the block, call the 
+    # To display columns, use the #columns method. Within the block, call the
     # #column method to create a new column.
     #
     # To createa a two column layout:

data/lib/active_admin/views/components/index_list.rb

@@ -20,7 +20,7 @@ module ActiveAdmin
 
       # Builds the links for presenting different index views to the user
       #
-      # @param [Array] index_classes The class constants that represent index page presenters 
+      # @param [Array] index_classes The class constants that represent index page presenters
       def build(index_classes)
         unless current_filter_search_empty?
           index_classes.each do |index_class|

data/lib/active_admin/views/components/paginated_collection.rb

@@ -36,14 +36,15 @@ module ActiveAdmin
       #   download_links => Download links override (false or [:csv, :pdf])
       #
       def build(collection, options = {})
-        @collection = collection
+        @collection     = collection
         @param_name     = options.delete(:param_name)
         @download_links = options.delete(:download_links)
+        @display_total  = options.delete(:pagination_total) { true }
 
         unless collection.respond_to?(:num_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
-        
+
         @contents = div(:class => "paginated_collection_contents")
         build_pagination_with_formats(options)
         @built = true
@@ -83,30 +84,37 @@ module ActiveAdmin
 
       include ::ActiveAdmin::Helpers::Collection
       include ::ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper
-        
+
       # modified from will_paginate
       def page_entries_info(options = {})
         if options[:entry_name]
-          entry_name = options[:entry_name]
+          entry_name   = options[:entry_name]
           entries_name = options[:entries_name] || entry_name.pluralize
         elsif collection_is_empty?
-          entry_name = I18n.translate("active_admin.pagination.entry", :count => 1, :default => 'entry')
-          entries_name = I18n.translate("active_admin.pagination.entry", :count => 2, :default => 'entries')
+          entry_name   = I18n.t "active_admin.pagination.entry", :count => 1, :default => 'entry'
+          entries_name = I18n.t "active_admin.pagination.entry", :count => 2, :default => 'entries'
         else
-          entry_name = I18n.translate("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => 1, :default => collection.first.class.name.underscore.sub('_', ' '))
-          entries_name = I18n.translate("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => collection.size, :default => entry_name.pluralize)
+          key = "activerecord.models." + collection.first.class.model_name.i18n_key.to_s
+          entry_name   = I18n.translate key, :count => 1,               :default => collection.first.class.name.underscore.sub('_', ' ')
+          entries_name = I18n.translate key, :count => collection.size, :default => entry_name.pluralize
         end
 
         if collection.num_pages < 2
           case collection_size
-          when 0; I18n.t('active_admin.pagination.empty', :model => entries_name)
-          when 1; I18n.t('active_admin.pagination.one', :model => entry_name)
+          when 0; I18n.t('active_admin.pagination.empty',    :model => entries_name)
+          when 1; I18n.t('active_admin.pagination.one',      :model => entry_name)
           else;   I18n.t('active_admin.pagination.one_page', :model => entries_name, :n => collection.total_count)
           end
         else
           offset = (collection.current_page - 1) * collection.limit_value
-          total = collection.total_count
-          I18n.t('active_admin.pagination.multiple', :model => entries_name, :from => offset + 1, :to => offset + collection_size, :total => total)
+          if @display_total
+            total  = collection.total_count
+            I18n.t 'active_admin.pagination.multiple', :model => entries_name, :total => total,
+              :from => offset + 1, :to => offset + collection_size
+          else
+            I18n.t 'active_admin.pagination.multiple_without_total', :model => entries_name,
+              :from => offset + 1, :to => offset + collection_size
+          end
         end
       end
 

data/lib/active_admin/views/components/panel.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
 
       def build(title, attributes = {})
         icon_name = attributes.delete(:icon)
-        icn = icon_name ? icon(icon_name) : ""
+        icn = icon_name ? icon(icon_name) : "".html_safe
         super(attributes)
         add_class "panel"
         @title = h3(icn + title.to_s)

data/lib/active_admin/views/components/scopes.rb

@@ -1,4 +1,5 @@
 require 'active_admin/helpers/collection'
+require 'active_admin/view_helpers/method_or_proc_helper'
 
 module ActiveAdmin
   module Views
@@ -51,7 +52,7 @@ module ActiveAdmin
         if params[:scope]
           params[:scope] == scope.id
         else
-          active_admin_config.default_scope == scope
+          active_admin_config.default_scope(self) == scope
         end
       end
 

data/lib/active_admin/views/components/sidebar_section.rb

@@ -4,7 +4,7 @@ module ActiveAdmin
     class SidebarSection < Panel
       builder_method :sidebar_section
 
-      # Takes a ActiveAdmin::Sidebar::Section instance
+      # Takes a ActiveAdmin::SidebarSection instance
       def build(section)
         @section = section
         super(@section.title, :icon => @section.icon)

data/lib/active_admin/views/components/status_tag.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
       #
       #   status_tag('active', :ok, :class => 'important', :id => 'status_123', :label => 'on')
       #   # => <span class='status_tag active ok important' id='status_123'>on</span>
-      # 
+      #
       def build(*args)
         options = args.extract_options!
         status = args[0]

data/lib/active_admin/views/header.rb

@@ -20,11 +20,11 @@ module ActiveAdmin
       end
 
       def build_global_navigation
-        insert_tag view_factory.global_navigation, @menu, :class => 'header-item tabs' 
+        insert_tag view_factory.global_navigation, @menu, :class => 'header-item tabs'
       end
 
       def build_utility_navigation
-        insert_tag view_factory.global_navigation, @utility_menu, :id => "utility_nav", :class => 'header-item tabs' 
+        insert_tag view_factory.utility_navigation, @utility_menu, :id => "utility_nav", :class => 'header-item tabs'
       end
 
     end

data/lib/active_admin/views/index_as_blog.rb

@@ -67,7 +67,7 @@ module ActiveAdmin
         @page_presenter = page_presenter
         @collection = collection
 
-        # Call the block passed in. This will set the 
+        # Call the block passed in. This will set the
         # title and body methods
         instance_eval &page_presenter.block if page_presenter.block
 
@@ -117,7 +117,9 @@ module ActiveAdmin
       def build_title(post)
         if @title
           h3 do
-            link_to(call_method_or_proc_on(post, @title), resource_path(post))
+            a(:href => resource_path(post)) do
+             render_method_on_post_or_call_proc post, @title
+            end
           end
         else
           h3 do
@@ -128,7 +130,18 @@ module ActiveAdmin
 
       def build_body(post)
         if @body
-          div(call_method_or_proc_on(post, @body), :class => 'content')
+          div :class => 'content' do
+            render_method_on_post_or_call_proc post, @body
+          end
+        end
+      end
+
+      def render_method_on_post_or_call_proc(post, proc)
+        case proc
+        when String,Symbol
+          post.send proc
+        else
+          instance_exec post, &proc
         end
       end
 

data/lib/active_admin/views/index_as_table.rb

@@ -69,7 +69,7 @@ module ActiveAdmin
     # If a column is defined using a block, you must pass the key to turn on sorting. The key
     # is the attribute which gets used to sort objects using Active Record.
     #
-    # By default, this is the column on the resource's table that the attribute corresponds to. 
+    # By default, this is the column on the resource's table that the attribute corresponds to.
     # Otherwise, any attribute that the resource collection responds to can be used.
     #
     #     index do
@@ -154,7 +154,7 @@ module ActiveAdmin
 
         # Display a column for the id
         def id_column
-          column(resource_class.human_attribute_name(resource_class.primary_key), :sortable => resource_class.primary_key) do |resource| 
+          column(resource_class.human_attribute_name(resource_class.primary_key), :sortable => resource_class.primary_key) do |resource|
             link_to resource.id, resource_path(resource), :class => "resource_id_link"
           end
         end

data/lib/active_admin/views/pages/base.rb

@@ -23,13 +23,18 @@ module ActiveAdmin
         def build_active_admin_head
           within @head do
             insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_application.site_title)].join(" | ")
-            active_admin_application.stylesheets.each do |style|
-              text_node(stylesheet_link_tag(style.path, style.options.dup).html_safe)
+            active_admin_application.stylesheets.each do |style, options|
+              text_node stylesheet_link_tag(style, options).html_safe
             end
 
             active_admin_application.javascripts.each do |path|
-              script :src => javascript_path(path), :type => "text/javascript"
+              text_node(javascript_include_tag(path))
             end
+            
+            if active_admin_application.favicon
+              text_node(favicon_link_tag(active_admin_application.favicon))
+            end
+            
             text_node csrf_meta_tag
           end
         end

data/lib/active_admin/views/pages/form.rb

@@ -5,8 +5,8 @@ module ActiveAdmin
       class Form < Base
 
         def title
-          I18n.t("active_admin.#{params[:action]}_model",
-                 :model => active_admin_config.resource_label)
+          assigns[:page_title] || I18n.t("active_admin.#{params[:action]}_model",
+                                         :model => active_admin_config.resource_label)
         end
 
         def form_presenter