activeadmin 1.0.0.pre1 → 2.9.0

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

@@ -14,7 +14,7 @@ module ActiveAdmin
     #
     # To create a two column layout:
     #
-    #     colums do
+    #     columns do
     #       column do
     #         span "Column # 1
     #       end
@@ -28,7 +28,7 @@ module ActiveAdmin
     #
     # To make a column span multiple, pass the :span option to the column method:
     #
-    #     colums do
+    #     columns do
     #       column span: 2 do
     #         span "Column # 1
     #       end
@@ -41,7 +41,7 @@ module ActiveAdmin
     # the first being 2 time bigger than the second.
     #
     #
-    # == Max and Mix Column Sizes
+    # == Max and Min Column Sizes
     #
     # Active Admin is a fluid width layout, which means that columns are all defined
     # using percentages. Sometimes this can cause issues if you don't want a column
@@ -49,7 +49,7 @@ module ActiveAdmin
     #
     # To overcome this, columns include a :max_width and :min_width option.
     #
-    #     colums do
+    #     columns do
     #       column max_width: "200px", min_width: "100px" do
     #         span "Column # 1
     #       end
@@ -93,19 +93,24 @@ module ActiveAdmin
         all_margins_width = margin_size * (span_count - 1)
         column_width = (100.00 - all_margins_width) / span_count
 
-        children.each_with_index do |col, i|
+        columns.each_with_index do |column, i|
           is_last_column = i == (columns_count - 1)
-          col.set_column_styles(column_width, margin_size, is_last_column)
+          column.set_column_styles(column_width, margin_size, is_last_column)
         end
       end
 
       def columns_span_count
         count = 0
-        children.each {|column| count += column.span_size }
+        columns.each do |column|
+          count += column.span_size
+        end
 
         count
       end
 
+      def columns
+        children.select { |child| child.is_a?(Column) }
+      end
     end
 
     class Column < ActiveAdmin::Component

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

@@ -1,5 +1,3 @@
-require 'active_admin/views/components/popover'
-
 module ActiveAdmin
   module Views
 
@@ -9,7 +7,7 @@ module ActiveAdmin
     #
     #     dropdown_menu "Administration" do
     #       item "Edit Details", edit_details_path
-    #       item "Edit My Account", edit_my_acccount_path
+    #       item "Edit My Account", edit_my_account_path
     #     end
     #
     # This will create a button with the label "Administration" and
@@ -28,39 +26,39 @@ module ActiveAdmin
         options = options.dup
 
         # Easily set options for the button or menu
-        button_options  = options.delete(:button) || {}
+        button_options = options.delete(:button) || {}
         menu_options = options.delete(:menu) || {}
 
-        @button  = build_button(name, button_options)
+        @button = build_button(name, button_options)
         @menu = build_menu(menu_options)
 
         super(options)
       end
 
-      def item(*args)
+      def item(*args, **kwargs)
         within @menu do
-          li link_to(*args)
+          li link_to(*args, **kwargs)
         end
       end
 
       private
 
       def build_button(name, button_options)
-        button_options[:class] ||= ''
-        button_options[:class] << ' dropdown_menu_button'
+        button_options[:class] ||= ""
+        button_options[:class] << " dropdown_menu_button"
 
-        button_options[:href] = '#'
+        button_options[:href] = "#"
 
         a name, button_options
       end
 
       def build_menu(options)
-        options[:class] ||= ''
-        options[:class] << ' dropdown_menu_list'
+        options[:class] ||= ""
+        options[:class] << " dropdown_menu_list"
 
         menu_list = nil
 
-        div :class => 'dropdown_menu_list_wrapper' do
+        div class: "dropdown_menu_list_wrapper" do
           menu_list = ul(options)
         end
 

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

@@ -1,4 +1,4 @@
-require 'active_admin/helpers/collection'
+require "active_admin/helpers/collection"
 
 module ActiveAdmin
   module Views
@@ -15,7 +15,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'ul'
+        "ul"
       end
 
       # Builds the links for presenting different index views to the user
@@ -36,7 +36,10 @@ module ActiveAdmin
       # @param [Class] index_class The class on which to build the link and html classes
       def build_index_list(index_class)
         li class: classes_for_index(index_class) do
