activeadmin 1.2.1 → 2.13.1

data/lib/active_admin/views/index_as_grid.rb

@@ -1,30 +1,31 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
-     # # Index as a Grid
-     #
-     # Sometimes you want to display the index screen for a set of resources as a grid
-     # (possibly a grid of thumbnail images). To do so, use the :grid option for the
-     # index block.
-     #
-     # ```ruby
-     # index as: :grid do |product|
-     #   link_to image_tag(product.image_path), admin_product_path(product)
-     # end
-     # ```
-     #
-     # The block is rendered within a cell in the grid once for each resource in the
-     # collection. The resource is passed into the block for you to use in the view.
-     #
-     # You can customize the number of columns that are rendered using the columns
-     # option:
-     #
-     # ```ruby
-     # index as: :grid, columns: 5 do |product|
-     #   link_to image_tag(product.image_path), admin_product_path(product)
-     # end
-     # ```
-     #
+    # # Index as a Grid
+    #
+    # Sometimes you want to display the index screen for a set of resources as a grid
+    # (possibly a grid of thumbnail images). To do so, use the :grid option for the
+    # index block.
+    #
+    # ```ruby
+    # index as: :grid do |product|
+    #   link_to image_tag(product.image_path), admin_product_path(product)
+    # end
+    # ```
+    #
+    # The block is rendered within a cell in the grid once for each resource in the
+    # collection. The resource is passed into the block for you to use in the view.
+    #
+    # You can customize the number of columns that are rendered using the columns
+    # option:
+    #
+    # ```ruby
+    # index as: :grid, columns: 5 do |product|
+    #   link_to image_tag(product.image_path), admin_product_path(product)
+    # end
+    # ```
+    #
     class IndexAsGrid < ActiveAdmin::Component
 
       def build(page_presenter, collection)
@@ -42,7 +43,7 @@ module ActiveAdmin
         "grid"
       end
 
-     protected
+      protected
 
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?
@@ -68,7 +69,7 @@ module ActiveAdmin
       end
 
       def build_empty_cell
-        td '&nbsp;'.html_safe
+        td "&nbsp;".html_safe
       end
 
       def default_number_of_columns

data/lib/active_admin/views/index_as_table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -110,7 +111,8 @@ module ActiveAdmin
     # end
     # ```
     #
-    # In addition, you can insert the position of the row in the greater collection by using the index_column special command:
+    # In addition, you can insert the position of the row in the greater
+    # collection by using the index_column special command:
     #
     # ```ruby
     # index do
@@ -120,7 +122,8 @@ module ActiveAdmin
     # end
     # ```
     #
-    # index_column take an optional offset parameter to allow a developer to set the starting number for the index (default is 1).
+    # index_column take an optional offset parameter to allow a developer to set
+    # the starting number for the index (default is 1).
     #
     # ## Sorting
     #
@@ -128,9 +131,7 @@ module ActiveAdmin
     # sortable by default. If you are creating a custom column, you may need to give
     # Active Admin a hint for how to sort the table.
     #
-    # 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.
-    #
+    # You can pass the key specifying 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.
     # Otherwise, any attribute that the resource collection responds to can be used.
     #
@@ -192,6 +193,13 @@ module ActiveAdmin
     # end
     # ```
     #
+    # You can also define associated objects to include outside of the
+    # `scoped_collection` method:
+    #
+    # ```ruby
+    # includes :publisher
+    # ```
+    #
     # Then it's simple to sort by any Publisher attribute from within the index table:
     #
     # ```ruby
@@ -271,13 +279,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
@@ -286,9 +294,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
@@ -297,7 +305,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.
@@ -337,12 +345,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
@@ -362,26 +370,27 @@ module ActiveAdmin
           end
         end
 
-      private
+        private
 
         def defaults(resource, options = {})
-          if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
-            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}", title: I18n.t('active_admin.view')
+          localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+          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)
-            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: I18n.t('active_admin.edit')
+          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)
-            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}", title: I18n.t('active_admin.delete'),
-              method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
+          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) }
           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

@@ -1,44 +1,52 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages
       class Base < Arbre::HTML::Document
 
         def build(*args)
-          super
-          add_classes_to_body
+          set_attribute :lang, I18n.locale
           build_active_admin_head
           build_page
         end
 
+        alias_method :html_title, :title # Arbre::HTML::Title
+        def title
+          self.class.name
+        end
+
+        def main_content
+          I18n.t("active_admin.main_content", model: title).html_safe
+        end
+
         private
 
         delegate :active_admin_config, :controller, :params, to: :helpers
 
-        def add_classes_to_body
-          @body.add_class(params[:action])
-          @body.add_class(params[:controller].tr('/', '_'))
-          @body.add_class("active_admin")
-          @body.add_class("logged_in")
-          @body.add_class(active_admin_namespace.name.to_s + "_namespace")
-        end
-
         def build_active_admin_head
