activeadmin 2.9.0 → 2.14.0

data/config/locales/zh-CN.yml

@@ -1,4 +1,20 @@
 "zh-CN":
+  activerecord:
+    models:
+      comment:
+        one: "评论"
+        other: "评论"
+      active_admin/comment:
+        one: "评论"
+        other: "评论"
+    attributes:
+      active_admin/comment:
+        author_type: "作者类型"
+        body: "内容"
+        created_at: "创建"
+        namespace: "Namespace"
+        resource_type: "Resource 类型"
+        updated_at: "更新"
   active_admin:
     dashboard: "控制面板"
     dashboard_welcome:
@@ -8,8 +24,8 @@
     edit: "编辑"
     delete: "删除"
     delete_confirmation: "确定删除?"
-    create_another: "新建另一个%{model}"
-    new_model: "新建%{model}"
+    create_another: "新增另一个%{model}"
+    new_model: "新增%{model}"
     edit_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
@@ -17,10 +33,11 @@
     empty: "未定义"
     previous: "上一个"
     next: "下一个"
-    download: "下载:"
-    has_many_new: "新建一个%{model}"
+    download: "下载："
+    has_many_new: "新增一个%{model}"
     has_many_delete: "删除"
     has_many_remove: "清除"
+    move: "移动"
     filters:
       buttons:
         filter: "过滤"
@@ -28,26 +45,28 @@
       predicates:
         contains: "包含"
         equals: "等于"
-        starts_with: "开头"
-        ends_with: "完与"
+        starts_with: "始于"
+        ends_with: "止于"
         greater_than: "大于"
         less_than: "小于"
         gteq_datetime: "大于等于"
         lteq_datetime: "小于等于"
         from: "起"
         to: "止"
+    scopes:
+      all: "所有"
     search_status:
       headline: "搜索条件："
-      current_scope: "搜索范围："
+      current_scope: "范围："
       current_filters: "过滤条件："
       no_current_filters: "无"
     status_tag:
       "yes": "是"
       "no": "否"
       "unset": "否"
-    main_content: "请执行 %{model}#main_content 来显示内容."
+    main_content: "请执行 %{model}#main_content 来显示内容。"
     logout: "退出"
-    powered_by: "Powered by %{active_admin} %{version}"
+    powered_by: "构建程序为 %{active_admin} %{version}"
     sidebars:
       filters: "所有条件"
       search_status: "搜索条件"
@@ -63,14 +82,14 @@
         other: "条目"
     any: "任何"
     blank_slate:
-      content: "暂时还没有%{resource_name}."
-      link: "新建一个"
+      content: "暂时还没有%{resource_name}。"
+      link: "新增一个"
     dropdown_actions:
-      button_label: "行动"
+      button_label: "操作"
     batch_actions:
       button_label: "批处理"
-      default_confirmation: "你确定你要这样做？"
-      delete_confirmation: "你确定要删除这些%{plural_model}?"
+      default_confirmation: "你确定要这样做？"
+      delete_confirmation: "你确定要删除这些%{plural_model}？"
       succesfully_destroyed:
         one: "成功删除 1 %{model}"
         other: "成功删除 %{count} %{plural_model}"
@@ -92,7 +111,7 @@
       author_missing: "匿名"
       title_content: "(%{count})条评论"
       errors:
-        empty_text: "评论保存失败，内空不能为空."
+        empty_text: "评论保存失败，内空不能为空。"
     devise:
       username:
         title: "用户名"
@@ -121,8 +140,8 @@
         title: "重新发送送解锁命令"
         submit: "重新发送送解锁命令"
       resend_confirmation_instructions:
-        title: " 重新发送确认指示"
-        submit: " 重新发送确认指示"
+        title: " 重新发送确认说明"
+        submit: " 重新发送确认说明"
       links:
         sign_up: "注册"
         sign_in: "登录"

data/lib/active_admin/abstract_view_factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class AbstractViewFactory < SettingsNode
 

data/lib/active_admin/application.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/router"
 require "active_admin/application_settings"
 require "active_admin/namespace_settings"
@@ -75,7 +76,7 @@ module ActiveAdmin
 
       namespace = namespaces[name.to_sym] ||= begin
         namespace = Namespace.new(self, name)
-        ActiveSupport::Notifications.publish ActiveAdmin::Namespace::RegisterEvent, namespace
+        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, { active_admin_namespace: namespace }
         namespace
       end
 