-          a href: url_for(params.merge(as: index_class.index_name.to_sym)), class: "table_tools_button" do
+          params = request.query_parameters.except :page, :commit, :format
+          url_with_params = url_for(**params.merge(as: index_class.index_name.to_sym).symbolize_keys)
+
+          a href: url_with_params, class: "table_tools_button" do
             name = index_class.index_name
             I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
           end
@@ -64,5 +67,3 @@ module ActiveAdmin
     end
   end
 end
-
-

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

@@ -0,0 +1,32 @@
+module ActiveAdmin
+  module Views
+
+    # Renders an ActiveAdmin::Menu as a set of unordered list items.
+    #
+    # This component takes cares of deciding which items should be
+    # displayed given the current context and renders them appropriately.
+    #
+    # The entire component is rendered within one ul element.
+    class Menu < Component
+      attr_reader :menu
+      builder_method :menu
+
+      # @param [ActiveAdmin::Menu] menu the Menu to render
+      # @param [Hash] options the options as passed to the underlying ul element.
+      #
+      def build(menu, options = {})
+        @menu = menu
+        super(options)
+
+        menu.items.each do |item|
+          menu_item(item) if helpers.render_in_context self, item.should_display
+        end
+        children.sort!
+      end
+
+      def tag_name
+        "ul"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module ActiveAdmin
+  module Views
+
+    # Arbre component used to render ActiveAdmin::MenuItem
+    class MenuItem < Component
+      builder_method :menu_item
+      attr_reader :label
+      attr_reader :url
+      attr_reader :priority
+
+      def build(item, options = {})
+        super(options.merge(id: item.id))
+        @label = helpers.render_in_context self, item.label
+        @url = helpers.render_in_context self, item.url
+        @priority = item.priority
+        @submenu = nil
+
+        add_class "current" if item.current? assigns[:current_tab]
+
+        if url
+          text_node link_to label, url, **item.html_options
+        else
+          span label, item.html_options
+        end
+
+        if item.items.any?
+          add_class "has_nested"
+          @submenu = menu(item)
+        end
+      end
+
+      def tag_name
+        "li"
+      end
+
+      # Sorts by priority first, then alphabetically by label if needed.
+      def <=>(other)
+        result = priority <=> other.priority
+        result == 0 ? label <=> other.label : result
+      end
+
+      def visible?
+        url.nil? || real_url? || @submenu && @submenu.children.any?
+      end
+
+      def to_s
+        visible? ? super : ""
+      end
+
+      private
+
+      # URL is not nil, empty, or '#'
+      def real_url?
+        url && url.present? && url != "#"
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
-require 'active_admin/helpers/collection'
+require "active_admin/helpers/collection"
+require "active_admin/view_helpers/download_format_links_helper"
 
 module ActiveAdmin
   module Views
@@ -32,17 +33,19 @@ module ActiveAdmin
       # collection => A paginated collection from kaminari
       # options    => These options will be passed to `page_entries_info`
       #   entry_name     => The name to display for this resource collection
+      #   params         => Extra parameters for pagination (e.g. { anchor: 'details' })
       #   param_name     => Parameter name for page number in the links (:page by default)
       #   download_links => Download links override (false or [:csv, :pdf])
       #
       def build(collection, options = {})
-        @collection     = collection
-        @param_name     = options.delete(:param_name)
+        @collection = collection
+        @params = options.delete(:params)
+        @param_name = options.delete(:param_name)
         @download_links = options.delete(:download_links)
-        @display_total  = options.delete(:pagination_total) { true }
-        @per_page       = options.delete(:per_page)
+        @display_total = options.delete(:pagination_total) { true }
+        @per_page = options.delete(:per_page)
 
