activeadmin 4.0.0.beta2 → 4.0.0.beta22

data/config/locales/zh-TW.yml

@@ -1,112 +1,148 @@
-"zh-TW":
+---
+zh-TW:
   active_admin:
-    dashboard: 儀表板
-    view: "檢視"
-    edit: "編輯"
-    delete: "刪除"
-    delete_confirmation: "你確定要刪除嗎？"
-    new_model: "新增 %{model}"
-    edit_model: "編輯 %{model}"
-    delete_model: "刪除 %{model}"
-    details: "%{model} 明細"
-    cancel: "取消"
-    empty: "空的"
-    previous: "前一個"
-    next: "下一個"
-    download: "下載:"
-    has_many_new: "增加新的 %{model}"
-    has_many_delete: "刪除"
-    has_many_remove: "清除"
-    filters:
-      buttons:
-        filter: "篩選"
-        clear: "清除篩選條件"
-    search_status:
-      no_current_filters: "無"
-    status_tag:
-      "yes": "是"
-      "no": "否"
-      "unset": "否"
-    logout: "登出"
-    powered_by: "Powered by %{active_admin} %{version}"
-    sidebars:
-      filters: "篩選條件"
-      search_status: "搜尋條件"
-    pagination:
-      empty: "找不到 %{model} "
-      one: "顯示 <b>1</b> %{model}"
-      one_page: "顯示 <b>全部 %{n}</b> %{model}"
-      multiple: "總計 <b>%{total}</b> 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆"
-      multiple_without_total: "顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆"
-      entry:
-        one: "筆"
-        other: "筆"
-    any: "任何"
-    blank_slate:
-      content: "尚無 %{resource_name}"
-      link: "建立一筆"
+    access_denied:
+      message: 你沒有權限執行此項操作
+    any: 任何
     batch_actions:
-      button_label: "批次作業"
-      default_confirmation: "你確定你要這樣做？"
-      delete_confirmation: "你確定要刪除這些 %{plural_model} 嗎？"
-      succesfully_destroyed:
-        one: "成功刪除 1 %{model}"
-        other: "成功刪除 %{count} %{plural_model}"
-      selection_toggle_explanation: "（切換選取）"
       action_label: "%{title} 已選取"
+      button_label: 批次操作
+      default_confirmation: 你確定要這樣做嗎？
+      delete_confirmation: 你確定要刪除這些 %{plural_model} 嗎？
       labels:
-        destroy: "刪除"
+        destroy: 刪除
+      selection_toggle_explanation: "（切換選取）"
+      successfully_destroyed:
+        one: 成功刪除 1 %{model}
+        other: 成功刪除 %{count} %{plural_model}
+    blank_slate:
+      content: 尚無 %{resource_name}。
+      link: 建立一筆
+    cancel: 取消
     comments:
-      created_at: "建立"
-      resource_type: "資源種類"
-      author_type: "作者身份"
-      body: "內文"
-      author: "作者"
-      add: "新增評論"
-      delete: "刪除評論"
-      delete_confirmation: "你確定要刪除這些評論嗎？"
-      resource: "資源"
-      no_comments_yet: "尚無評論"
-      author_missing: "匿名"
-      title_content: "(%{count}) 則評論"
+      add: 新增評論
+      author: 作者
+      author_missing: 匿名
+      author_type: 作者身份
+      body: 內文
+      created_at: 建立時間
+      delete: 刪除評論
+      delete_confirmation: 你確定要刪除這個評論嗎？
       errors:
-        empty_text: "評論儲存失敗，不允許空白的內容。"
+        empty_text: 評論儲存失敗，不允許空白的內容。
+      no_comments_yet: 尚無評論
+      resource: 資源
+      resource_type: 資源類型
+      title_content: "%{count} 則評論"
+    create_another: 新增另一個 %{model}
+    dashboard: 儀表板
+    delete: 刪除
+    delete_confirmation: 你確定要刪除嗎？
+    delete_model: 刪除 %{model}
+    details: "%{model} 明細"
     devise:
-      username:
-        title: "帳號"
+      change_password:
+        submit: 更改我的密碼
+        title: 更改你的密碼
       email:
-        title: "電子郵件信箱"
-      subdomain:
-        title: "子網域"
-      password:
-        title: "密碼"
-      sign_up:
-        title: "註冊"
-        submit: "註冊"
+        title: 電子郵件信箱
+      links:
+        forgot_your_password: 忘記密碼？
+        resend_confirmation_instructions: 重新發送確認信
+        resend_unlock_instructions: 重新發送解鎖指示
+        sign_in: 登入
+        sign_in_with_omniauth_provider: 使用 %{provider} 登入
+        sign_up: 註冊
       login:
-        title: "登入"
-        remember_me: "記住我"
-        submit: "登入"
+        remember_me: 記住我
+        submit: 登入
+        title: 登入
+      password:
+        title: 密碼
+      password_confirmation:
+        title: 確認密碼
+      resend_confirmation_instructions:
+        submit: 重新發送確認信
+        title: 重新發送確認信
       reset_password:
-        title: "忘記密碼？"
-        submit: "重置密碼"
-      change_password:
-        title: "更改你的密碼"
-        submit: "更改我的密碼"
+        submit: 重設密碼
+        title: 忘記密碼？
+      sign_up:
+        submit: 註冊
+        title: 註冊
+      subdomain:
+        title: 子網域
       unlock:
-        title: "重新發送解鎖指示"
-        submit: "重新發送解鎖指示"
-      resend_confirmation_instructions:
-        title: '重新發送確認信'
-        submit: '重新發送確認信'
-      links:
-        sign_up: "註冊"
-        sign_in: "登入"
-        forgot_your_password: "忘記密碼？"
-        sign_in_with_omniauth_provider: "使用 %{provider} 登入"
-        resend_unlock_instructions: "重新發送解鎖指示"
-        resend_confirmation_instructions: "重新發送確認信"
-    access_denied:
-      message: "您沒有權限執行此項操作"
+        submit: 重新發送解鎖指示
+        title: 重新發送解鎖指示
+      username:
+        title: 帳號
+    download: 下載：
+    edit: 編輯
+    edit_model: 編輯 %{model}
+    empty: 空的
+    filters:
+      buttons:
+        clear: 清除篩選條件
+        filter: 篩選
+      predicates:
+        from: 從
+        to: 到
+    has_many_delete: 刪除
+    has_many_new: 增加新的 %{model}
+    has_many_remove: 移除
     index_list:
-      table: "表格"
+      table: 表格
+    logout: 登出
+    move: 移動
+    new_model: 新增 %{model}
+    next: 下一個
+    pagination:
+      empty: 找不到 %{model}
+      entry:
+        one: 筆
+        other: 筆
+      multiple: 總計 <b>%{total}</b> 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆
+      multiple_without_total: 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆
+      next: 下一個
+      one: 顯示 <b>1</b> %{model}
+      one_page: 顯示 <b>全部 %{n}</b> %{model}
+      per_page: '每頁 '
+      previous: 前一個
+      truncate: "&hellip;"
+    powered_by: 由 %{active_admin} %{version} 提供
+    previous: 前一個
+    scopes:
+      all: 全部
+    search_status:
+      no_current_filters: 未套用篩選條件
+      title: 進行中的搜尋
+      title_with_scope: 正在搜尋 %{name}
+    sidebars:
+      filters: 篩選條件
+      search_status: 搜尋狀態
+    status_tag:
+      'no': 否
+      unset: 未知
+      'yes': 是
+    toggle_dark_mode: 切換暗黑模式
+    toggle_main_navigation_menu: 切換主要導覽
+    toggle_section: 切換區塊
+    toggle_user_menu: 切換使用者選單
+    view: 檢視
+  activerecord:
+    attributes:
+      active_admin/comment:
+        author_type: 作者類型
+        body: 內容
+        created_at: 建立時間
+        namespace: 命名空間
+        resource_type: 資源類型
+        updated_at: 更新時間
+    models:
+      active_admin/comment:
+        one: 評論
+        other: 評論
+      comment:
+        one: 評論
+        other: 評論