@@ -111,10 +112,10 @@ module ActiveAdmin
     # To reload everything simply call `ActiveAdmin.unload!`
     def load!
       unless loaded?
-        ActiveSupport::Notifications.publish BeforeLoadEvent, self # before_load hook
+        ActiveSupport::Notifications.instrument BeforeLoadEvent, { active_admin_application: self } # before_load hook
         files.each { |file| load file } # load files
         namespace(default_namespace) # init AA resources
-        ActiveSupport::Notifications.publish AfterLoadEvent, self # after_load hook
+        ActiveSupport::Notifications.instrument AfterLoadEvent, { active_admin_application: self } # after_load hook
         @@loaded = true
       end
     end
@@ -125,7 +126,7 @@ module ActiveAdmin
 
     # Returns ALL the files to be loaded
     def files
-      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"] }.sort
+      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"].sort }
     end
 
     # Creates all the necessary routes for the ActiveAdmin configurations
@@ -144,13 +145,13 @@ module ActiveAdmin
 
     # Adds before, around and after filters to all controllers.
     # Example usage:
-    #   ActiveAdmin.before_filter :authenticate_admin!
+    #   ActiveAdmin.before_action :authenticate_admin!
     #
     AbstractController::Callbacks::ClassMethods.public_instance_methods.
-      select { |m| m.match(/(filter|action)/) }.each do |name|
+      select { |m| m.match(/_action\z/) }.each do |name|
       define_method name do |*args, &block|
-        controllers_for_filters.each do |controller|
-          controller.public_send name, *args, &block
+        ActiveSupport.on_load(:active_admin_controller) do
+          public_send name, *args, &block
         end
       end
     end
@@ -164,8 +165,7 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      register_stylesheet "active_admin.css", media: "screen"
-      register_stylesheet "active_admin/print.css", media: "print"
+      register_stylesheet "active_admin.css", media: "all"
       register_javascript "active_admin.js"
     end
 

data/lib/active_admin/application_settings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/settings_node"
 
 module ActiveAdmin

data/lib/active_admin/asset_registration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module AssetRegistration
 
@@ -13,12 +14,12 @@ module ActiveAdmin
       stylesheets.clear
     end
 
-    def register_javascript(name)
-      javascripts.add name
+    def register_javascript(path, options = {})
+      javascripts[path] = options
     end
 
     def javascripts
-      @javascripts ||= Set.new
+      @javascripts ||= {}
     end
 
     def clear_javascripts!

data/lib/active_admin/authorization_adapter.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # Default Authorization permissions for Active Admin
   module Authorization
     READ = :read
+    NEW = :new
     CREATE = :create
+    EDIT = :edit
     UPDATE = :update
     DESTROY = :destroy
   end

data/lib/active_admin/base_controller/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class BaseController < ::InheritedResources::Base
     module Authorization
@@ -6,9 +7,9 @@ module ActiveAdmin
       ACTIONS_DICTIONARY = {
         index: ActiveAdmin::Authorization::READ,
         show: ActiveAdmin::Authorization::READ,
-        new: ActiveAdmin::Authorization::CREATE,
+        new: ActiveAdmin::Authorization::NEW,
         create: ActiveAdmin::Authorization::CREATE,
-        edit: ActiveAdmin::Authorization::UPDATE,
+        edit: ActiveAdmin::Authorization::EDIT,
         update: ActiveAdmin::Authorization::UPDATE,
         destroy: ActiveAdmin::Authorization::DESTROY
       }
@@ -81,7 +82,7 @@ module ActiveAdmin
       def active_admin_authorization_adapter
         adapter = active_admin_namespace.authorization_adapter
         if adapter.is_a? String
-          ActiveSupport::Dependencies.constantize adapter
+          adapter.constantize
         else
           adapter
         end

data/lib/active_admin/base_controller/menu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class BaseController < ::InheritedResources::Base
     module Menu

data/lib/active_admin/base_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/base_controller/authorization"
 require "active_admin/base_controller/menu"
 
@@ -6,7 +7,6 @@ module ActiveAdmin
   # It implements ActiveAdmin controllers core features.
   class BaseController < ::InheritedResources::Base
     helper ::ActiveAdmin::ViewHelpers
-    helper_method :env
 
     layout :determine_active_admin_layout
 
@@ -77,5 +77,6 @@ module ActiveAdmin
       { controller: controller, action: action }
     end
 
+    ActiveSupport.run_load_hooks(:active_admin_controller, self)
   end
 end

