activeadmin 2.4.0 → 2.9.0

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

@@ -35,30 +35,30 @@ module ActiveAdmin
         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
@@ -37,7 +37,7 @@ module ActiveAdmin
       def build_index_list(index_class)
         li class: classes_for_index(index_class) do
           params = request.query_parameters.except :page, :commit, :format
-          url_with_params = url_for(params.merge(as: index_class.index_name.to_sym))
+          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

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

@@ -25,7 +25,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'ul'
+        "ul"
       end
     end
   end

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

@@ -18,7 +18,7 @@ module ActiveAdmin
         add_class "current" if item.current? assigns[:current_tab]
 
         if url
-          text_node link_to label, url, item.html_options
+          text_node link_to label, url, **item.html_options
         else
           span label, item.html_options
         end
@@ -30,7 +30,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'li'
+        "li"
       end
 
       # Sorts by priority first, then alphabetically by label if needed.
@@ -44,14 +44,14 @@ module ActiveAdmin
       end
 
       def to_s
-        visible? ? super : ''
+        visible? ? super : ""
       end
 
       private
 
       # URL is not nil, empty, or '#'
       def real_url?
-        url && url.present? && url != '#'
+        url && url.present? && url != "#"
       end
     end
   end

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

@@ -1,5 +1,5 @@
-require 'active_admin/helpers/collection'
-require 'active_admin/view_helpers/download_format_links_helper'
+require "active_admin/helpers/collection"
+require "active_admin/view_helpers/download_format_links_helper"
 
 module ActiveAdmin
   module Views
@@ -38,12 +38,12 @@ module ActiveAdmin
       #   download_links => Download links override (false or [:csv, :pdf])
       #
       def build(collection, options = {})
-        @collection     = collection
-        @params         = options.delete(:params)
-        @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?(:total_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
@@ -92,8 +92,8 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = { theme: @display_total ? 'active_admin' : 'active_admin_countless' }
-        options[:params]     = @params     if @params
+        options = { theme: @display_total ? "active_admin" : "active_admin_countless" }
+        options[:params] = @params if @params
         options[:param_name] = @param_name if @param_name
 
         if !@display_total
@@ -107,7 +107,7 @@ module ActiveAdmin
           options[:right] = 0
         end
 
-        text_node paginate collection, options
+        text_node paginate collection, **options
       end
 
       include ::ActiveAdmin::Helpers::Collection
@@ -116,27 +116,28 @@ 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 @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)
+            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
+            total = collection.total_count
             I18n.t "active_admin.pagination.multiple",
                    model: entries_name,
                    total: total,

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

@@ -29,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
@@ -17,7 +17,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'div'
+        "div"
       end
 
       def build(scopes, options = {})
@@ -26,6 +26,8 @@ module ActiveAdmin
             group_scopes.each do |scope|
               build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
             end
+
+            nil
           end
         end
       end
@@ -36,9 +38,9 @@ module ActiveAdmin
         li class: classes_for_scope(scope) do
           params = request.query_parameters.except :page, :scope, :commit, :format
 
-          a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
+          a href: url_for(scope: scope.id, params: params), class: "table_tools_button" do
             text_node scope_name(scope)
-            span class: 'count' do
+            span class: "count" do
               "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
           end

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)

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

@@ -5,11 +5,11 @@ 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, options = {})
@@ -49,12 +49,12 @@ module ActiveAdmin
 
       def convert_to_boolean_status(status)
         case status
-        when true, 'true'
-          'Yes'
-        when false, 'false'
-          'No'
+        when true, "true"
+          "Yes"
+        when false, "false"
+          "No"
         when nil
-          'Unset'
+          "Unset"
         else
           status
         end
@@ -62,12 +62,12 @@ module ActiveAdmin
 
       def status_to_class(status)
         case status
-        when 'Unset'
-          'unset no'
+        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

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

@@ -4,17 +4,18 @@ module ActiveAdmin
       builder_method :table_for
 
       def tag_name
-        'table'
+        "table"
       end
 
       def build(obj, *attrs)
-        options         = attrs.extract_options!
-        @sortable       = options.delete(:sortable)
-        @collection     = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
+        options = attrs.extract_options!
+        @sortable = options.delete(:sortable)
+        @collection = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
         @resource_class = options.delete(:i18n)
         @resource_class ||= @collection.klass if @collection.respond_to? :klass