-        unless collection.respond_to?(:num_pages)
+        unless collection.respond_to?(:total_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
 
@@ -68,19 +71,14 @@ module ActiveAdmin
           build_pagination
           div(page_entries_info(options).html_safe, class: "pagination_information")
 
-          download_links = @download_links.is_a?(Proc) ? instance_exec(&@download_links) : @download_links
-
-          if download_links.is_a?(Array) && !download_links.empty?
-            build_download_format_links download_links
-          else
-            build_download_format_links unless download_links == false
-          end
+          formats = build_download_formats @download_links
+          build_download_format_links formats if formats.any?
         end
       end
 
       def build_per_page_select
         div class: "pagination_per_page" do
-          text_node "Per page:"
+          text_node I18n.t("active_admin.pagination.per_page")
           select do
             @per_page.each do |per_page|
               option(
@@ -94,10 +92,22 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = {}
+        options = { theme: @display_total ? "active_admin" : "active_admin_countless" }
+        options[:params] = @params if @params
         options[:param_name] = @param_name if @param_name
 
-        text_node paginate collection, options
+        if !@display_total
+          # The #paginate method in kaminari will query the resource with a
+          # count(*) to determine how many pages there should be unless
+          # you pass in the :total_pages option. We issue a query to determine
+          # if there is another page or not, but the limit/offset make this
+          # query fast.
+          offset = collection.offset(collection.current_page * collection.limit_value).limit(1).count
+          options[:total_pages] = collection.current_page + offset
+          options[:right] = 0
+        end
+
+        text_node paginate collection, **options
       end
 
       include ::ActiveAdmin::Helpers::Collection
@@ -106,33 +116,42 @@ module ActiveAdmin
       # 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.t "active_admin.pagination.entry", count: 1, default: 'entry'
-          entries_name = I18n.t "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
           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('_', ' ')
+
+          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)
-          else;   I18n.t('active_admin.pagination.one_page', model: entries_name, n: collection.total_count)
+        if @display_total
+          if collection.total_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)
+            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,
+                   total: total,
+                   from: offset + 1,
+                   to: offset + collection_size
           end
         else
+          # Do not display total count, in order to prevent a `SELECT count(*)`.
+          # To do so we must not call `collection.total_pages`
           offset = (collection.current_page - 1) * collection.limit_value
-          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
+          I18n.t "active_admin.pagination.multiple_without_total",
+                 model: entries_name,
+                 from: offset + 1,
+                 to: offset + collection_size
         end
       end
 

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

@@ -5,11 +5,9 @@ module ActiveAdmin
       builder_method :panel
 
       def build(title, attributes = {})
-        icon_name = attributes.delete(:icon)
-        icn = icon_name ? icon(icon_name) : "".html_safe
         super(attributes)
         add_class "panel"
-        @title = h3(icn + title.to_s)
+        @title = h3(title.to_s)
         @contents = div(class: "panel_contents")
       end
 
@@ -31,7 +29,7 @@ module ActiveAdmin
       def header_action(*args)
         action = args[0]
 
-        @title << div(class: 'header_action') do
+        @title << div(class: "header_action") do
           action
         end
       end

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

@@ -1,5 +1,5 @@
-require 'active_admin/helpers/collection'
-require 'active_admin/view_helpers/method_or_proc_helper'
+require "active_admin/helpers/collection"
+require "active_admin/view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views
@@ -12,18 +12,23 @@ module ActiveAdmin
       include ActiveAdmin::ScopeChain
       include ::ActiveAdmin::Helpers::Collection
 
-
       def default_class_name
-        "scopes table_tools_segmented_control"
+        "scopes"
       end
 
       def tag_name
-        'ul'
+        "div"
       end
 
       def build(scopes, options = {})
-        scopes.each do |scope|
-          build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
+        scopes.group_by(&:group).each do |group, group_scopes|
+          ul class: "table_tools_segmented_control #{group_class(group)}" do
+            group_scopes.each do |scope|
+              build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
+            end
+
+            nil
+          end
         end
       end
 
@@ -31,12 +36,11 @@ module ActiveAdmin
 
       def build_scope(scope, options)
         li class: classes_for_scope(scope) do
-          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: scope.name
-          params     = request.query_parameters.except :page, :scope, :commit, :format
+          params = request.query_parameters.except :page, :scope, :commit, :format
 
-          a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
-            text_node scope_name
-            span class: 'count' do
+          a href: url_for(scope: scope.id, params: params), class: "table_tools_button" do
+            text_node scope_name(scope)
+            span class: "count" do
               "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
           end
@@ -61,6 +65,10 @@ module ActiveAdmin
       def get_scope_count(scope)
         collection_size(scope_chain(scope, collection_before_scope))
       end
+
+      def group_class(group)
+        group.present? ? "scope-group-#{group}" : "scope-default-group"
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+module ActiveAdmin
+  module Views
+
+    class Sidebar < Component
+      builder_method :sidebar
+
+      def build(sections, attributes = {})
+        super(attributes)
+        sections.map(&method(:sidebar_section))
+      end
+    end
+  end
+end

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