data/lib/active_admin/batch_actions/controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module BatchActions
     module Controller

data/lib/active_admin/batch_actions/resource_extension.rb

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

data/lib/active_admin/batch_actions/views/batch_action_form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/component"
 
 module ActiveAdmin

data/lib/active_admin/batch_actions/views/batch_action_selector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/component"
 
 module ActiveAdmin

data/lib/active_admin/batch_actions/views/selection_cells.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/component"
 
 module ActiveAdmin

data/lib/active_admin/batch_actions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.before_load do |app|
   require "active_admin/batch_actions/resource_extension"
   require "active_admin/batch_actions/controller"

data/lib/active_admin/callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Callbacks
     extend ActiveSupport::Concern

data/lib/active_admin/cancan_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 unless ActiveAdmin::Dependency.cancan? || ActiveAdmin::Dependency.cancancan?
   ActiveAdmin::Dependency.cancan!
 end

data/lib/active_admin/collection_decorator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # This class decorates a collection of objects delegating
   # mehods to behave like an Array. It's used to decouple ActiveAdmin

data/lib/active_admin/component.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Component < Arbre::Component
 

data/lib/active_admin/controller_action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class ControllerAction
     attr_reader :name

data/lib/active_admin/csv_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # CSVBuilder stores CSV configuration
   #
@@ -42,11 +43,10 @@ module ActiveAdmin
     end
 
     def build(controller, csv)
-      @collection = controller.send :find_collection, except: :pagination
       columns = exec_columns controller.view_context
-      bom = options.delete :byte_order_mark
+      bom = options[:byte_order_mark]
       column_names = options.delete(:column_names) { true }
-      csv_options = options.except :encoding_options, :humanize_name
+      csv_options = options.except :encoding_options, :humanize_name, :byte_order_mark
 
       csv << bom if bom
 
@@ -54,13 +54,8 @@ module ActiveAdmin
         csv << CSV.generate_line(columns.map { |c| encode c.name, options }, **csv_options)
       end
 
-      ActiveRecord::Base.uncached do
-        (1..paginated_collection.total_pages).each do |page|
-          paginated_collection(page).each do |resource|
-            resource = controller.send :apply_decorator, resource
-            csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
-          end
-        end
+      controller.send(:in_paginated_batches) do |resource|
+        csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
       end
 
       csv
@@ -124,13 +119,5 @@ module ActiveAdmin
     def column_transitive_options
       @column_transitive_options ||= @options.slice(*COLUMN_TRANSITIVE_OPTIONS)
     end
-
-    def paginated_collection(page_no = 1)
-      @collection.public_send(Kaminari.config.page_method_name, page_no).per(batch_size)
-    end
-
-    def batch_size
-      1000
-    end
   end
 end

data/lib/active_admin/dependency.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Dependency
     module Requirements
@@ -55,10 +56,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.supports_zeitwerk?
-      rails >= "6.0.0.beta3" && RUBY_ENGINE != "jruby"
-    end
-
     class Matcher
       attr_reader :name
 

data/lib/active_admin/deprecation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Deprecation
     module_function

data/lib/active_admin/devise.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::Requirements::DEVISE
 
 require "devise"
@@ -52,22 +53,32 @@ module ActiveAdmin
 
     class SessionsController < ::Devise::SessionsController
       include ::ActiveAdmin::Devise::Controller
+
+      ActiveSupport.run_load_hooks(:active_admin_controller, self)
     end
 
     class PasswordsController < ::Devise::PasswordsController
       include ::ActiveAdmin::Devise::Controller
+
+      ActiveSupport.run_load_hooks(:active_admin_controller, self)
     end
 
     class UnlocksController < ::Devise::UnlocksController
       include ::ActiveAdmin::Devise::Controller
+
+      ActiveSupport.run_load_hooks(:active_admin_controller, self)
     end
 
     class RegistrationsController < ::Devise::RegistrationsController
       include ::ActiveAdmin::Devise::Controller
+
+      ActiveSupport.run_load_hooks(:active_admin_controller, self)
     end
 
     class ConfirmationsController < ::Devise::ConfirmationsController
       include ::ActiveAdmin::Devise::Controller
+
+      ActiveSupport.run_load_hooks(:active_admin_controller, self)
     end
 
     def self.controllers_for_filters

data/lib/active_admin/dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # The Active Admin DSL. This class is where all the registration blocks

data/lib/active_admin/dynamic_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   class DynamicSetting