-        @columns        = []
-        @row_class      = options.delete(:row_class)
+
+        @columns = []
+        @row_class = options.delete(:row_class)
 
         build_table
         super(options)
@@ -28,7 +29,7 @@ module ActiveAdmin
       def column(*args, &block)
         options = default_options.merge(args.extract_options!)
         title = args[0]
-        data  = args[1] || args[0]
+        data = args[1] || args[0]
 
         col = Column.new(title, data, @resource_class, options, &block)
         @columns << col
@@ -64,12 +65,12 @@ module ActiveAdmin
       end
 
       def build_table_header(col)
-        classes  = Arbre::HTML::ClassList.new
+        classes = Arbre::HTML::ClassList.new
         sort_key = sortable? && col.sortable? && col.sort_key
-        params   = request.query_parameters.except :page, :order, :commit, :format
+        params = request.query_parameters.except :page, :order, :commit, :format
 
-        classes << 'sortable'                         if sort_key
-        classes << "sorted-#{current_sort[1]}"        if sort_key && current_sort[0] == sort_key
+        classes << "sortable" if sort_key
+        classes << "sorted-#{current_sort[1]}" if sort_key && current_sort[0] == sort_key
         classes << col.html_class
 
         if sort_key
@@ -85,13 +86,13 @@ module ActiveAdmin
         @tbody = tbody do
           # Build enough rows for our collection
           @collection.each do |elem|
-            classes = [helpers.cycle('odd', 'even')]
+            classes = [helpers.cycle("odd", "even")]
 
             if @row_class
               classes << @row_class.call(elem)
             end
 
-            tr(class: classes.flatten.join(' '), id: dom_id_for(elem))
+            tr(class: classes.flatten.join(" "), id: dom_id_for(elem))
           end
         end
       end
@@ -125,8 +126,8 @@ module ActiveAdmin
       # 'desc' it will return 'asc'
       def order_for_sort_key(sort_key)
         current_key, current_order = current_sort
-        return 'desc' unless current_key == sort_key
-        current_order == 'desc' ? 'asc' : 'desc'
+        return "desc" unless current_key == sort_key
+        current_order == "desc" ? "asc" : "desc"
       end
 
       def default_options
@@ -137,7 +138,7 @@ module ActiveAdmin
 
       class Column
 
-        attr_accessor :title, :data , :html_class
+        attr_accessor :title, :data, :html_class
 
         def initialize(*args, &block)
           @options = args.extract_options!
@@ -149,7 +150,7 @@ module ActiveAdmin
           elsif @title.present?
             html_classes << "col-#{@title.to_s.parameterize(separator: "_")}"
           end
-          @html_class = html_classes.join(' ')
+          @html_class = html_classes.join(" ")
           @data = args[1] || args[0]
           @data = block if block
           @resource_class = args[2]

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

@@ -10,8 +10,8 @@ module ActiveAdmin
       end
 
       def build(&block)
-        @menu = ul(class: 'nav nav-tabs', role: "tablist")
-        @tabs_content = div(class: 'tab-content')
+        @menu = ul(class: "nav nav-tabs", role: "tablist")
+        @tabs_content = div(class: "tab-content")
       end
 
       def build_menu_item(title, options, &block)
@@ -32,7 +32,7 @@ module ActiveAdmin
 
       def fragmentize(string)
         result = string.parameterize
-        result = URI.encode(string) if result.blank?
+        result = CGI.escape(string) if result.blank?
         result
       end
     end

data/lib/active_admin/views/footer.rb

@@ -20,7 +20,8 @@ module ActiveAdmin
       end
 
       def powered_by_message