data/lib/active_admin/application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require "active_admin/router"
-require "active_admin/application_settings"
-require "active_admin/namespace_settings"
+require_relative "router"
+require_relative "application_settings"
+require_relative "namespace_settings"
 
 module ActiveAdmin
   class Application
@@ -101,7 +101,7 @@ module ActiveAdmin
     # Removes all defined controllers from memory. Useful in
     # development, where they are reloaded on each request.
     def unload!
-      namespaces.each &:unload!
+      namespaces.each(&:unload!)
       @@loaded = false
     end
 
@@ -155,7 +155,7 @@ module ActiveAdmin
 
     def controllers_for_filters
       controllers = [BaseController]
-      controllers.push *Devise.controllers_for_filters if Dependency.devise?
+      controllers.push(*Devise.controllers_for_filters) if Dependency.devise?
       controllers
     end
 

data/lib/active_admin/application_settings.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/settings_node"
+require_relative "settings_node"
 
 module ActiveAdmin
   class ApplicationSettings < SettingsNode

data/lib/active_admin/async_count.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  class AsyncCount
+    class NotSupportedError < RuntimeError; end
+
+    def initialize(collection)
+      raise NotSupportedError, "#{collection.inspect} does not support :async_count" unless collection.respond_to?(:async_count)
+
+      @collection = collection.except(:select, :order)
+      @promise = @collection.async_count
+    end
+
+    def count
+      @promise.value
+    end
+
+    alias size count
+
+    delegate :except, :group_values, :length, :limit_value, to: :@collection
+  end
+end

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -69,7 +69,7 @@ module ActiveAdmin
 
           redirect_to active_admin_config.route_collection_path(params),
                       notice: I18n.t(
-                        "active_admin.batch_actions.succesfully_destroyed",
+                        "active_admin.batch_actions.successfully_destroyed",
                         count: selected_ids.count,
                         model: active_admin_config.resource_label.downcase,
                         plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
@@ -95,7 +95,7 @@ module ActiveAdmin
     # => Will create an action that appears in the action list popover
     #
     #   BatchAction.new(:flag) { |selection| redirect_to collection_path, notice: "#{selection.length} users flagged" }
-    # => Will create an action that uses a block to process the request (which receives one paramater of the selected objects)
+    # => Will create an action that uses a block to process the request (which receives one parameter of the selected objects)
     #
     #   BatchAction.new("Perform Long Operation on") { |selection| }
     # => You can create batch actions with a title instead of a Symbol

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/component"
+require_relative "../../component"
 
 module ActiveAdmin
   module BatchActions

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/component"
+require_relative "../../component"
 
 module ActiveAdmin
   module BatchActions

data/lib/active_admin/batch_actions.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 ActiveAdmin.before_load do |app|
-  require "active_admin/batch_actions/resource_extension"
-  require "active_admin/batch_actions/controller"
+  require_relative "batch_actions/resource_extension"
+  require_relative "batch_actions/controller"
 
   # Add our Extensions
   ActiveAdmin::Resource.send :include, ActiveAdmin::BatchActions::ResourceExtension
   ActiveAdmin::ResourceController.send :include, ActiveAdmin::BatchActions::Controller
 
-  require "active_admin/batch_actions/views/batch_action_form"
-  require "active_admin/batch_actions/views/selection_cells"
+  require_relative "batch_actions/views/batch_action_form"
+  require_relative "batch_actions/views/selection_cells"
 end

data/lib/active_admin/collection_decorator.rb

@@ -1,7 +1,7 @@
 # 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
+  # methods to behave like an Array. It's used to decouple ActiveAdmin
   # from Draper and thus being able to use PORO decorators as well.
   #
   # It's implementation is heavily based on the Draper::CollectionDecorator

data/lib/active_admin/csv_builder.rb

@@ -64,7 +64,7 @@ module ActiveAdmin
     def exec_columns(view_context = nil)
       @view_context = view_context
       @columns = [] # we want to re-render these every instance
-      instance_exec &@block if @block.present?
+      instance_exec(&@block) if @block.present?
       columns
     end
 

data/lib/active_admin/dependency.rb

@@ -2,7 +2,7 @@
 module ActiveAdmin
   module Dependency
     module Requirements
-      DEVISE = ">= 4.0", "< 5"
+      DEVISE = ">= 4.0", "< 6"
     end
 
     # Provides a clean interface to check for gem dependencies at runtime.

data/lib/active_admin/dsl.rb

@@ -13,7 +13,7 @@ module ActiveAdmin
 
     # Runs the registration block inside this object
     def run_registration_block(&block)
-      instance_exec &block if block
+      instance_exec(&block) if block
     end
 
     # The instance of ActiveAdmin::Resource that's being registered
@@ -30,7 +30,7 @@ module ActiveAdmin
       @config
     end
 
-    # Include a module with this resource. The modules's `included` method
+    # Include a module with this resource. The modules' `included` method
     # is called with the instance of the `ActiveAdmin::DSL` passed into it.
     #
     # eg:

data/lib/active_admin/dynamic_settings_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/dynamic_setting"
-require "active_admin/settings_node"
+require_relative "dynamic_setting"
+require_relative "settings_node"
 
 module ActiveAdmin
 

data/lib/active_admin/engine.rb

@@ -15,7 +15,10 @@ module ActiveAdmin
       end
     end
 
-    initializer "active_admin.importmap", before: "importmap" do |app|
+    initializer "active_admin.importmap", after: "importmap" do |app|
+      # Skip if importmap-rails is not installed
+      next unless app.config.respond_to?(:importmap)
+
       ActiveAdmin.importmap.draw(Engine.root.join("config", "importmap.rb"))
       package_path = Engine.root.join("app/javascript")
       if app.config.respond_to?(:assets)
@@ -32,7 +35,7 @@ module ActiveAdmin
     end
 
     initializer "active_admin.routes" do
-      require "active_admin/helpers/routes/url_helpers"
+      require_relative "helpers/routes/url_helpers"
     end
 
     initializer "active_admin.deprecator" do |app|

data/lib/active_admin/filters/active.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/filters/active_filter"
+require_relative "active_filter"
 
 module ActiveAdmin
   module Filters
@@ -11,7 +11,7 @@ module ActiveAdmin
       # @param resource [ActiveAdmin::Resource] current resource
       # @param search [Ransack::Search] search object
       #
-      # @see ActiveAdmin::ResourceController::DataAcces#apply_filtering
+      # @see ActiveAdmin::ResourceController::DataAccess#apply_filtering
       def initialize(resource, search)
         @resource = resource
         @filters = build_filters(search.conditions)

data/lib/active_admin/filters/active_filter.rb

@@ -38,9 +38,7 @@ module ActiveAdmin
       end
 
       def predicate_name
-        I18n.t(
-          "ransack.predicates.#{condition.predicate.name}",
-          default: ransack_predicate_name)
+        Ransack::Translate.predicate(condition.predicate.name)
       end
 
       def html_options
@@ -78,10 +76,6 @@ module ActiveAdmin
         condition_attribute.attr_name
       end
 
-      def ransack_predicate_name
-        Ransack::Translate.predicate(condition.predicate.name)
-      end
-
       def find_class?
         ["eq", "in"].include? condition.predicate.arel_predicate
       end

data/lib/active_admin/filters/forms.rb

@@ -7,9 +7,6 @@ module ActiveAdmin
       include ::ActiveAdmin::Filters::FormtasticAddons
       self.input_namespaces = [::Object, ::ActiveAdmin::Inputs::Filters, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
 
-      # TODO: remove input class finders after formtastic 4 (where it will be default)
-      self.input_class_finder = ::Formtastic::InputClassFinder
-
       def filter(method, options = {})
         if method.present? && options[:as] ||= default_input_type(method)
           template.concat input(method, options)

data/lib/active_admin/filters/resource_extension.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/filters/active"
+require_relative "active"
 
 module ActiveAdmin
   module Filters
@@ -146,7 +146,7 @@ module ActiveAdmin
             filters = poly.map(&:foreign_type) + low_arity.map(&:name) + high_arity
           end
 
-          filters.map &:to_sym
+          filters.map(&:to_sym)
         else
           []
         end

data/lib/active_admin/filters.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-require "active_admin/filters/dsl"
-require "active_admin/filters/resource_extension"
-require "active_admin/filters/formtastic_addons"
-require "active_admin/filters/forms"
-require "active_admin/helpers/optional_display"
+require_relative "filters/dsl"
+require_relative "filters/resource_extension"
+require_relative "filters/formtastic_addons"
+require_relative "filters/forms"
+require_relative "helpers/optional_display"
 
 # Add our Extensions
 ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL

data/lib/active_admin/form_builder.rb

@@ -17,10 +17,6 @@ module ActiveAdmin
 
     self.input_namespaces = [::Object, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
 
-    # TODO: remove both class finders after formtastic 4 (where it will be default)
-    self.input_class_finder = ::Formtastic::InputClassFinder
-    self.action_class_finder = ::Formtastic::ActionClassFinder
-
     def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
       li_attrs[:class] ||= "action cancel"
       html_options[:class] ||= "cancel-link"
@@ -95,7 +91,7 @@ module ActiveAdmin
       contents = without_wrapper { inputs(options, &form_block) }
       contents ||= "".html_safe
 
-      js = new_record ? js_for_has_many(options[:class], &form_block) : ""
+      js = new_record ? js_for_has_many(&form_block) : ""
       contents << js
     end
 
@@ -159,14 +155,13 @@ module ActiveAdmin
     end
 
     # Capture the ADD JS
-    def js_for_has_many(class_string, &form_block)
+    def js_for_has_many(&form_block)
       assoc_name = assoc_klass.model_name
       placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.tr('/', '_')}_RECORD"
-      opts = {
+      opts = options.merge(
         for: [assoc, assoc_klass.new],
-        class: class_string,
         for_options: { child_index: placeholder }
-      }
+      )
       html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
       text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
 

data/lib/active_admin/helpers/optional_display.rb

@@ -23,7 +23,7 @@ module ActiveAdmin
       when Symbol, String
         render_context.public_send condition
       when Proc
-        render_context.instance_exec &condition
+        render_context.instance_exec(&condition)
       else
         true
       end

data/lib/active_admin/inputs/filters/base/search_method_select.rb

@@ -26,7 +26,7 @@ module ActiveAdmin
             attr_reader :filters
 
             def filter(*filters)
-              (@filters ||= []).push *filters
+              (@filters ||= []).push(*filters)
             end
           end
 
@@ -63,7 +63,7 @@ module ActiveAdmin
 
           def filter_options
             filters.collect do |filter|
-              [I18n.t("ransack.predicates.#{filter}").capitalize, "#{method}_#{filter}"]
+              [Ransack::Translate.predicate(filter).capitalize, "#{method}_#{filter}"]
             end
           end
 

data/lib/active_admin/inputs/filters/select_input.rb

@@ -15,9 +15,7 @@ module ActiveAdmin
           if searchable_has_many_through?
             "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
           else
-            name = method.to_s
-            name.concat "_#{reflection.association_primary_key}" if reflection_searchable?
-            name
+            reflection_searchable? ? "#{method}_#{reflection.association_primary_key}" : method.to_s
           end
         end
 

data/lib/active_admin/localizers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/localizers/resource_localizer"
+require_relative "localizers/resource_localizer"
 
 module ActiveAdmin
   module Localizers

data/lib/active_admin/menu.rb

@@ -66,8 +66,8 @@ module ActiveAdmin
       end
 
       # Used in the UI to visually distinguish which menu item is selected.
-      def current?(item)
-        self == item || include?(item)
+      def current?(item, children: true)
+        self == item || (children && include?(item))
       end
 
       # Returns sorted array of menu items that should be displayed in this context.

data/lib/active_admin/menu_item.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'active_admin/view_helpers/method_or_proc_helper'
+require_relative "view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   class MenuItem

data/lib/active_admin/namespace.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/resource_collection"
+require_relative "resource_collection"
 
 module ActiveAdmin
 

data/lib/active_admin/namespace_settings.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/dynamic_settings_node"
+require_relative "dynamic_settings_node"
 
 module ActiveAdmin
   class NamespaceSettings < DynamicSettingsNode

data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/views"
+require_relative "../../../../views"
 
 module ActiveAdmin
   module Comments