activeadmin 1.0.0 → 2.11.0

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_application.javascripts.each do |path|
-              text_node(javascript_include_tag(path))
+            active_admin_namespace.meta_tags.each do |name, content|
+              text_node(meta(name: name, content: content))
             end
 
-            if active_admin_namespace.favicon
-              text_node(favicon_link_tag(active_admin_namespace.favicon))
+            active_admin_application.javascripts.each do |path|
+              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path) : javascript_include_tag(path)
+              text_node(javascript_tag)
             end
 
-            active_admin_namespace.meta_tags.each do |name, content|
-              text_node(tag(:meta, name: name, content: content))
+            if 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
@@ -25,7 +26,12 @@ module ActiveAdmin
         end
 
         def attributes_table(*args, &block)
-          table_title = ActiveAdmin::Localizers.resource(active_admin_config).t(:details)
+          opts = args.extract_options!
+          table_title = if opts.has_key?(:title)
+                          render_or_call_method_or_proc_on(resource, opts[:title])
+                        else
+                          ActiveAdmin::Localizers.resource(active_admin_config).t(:details)
+                        end
           panel(table_title) do
             attributes_table_for resource, *args, &block
           end

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
@@ -29,10 +30,10 @@ module ActiveAdmin
         breadcrumb_config = active_admin_config && active_admin_config.breadcrumb
 
         links = if breadcrumb_config.is_a?(Proc)
-          instance_exec(controller, &active_admin_config.breadcrumb)
-        elsif breadcrumb_config.present?
-          breadcrumb_links
-        end
+                  instance_exec(controller, &active_admin_config.breadcrumb)
+                elsif breadcrumb_config.present?
+                  breadcrumb_links
+                end
         return unless links.present? && links.is_a?(::Array)
         span class: "breadcrumb" do
           links.each do |link|
@@ -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

data/lib/active_admin.rb

@@ -1,62 +1,58 @@
-require 'active_support/core_ext'
-require 'set'
-
-require 'ransack'
-require 'ransack_ext'
-require 'bourbon'
-require 'kaminari'
-require 'formtastic'
-require 'formtastic_i18n'
-require 'sass-rails'
-require 'inherited_resources'
-require 'jquery-rails'
-require 'jquery-ui-rails'
-require 'coffee-rails'
-require 'arbre'
-
-require 'active_admin/helpers/i18n'
+# frozen_string_literal: true
+require "active_support/core_ext"
+require "set"
+
+require "ransack"
+require "ransack_ext"
+require "kaminari"
+require "formtastic"
+require "formtastic_i18n"
+require "inherited_resources"
+require "jquery-rails"
+require "arbre"
+
+require "active_admin/helpers/i18n"
 
 module ActiveAdmin
 
-  autoload :VERSION,                  'active_admin/version'
-  autoload :Application,              'active_admin/application'
-  autoload :AssetRegistration,        'active_admin/asset_registration'
-  autoload :Authorization,            'active_admin/authorization_adapter'
-  autoload :AuthorizationAdapter,     'active_admin/authorization_adapter'
-  autoload :Callbacks,                'active_admin/callbacks'
-  autoload :Component,                'active_admin/component'
-  autoload :BaseController,           'active_admin/base_controller'
-  autoload :CanCanAdapter,            'active_admin/cancan_adapter'
-  autoload :ControllerAction,         'active_admin/controller_action'
-  autoload :CSVBuilder,               'active_admin/csv_builder'
-  autoload :Dependency,               'active_admin/dependency'
-  autoload :Deprecation,              'active_admin/deprecation'
-  autoload :Devise,                   'active_admin/devise'
-  autoload :DSL,                      'active_admin/dsl'
-  autoload :Event,                    'active_admin/event'
-  autoload :FormBuilder,              'active_admin/form_builder'
-  autoload :Inputs,                   'active_admin/inputs'
-  autoload :Localizers,               'active_admin/localizers'
-  autoload :Menu,                     'active_admin/menu'
-  autoload :MenuCollection,           'active_admin/menu_collection'
-  autoload :MenuItem,                 'active_admin/menu_item'
-  autoload :Namespace,                'active_admin/namespace'
-  autoload :OrderClause,              'active_admin/order_clause'
-  autoload :Page,                     'active_admin/page'
-  autoload :PagePresenter,            'active_admin/page_presenter'
-  autoload :PageController,           'active_admin/page_controller'
-  autoload :PageDSL,                  'active_admin/page_dsl'
-  autoload :PunditAdapter,            'active_admin/pundit_adapter'
-  autoload :Resource,                 'active_admin/resource'
-  autoload :ResourceController,       'active_admin/resource_controller'
-  autoload :ResourceDSL,              'active_admin/resource_dsl'
-  autoload :Scope,                    'active_admin/scope'
-  autoload :ScopeChain,               'active_admin/helpers/scope_chain'
-  autoload :SidebarSection,           'active_admin/sidebar_section'
-  autoload :TableBuilder,             'active_admin/table_builder'
-  autoload :ViewFactory,              'active_admin/view_factory'
-  autoload :ViewHelpers,              'active_admin/view_helpers'
-  autoload :Views,                    'active_admin/views'
+  autoload :VERSION, "active_admin/version"
+  autoload :Application, "active_admin/application"
+  autoload :AssetRegistration, "active_admin/asset_registration"
+  autoload :Authorization, "active_admin/authorization_adapter"
+  autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
+  autoload :Callbacks, "active_admin/callbacks"
+  autoload :Component, "active_admin/component"
+  autoload :BaseController, "active_admin/base_controller"
+  autoload :CanCanAdapter, "active_admin/cancan_adapter"
+  autoload :ControllerAction, "active_admin/controller_action"
+  autoload :CSVBuilder, "active_admin/csv_builder"
+  autoload :Dependency, "active_admin/dependency"
+  autoload :Deprecation, "active_admin/deprecation"
+  autoload :Devise, "active_admin/devise"
+  autoload :DSL, "active_admin/dsl"
+  autoload :FormBuilder, "active_admin/form_builder"
+  autoload :Inputs, "active_admin/inputs"
+  autoload :Localizers, "active_admin/localizers"
+  autoload :Menu, "active_admin/menu"
+  autoload :MenuCollection, "active_admin/menu_collection"
+  autoload :MenuItem, "active_admin/menu_item"
+  autoload :Namespace, "active_admin/namespace"
+  autoload :OrderClause, "active_admin/order_clause"
+  autoload :Page, "active_admin/page"
+  autoload :PagePresenter, "active_admin/page_presenter"
+  autoload :PageController, "active_admin/page_controller"
+  autoload :PageDSL, "active_admin/page_dsl"
+  autoload :PunditAdapter, "active_admin/pundit_adapter"
+  autoload :Resource, "active_admin/resource"
+  autoload :ResourceController, "active_admin/resource_controller"
+  autoload :ResourceDSL, "active_admin/resource_dsl"
+  autoload :Scope, "active_admin/scope"
+  autoload :ScopeChain, "active_admin/helpers/scope_chain"
+  autoload :SidebarSection, "active_admin/sidebar_section"
+  autoload :TableBuilder, "active_admin/table_builder"
+  autoload :ViewFactory, "active_admin/view_factory"
+  autoload :ViewHelpers, "active_admin/view_helpers"
+  autoload :Views, "active_admin/views"
 
   class << self
 