-          within @head do
-            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_namespace.site_title)].compact.join(" | ")
+          within head do
+            html_title [title, helpers.active_admin_namespace.site_title(self)].compact.join(" | ")
+
+            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
-              text_node(favicon_link_tag(active_admin_namespace.favicon))
+              favicon = active_admin_namespace.favicon
+              favicon_tag = active_admin_namespace.use_webpacker ? favicon_pack_tag(favicon) : favicon_link_tag(favicon)
+              text_node(favicon_tag)
             end
 
             text_node csrf_meta_tag
@@ -46,43 +54,46 @@ module ActiveAdmin
         end
 
         def build_page
-          within @body do
+          within body(class: body_classes) do
             div id: "wrapper" do
               build_unsupported_browser
-              build_header
-              build_title_bar
+              header active_admin_namespace, current_menu
+              title_bar title, action_items_for_action
               build_page_content
-              build_footer
+              footer active_admin_namespace
             end
           end
         end
 
+        def body_classes
+          Arbre::HTML::ClassList.new [
+            params[:action],
+            params[:controller].tr("/", "_"),
+            "active_admin", "logged_in",
+            active_admin_namespace.name.to_s + "_namespace"
+          ]
+        end
+
         def build_unsupported_browser
           if active_admin_namespace.unsupported_browser_matcher =~ controller.request.user_agent
-            insert_tag view_factory.unsupported_browser
+            unsupported_browser
           end
         end
 
-        def build_header
-          insert_tag view_factory.header, active_admin_namespace, current_menu
-        end
-
-        def build_title_bar
-          insert_tag view_factory.title_bar, title, action_items_for_action
-        end
-
         def build_page_content
           build_flash_messages
           div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_main_content_wrapper
-            build_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
@@ -95,19 +106,6 @@ module ActiveAdmin
           end
         end
 
-        def main_content
-          I18n.t('active_admin.main_content', model: title).html_safe
-        end
-
-        def title
-          self.class.name
-        end
-
-        # Set's the page title for the layout to render
-        def set_page_title
-          set_ivar_on_view "@page_title", title
-        end
-
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
           if active_admin_config && active_admin_config.sidebar_sections?
@@ -125,24 +123,10 @@ module ActiveAdmin
           end
         end
 
-        # Renders the sidebar
-        def build_sidebar
-          div id: "sidebar" do
-            sidebar_sections_for_action.collect do |section|
-              sidebar_section(section)
-            end
-          end
-        end
-
         def skip_sidebar?
           sidebar_sections_for_action.empty? || assigns[:skip_sidebar] == true
         end
 
-        # Renders the content for the footer
-        def build_footer
-          insert_tag view_factory.footer, active_admin_namespace
-        end
-
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages

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

@@ -1,4 +1,5 @@
-require 'active_admin/helpers/collection'
+# frozen_string_literal: true
+require "active_admin/helpers/collection"
 
 module ActiveAdmin
   module Views
@@ -111,7 +112,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 +125,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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages

data/lib/active_admin/views/tabbed_navigation.rb

@@ -1,65 +1,11 @@
+# frozen_string_literal: true
+require_relative "components/menu"
+
 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 TabbedNavigation < Component
-
-      attr_reader :menu
-
-      # Build a new tabbed navigation component.
-      #
-      # @param [ActiveAdmin::Menu] menu the Menu to render
-      # @param [Hash] options the options as passed to the underlying ul element.
-      #
+    class TabbedNavigation < Menu
       def build(menu, options = {})
-        @menu = menu
-        super(default_options.merge(options))
-        build_menu
-      end
-
-      # The top-level menu items that should be displayed.
-      def menu_items
-        menu.items(self)
-      end
-
-      def tag_name
-        'ul'
-      end
-
-      private
-
-      def build_menu
-        menu_items.each do |item|
-          build_menu_item(item)
-        end
-      end
-
-      def build_menu_item(item)
-        li id: item.id do |li|
-          li.add_class "current" if item.current? assigns[:current_tab]
-
-          if url = item.url(self)
-            text_node link_to item.label(self), url, item.html_options
-          else
-            span item.label(self), item.html_options
-          end
-
-          if children = item.items(self).presence
-            li.add_class "has_nested"
-            ul do
-              children.each{ |child| build_menu_item child }
-            end
-          end
-        end
-      end
-
-      def default_options
-        { id: "tabs" }
+        super(menu, options.reverse_merge(id: "tabs"))
       end
     end
   end

data/lib/active_admin/views/title_bar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class TitleBar < Component
@@ -43,7 +44,7 @@ module ActiveAdmin
       end
 
       def build_title_tag
-        h2(@title, id: 'page_title')
+        h2(@title, id: "page_title")
       end
 
       def build_action_items

data/lib/active_admin/views.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
     # Loads all the classes in views/*.rb
-    Dir[File.expand_path('../views', __FILE__) + "/**/*.rb"].sort.each{ |f| require f }
+    Dir[File.expand_path("views", __dir__) + "/**/*.rb"].sort.each { |f| require f }
 
   end
 end