data/lib/active_admin/dynamic_settings_node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/dynamic_setting"
 require "active_admin/settings_node"
 

data/lib/active_admin/engine.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Engine < ::Rails::Engine
-    initializer "active_admin.load_app_path" do |app|
+    # Set default values for app_path and load_paths before running initializers
+    initializer "active_admin.load_app_path", before: :load_config_initializers do |app|
       ActiveAdmin::Application.setting :app_path, app.root
       ActiveAdmin::Application.setting :load_paths, [File.expand_path("app/admin", app.root)]
     end
@@ -10,7 +12,7 @@ module ActiveAdmin
         ActiveAdmin.application.stylesheets.each do |path, _|
           app.config.assets.precompile << path
         end
-        ActiveAdmin.application.javascripts.each do |path|
+        ActiveAdmin.application.javascripts.each do |path, _|
           app.config.assets.precompile << path
         end
       end

data/lib/active_admin/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # Exception class to raise when there is an authorized access
   # exception thrown. The exception has a few goodies that may

data/lib/active_admin/filters/active.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/filters/active_filter"
 
 module ActiveAdmin

data/lib/active_admin/filters/active_filter.rb

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

data/lib/active_admin/filters/active_sidebar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/filters/active"
 
 module ActiveAdmin
@@ -9,34 +10,7 @@ module ActiveAdmin
       end
 
       def block
-        -> do
-          active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
-          span do
-            if current_scope
-              h4 I18n.t("active_admin.search_status.current_scope"), style: "display: inline"
-              b scope_name(current_scope), class: "current_scope_name", style: "display: inline"
-            end
-            div style: "margin-top: 10px" do
-              h4 I18n.t("active_admin.search_status.current_filters"), style: "margin-bottom: 10px"
-              ul do
-                if active_filters.filters.blank?
-                  li I18n.t("active_admin.search_status.no_current_filters")
-                else
-                  active_filters.filters.each do |filter|
-                    li filter.html_options do
-                      span do
-                        text_node filter.label
-                      end
-                      b do
-                        text_node to_sentence(filter.values.map { |v| pretty_format(v) })
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
+        -> { active_filters_sidebar_content }
       end
 
       def title

data/lib/active_admin/filters/dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
     module DSL

data/lib/active_admin/filters/forms.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
     # This form builder defines methods to build filter forms such

data/lib/active_admin/filters/formtastic_addons.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
     module FormtasticAddons

data/lib/active_admin/filters/resource_extension.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
 
     class Disabled < RuntimeError
-      def initialize
-        super "Can't remove a filter when filters are disabled. Enable filters with 'config.filters = true'"
+      def initialize(action)
+        super "Cannot #{action} a filter when filters are disabled. Enable filters with 'config.filters = true'"
       end
     end
 
@@ -60,7 +61,7 @@ module ActiveAdmin
       #
       # @param [Symbol] attributes The attributes to not filter on
       def remove_filter(*attributes)
-        raise Disabled unless filters_enabled?
+        raise Disabled, "remove" unless filters_enabled?
 
         attributes.each { |attribute| (@filters_to_remove ||= []) << attribute.to_sym }
       end
@@ -72,7 +73,7 @@ module ActiveAdmin
       # @param [Hash] options The set of options that are passed through to
       #                       ransack for the field definition.
       def add_filter(attribute, options = {})
-        raise Disabled unless filters_enabled?
+        raise Disabled, "add" unless filters_enabled?
 
         (@filters ||= {})[attribute.to_sym] = options
       end

data/lib/active_admin/filters.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/filters/dsl"
 require "active_admin/filters/resource_extension"
 require "active_admin/filters/formtastic_addons"

data/lib/active_admin/form_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Provides an intuitive way to build has_many associated records in the same form.
 module Formtastic
   module Inputs

data/lib/active_admin/generators/boilerplate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Generators
     class Boilerplate

data/lib/active_admin/helpers/collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Helpers
     module Collection
@@ -5,6 +6,7 @@ module ActiveAdmin
       # 2. correctly handles the Hash returned when `group by` is used
       def collection_size(c = collection)
         return c.count if c.is_a?(Array)
+        return c.length if c.limit_value
 
         c = c.except :select, :order
 

data/lib/active_admin/helpers/i18n.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Helpers
     module I18n

data/lib/active_admin/helpers/optional_display.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # Shareable module to give a #display_on?(action) method

data/lib/active_admin/helpers/routes/url_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Helpers
     module Routes