-        I18n.t('active_admin.powered_by',
+        I18n.t(
+          "active_admin.powered_by",
           active_admin: link_to("Active Admin", "https://activeadmin.info"),
           version: ActiveAdmin::VERSION).html_safe
       end

data/lib/active_admin/views/header.rb

@@ -10,8 +10,8 @@ module ActiveAdmin
         @utility_menu = @namespace.fetch_menu(:utility_navigation)
 
         site_title @namespace
-        global_navigation @menu, class: 'header-item tabs'
-        utility_navigation @utility_menu, id: "utility_nav", class: 'header-item tabs'
+        global_navigation @menu, class: "header-item tabs"
+        utility_navigation @utility_menu, id: "utility_nav", class: "header-item tabs"
       end
 
     end

data/lib/active_admin/views/index_as_blog.rb

@@ -135,7 +135,7 @@ module ActiveAdmin
 
       def build_body(post)
         if @body
-          div class: 'content' do
+          div class: "content" do
             render_method_on_post_or_call_proc post, @body
           end
         end

data/lib/active_admin/views/index_as_grid.rb

@@ -68,7 +68,7 @@ module ActiveAdmin
       end
 
       def build_empty_cell
-        td ' '.html_safe
+        td " ".html_safe
       end
 
       def default_number_of_columns

data/lib/active_admin/views/index_as_table.rb

@@ -278,13 +278,13 @@ module ActiveAdmin
         # Display a column for checkbox
         def selectable_column
           return unless active_admin_config.batch_actions.any?
-          column resource_selection_toggle_cell, class: 'col-selectable', sortable: false do |resource|
+          column resource_selection_toggle_cell, class: "col-selectable", sortable: false do |resource|
             resource_selection_cell resource
           end
         end
 
         def index_column(start_value = 1)
-          column '#', class: 'col-index', sortable: false do |resource|
+          column "#", class: "col-index", sortable: false do |resource|
             @collection.offset_value + @collection.index(resource) + start_value
           end
         end
@@ -293,9 +293,9 @@ module ActiveAdmin
         def id_column
           raise "#{resource_class.name} has no primary_key!" unless resource_class.primary_key
           column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
-            if controller.action_methods.include?('show')
+            if controller.action_methods.include?("show")
               link_to resource.id, resource_path(resource), class: "resource_id_link"
-            elsif controller.action_methods.include?('edit')
+            elsif controller.action_methods.include?("edit")
               link_to resource.id, edit_resource_path(resource), class: "resource_id_link"
             else
               resource.id
@@ -304,7 +304,7 @@ module ActiveAdmin
         end
 
         def default_actions
-          raise '`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead.'
+          raise "`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead."
         end
 
         # Add links to perform actions.
@@ -344,12 +344,12 @@ module ActiveAdmin
         #
         # ```
         def actions(options = {}, &block)
-          name          = options.delete(:name)     { '' }
-          defaults      = options.delete(:defaults) { true }
-          dropdown      = options.delete(:dropdown) { false }
-          dropdown_name = options.delete(:dropdown_name) { I18n.t 'active_admin.dropdown_actions.button_label', default: 'Actions' }
+          name = options.delete(:name) { "" }
+          defaults = options.delete(:defaults) { true }
+          dropdown = options.delete(:dropdown) { false }
+          dropdown_name = options.delete(:dropdown_name) { I18n.t "active_admin.dropdown_actions.button_label", default: "Actions" }
 
-          options[:class] ||= 'col-actions'
+          options[:class] ||= "col-actions"
 
           column name, options do |resource|
             if dropdown
@@ -373,23 +373,23 @@ module ActiveAdmin
 
         def defaults(resource, options = {})
           localizer = ActiveAdmin::Localizers.resource(active_admin_config)
-          if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
+          if controller.action_methods.include?("show") && authorized?(ActiveAdmin::Auth::READ, resource)
             item localizer.t(:view), resource_path(resource), class: "view_link #{options[:css_class]}", title: localizer.t(:view)
           end
-          if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::UPDATE, resource)
             item localizer.t(:edit), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: localizer.t(:edit)
           end
-          if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
+          if controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             item localizer.t(:delete), resource_path(resource), class: "delete_link #{options[:css_class]}", title: localizer.t(:delete),
-              method: :delete, data: { confirm: localizer.t(:delete_confirmation) }
+                                                                method: :delete, data: { confirm: localizer.t(:delete_confirmation) }
           end
         end
 
         class TableActions < ActiveAdmin::Component
           builder_method :table_actions
 
-          def item *args
-            text_node link_to *args
+          def item *args, **kwargs
+            text_node link_to(*args, **kwargs)
           end
         end
       end # IndexTableFor

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