@@ -7,12 +7,17 @@ module ActiveAdmin
       # Takes a ActiveAdmin::SidebarSection instance
       def build(section)
         @section = section
-        super(@section.title, icon: @section.icon)
+        super(@section.title)
         add_class @section.custom_class if @section.custom_class
         self.id = @section.id
         build_sidebar_content
       end
 
+      # Renders attributes_table_for current resource
+      def attributes_table(*args, &block)
+        attributes_table_for resource, *args, &block
+      end
+
       protected
 
       def build_sidebar_content

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

@@ -4,7 +4,7 @@ module ActiveAdmin
     class SiteTitle < Component
 
       def tag_name
-        'h1'
+        "h1"
       end
 
       def build(namespace)
@@ -22,8 +22,8 @@ module ActiveAdmin
         @namespace.site_title_link.present?
       end
 
-      def site_title_image?
-        @namespace.site_title_image.present?
+      def site_title_image
+        @site_title_image ||= @namespace.site_title_image(helpers)
       end
 
       private
@@ -33,7 +33,7 @@ module ActiveAdmin
       end
 
       def site_title_content
-        if site_title_image?
+        if site_title_image.present?
           title_image
         else
           title_text
@@ -41,12 +41,11 @@ module ActiveAdmin
       end
 
       def title_text
-        helpers.render_or_call_method_or_proc_on(self, @namespace.site_title)
+        @title_text ||= @namespace.site_title(helpers)
       end
 
       def title_image
-        path = helpers.render_or_call_method_or_proc_on(self, @namespace.site_title_image)
-        helpers.image_tag(path, id: "site_title_image", alt: @namespace.site_title)
+        helpers.image_tag(site_title_image, id: "site_title_image", alt: title_text)
       end
 
     end

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

@@ -5,16 +5,15 @@ module ActiveAdmin
       builder_method :status_tag
 
       def tag_name
-        'span'
+        "span"
       end
 
       def default_class_name
-        'status_tag'
+        "status_tag"
       end
 
-      # @overload status_tag(status, type = nil, options = {})
+      # @overload status_tag(status, options = {})
       #   @param [String] status the status to display. One of the span classes will be an underscored version of the status.
-      #   @param [Symbol] type type of status. Will become a class of the span. ActiveAdmin provide style for :ok, :warning and :error.
       #   @param [Hash] options
       #   @option options [String] :class to override the default class
       #   @option options [String] :id to override the default id
@@ -26,41 +25,36 @@ module ActiveAdmin
       #   # => <span class='status_tag in_progress'>In Progress</span>
       #
       # @example
-      #   status_tag('active', :ok)
-      #   # => <span class='status_tag active ok'>Active</span>
+      #   status_tag('active', class: 'important', id: 'status_123', label: 'on')
+      #   # => <span class='status_tag active important' id='status_123'>on</span>
       #
-      # @example
-      #   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]
-        type = args[1]
+      def build(status, options = {})
         label = options.delete(:label)
         classes = options.delete(:class)
         status = convert_to_boolean_status(status)
 
         if status
           content = label || if s = status.to_s and s.present?
-            I18n.t "active_admin.status_tag.#{s.downcase}", default: s.titleize
-          end
+                               I18n.t "active_admin.status_tag.#{s.downcase}", default: s.titleize
+                             end
         end
 
         super(content, options)
 
         add_class(status_to_class(status)) if status
-        add_class(type.to_s) if type
         add_class(classes) if classes
       end
 
       protected
 
       def convert_to_boolean_status(status)
-        if status == 'true'
-          'Yes'
-        elsif ['false', nil].include?(status)
-          'No'
+        case status
+        when true, "true"
+          "Yes"
+        when false, "false"
+          "No"
+        when nil
+          "Unset"
         else
           status
         end
@@ -68,10 +62,12 @@ module ActiveAdmin
 
       def status_to_class(status)
         case status
+        when "Unset"
+          "unset no"
         when String, Symbol
-          status.to_s.titleize.gsub(/\s/, '').underscore
+          status.to_s.titleize.gsub(/\s/, "").underscore
         else
-          ''
+          ""
         end
       end
     end