@@ -73,11 +69,11 @@ module ActiveAdmin
       application.prepare!
     end
 
-    delegate :register,      to: :application
+    delegate :register, to: :application
     delegate :register_page, to: :application
-    delegate :unload!,       to: :application
-    delegate :load!,         to: :application
-    delegate :routes,        to: :application
+    delegate :unload!, to: :application
+    delegate :load!, to: :application
+    delegate :routes, to: :application
 
     # A callback is triggered each time (before) Active Admin loads the configuration files.
     # In development mode, this will happen whenever the user changes files. In production
@@ -93,7 +89,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (before) AA loads resources
     def before_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &wrap_block_for_active_support_notifications(block)
     end
 
     # A callback is triggered each time (after) Active Admin loads the configuration files. This
@@ -111,7 +107,13 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (after) AA loads resources
     def after_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &wrap_block_for_active_support_notifications(block)
+    end
+
+    private
+
+    def wrap_block_for_active_support_notifications block
+      proc { |_name, _start, _finish, _id, payload| block.call payload }
     end
 
   end
@@ -119,13 +121,13 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require 'active_admin/engine'
-require 'active_admin/error'
+require "active_admin/engine"
+require "active_admin/error"
 
 # Require internal plugins
-require 'active_admin/batch_actions'
-require 'active_admin/filters'
+require "active_admin/batch_actions"
+require "active_admin/filters"
 
 # Require ORM-specific plugins
-require 'active_admin/orm/active_record' if defined? ActiveRecord
-require 'active_admin/orm/mongoid'       if defined? Mongoid
+require "active_admin/orm/active_record" if defined? ActiveRecord
+require "active_admin/orm/mongoid" if defined? Mongoid

data/lib/activeadmin.rb

@@ -1 +1,2 @@
-require 'active_admin'
+# frozen_string_literal: true
+require "active_admin"

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def install_assets
-        template 'active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee'
+        template "active_admin.js", "app/assets/javascripts/active_admin.js"
         template "active_admin.scss", "app/assets/stylesheets/active_admin.scss"
       end
 

data/lib/generators/active_admin/assets/templates/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

data/lib/generators/active_admin/assets/templates/active_admin.scss

@@ -1,4 +1,4 @@
-// SASS variable overrides must be declared before loading up Active Admin's styles.
+// Sass variable overrides must be declared before loading up Active Admin's styles.
 //
 // To view the variables that Active Admin provides, take a look at
 // `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
@@ -11,7 +11,7 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
 
-// Overriding any non-variable SASS must be done after the fact.
+// Overriding any non-variable Sass must be done after the fact.
 // For example, to change the default status-tag color:
 //
 //   .status_tag { background: #6090DB; }

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/error"
 require "active_admin/dependency"
 
@@ -7,13 +8,13 @@ module ActiveAdmin
       desc "Creates an admin user and uses Devise for authentication"
       argument :name, type: :string, default: "AdminUser"
 
-      class_option  :registerable, type: :boolean, default: false,
-                    desc: "Should the generated resource be registerable?"
+      class_option :registerable, type: :boolean, default: false,
+                                  desc: "Should the generated resource be registerable?"
 
       RESERVED_NAMES = [:active_admin_user]
 
-      class_option  :default_user, type: :boolean, default: true,
-                    desc: "Should a default user be created inside the migration?"
+      class_option :default_user, type: :boolean, default: true,
+                                  desc: "Should a default user be created inside the migration?"
 
       def install_devise
         begin
@@ -22,7 +23,7 @@ module ActiveAdmin
           raise ActiveAdmin::GeneratorError, "#{e.message} If you don't want to use devise, run the generator with --skip-users."
         end
 
-        require 'devise'
+        require "devise"
 
         initializer_file =
           File.join(destination_root, "config", "initializers", "devise.rb")
@@ -59,7 +60,7 @@ module ActiveAdmin
         seeds_file = seeds_paths.existent.first
         return if seeds_file.nil? || !options[:default_user]
 
-        create_user_code = "#{class_name}.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password')"
+        create_user_code = "#{class_name}.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password') if Rails.env.development?"
 
         append_to_file seeds_file, create_user_code
       end