@@ -15,7 +15,7 @@ module ActiveAdmin
         end
 
         def main_content
-          I18n.t('active_admin.main_content', model: title).html_safe
+          I18n.t("active_admin.main_content", model: title).html_safe
         end
 
         private
@@ -29,15 +29,17 @@ module ActiveAdmin
             text_node(active_admin_namespace.head)
 
             active_admin_application.stylesheets.each do |style, options|
-              text_node stylesheet_link_tag(style, options).html_safe
+              stylesheet_tag = active_admin_namespace.use_webpacker ? stylesheet_pack_tag(style, **options) : stylesheet_link_tag(style, **options)
+              text_node(stylesheet_tag.html_safe) if stylesheet_tag
             end
 
             active_admin_namespace.meta_tags.each do |name, content|
-              text_node(tag(:meta, name: name, content: content))
+              text_node(meta(name: name, content: content))
             end
 
             active_admin_application.javascripts.each do |path|
-              text_node(javascript_include_tag(path))
+              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path) : javascript_include_tag(path)
+              text_node(javascript_tag)
             end
 
             if active_admin_namespace.favicon
@@ -63,9 +65,9 @@ module ActiveAdmin
         def body_classes
           Arbre::HTML::ClassList.new [
             params[:action],
-            params[:controller].tr('/', '_'),
-            'active_admin', 'logged_in',
-            active_admin_namespace.name.to_s + '_namespace'
+            params[:controller].tr("/", "_"),
+            "active_admin", "logged_in",
+            active_admin_namespace.name.to_s + "_namespace"
           ]
         end
 
@@ -79,14 +81,16 @@ module ActiveAdmin
           build_flash_messages
           div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_main_content_wrapper
-            sidebar sidebar_sections_for_action, id: 'sidebar' unless skip_sidebar?
+            sidebar sidebar_sections_for_action, id: "sidebar" unless skip_sidebar?
           end
         end
 
         def build_flash_messages
-          div class: 'flashes' do
-            flash_messages.each do |type, message|
-              div message, class: "flash flash_#{type}"
+          div class: "flashes" do
+            flash_messages.each do |type, messages|
+              [*messages].each do |message|
+                div message, class: "flash flash_#{type}"
+              end
             end
           end
         end

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

@@ -1,4 +1,4 @@
-require 'active_admin/helpers/collection'
+require "active_admin/helpers/collection"
 
 module ActiveAdmin
   module Views
@@ -111,7 +111,7 @@ module ActiveAdmin
 
         def render_blank_slate
           blank_slate_content = I18n.t("active_admin.blank_slate.content", resource_name: active_admin_config.plural_resource_label)
-          if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
+          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
             blank_slate_content = [blank_slate_content, blank_slate_link].compact.join(" ")
           end
           insert_tag(view_factory.blank_slate, blank_slate_content)
@@ -124,18 +124,20 @@ module ActiveAdmin
 
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
-          paginator        = config.fetch(:paginator, true)
-          download_links   = config.fetch(:download_links, active_admin_config.namespace.download_links)
+
+          paginator = config.fetch(:paginator, true)
+          download_links = config.fetch(:download_links, active_admin_config.namespace.download_links)
           pagination_total = config.fetch(:pagination_total, true)
-          per_page         = config.fetch(:per_page, active_admin_config.per_page)
-
-          paginated_collection(collection, entry_name:       active_admin_config.resource_label,
-                                           entries_name:     active_admin_config.plural_resource_label(count: collection_size),
-                                           download_links:   download_links,
-                                           paginator:        paginator,
-                                           per_page:         per_page,
-                                           pagination_total: pagination_total) do
-            div class: 'index_content' do
+          per_page = config.fetch(:per_page, active_admin_config.per_page)
+
+          paginated_collection(
+            collection, entry_name: active_admin_config.resource_label,
+                        entries_name: active_admin_config.plural_resource_label(count: collection_size),
+                        download_links: download_links,
+                        paginator: paginator,
+                        per_page: per_page,
+                        pagination_total: pagination_total) do
+            div class: "index_content" do
               insert_tag(renderer_class, config, collection)
             end
           end