activeadmin 4.0.0.beta15 → 4.0.0.beta17

data/config/locales/zh-TW.yml

@@ -1,146 +1,148 @@
-"zh-TW":
-  activerecord:
-    models:
-      comment:
-        one: "評論"
-        other: "評論"
-      active_admin/comment:
-        one: "評論"
-        other: "評論"
-    attributes:
-      active_admin/comment:
-        author_type: "作者類型"
-        body: "內容"
-        created_at: "建立時間"
-        namespace: "命名空間"
-        resource_type: "資源類型"
-        updated_at: "更新時間"
+---
+zh-TW:
   active_admin:
-    dashboard: "儀表板"
-    view: "檢視"
-    edit: "編輯"
-    delete: "刪除"
-    delete_confirmation: "你確定要刪除嗎？"
-    create_another: "新增另一個 %{model}"
-    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: "移除"
-    move: "移動"
-    filters:
-      buttons:
-        filter: "篩選"
-        clear: "清除篩選條件"
-      predicates:
-        from: "從"
-        to: "到"
-    scopes:
-      all: "全部"
-    search_status:
-      title: "進行中的搜尋"
-      title_with_scope: "正在搜尋 %{name}"
-      no_current_filters: "未套用篩選條件"
-    status_tag:
-      "yes": "是"
-      "no": "否"
-      "unset": "未知"
-    toggle_dark_mode: "切換暗黑模式"
-    toggle_main_navigation_menu: "切換主要導覽"
-    toggle_section: "切換區塊"
-    toggle_user_menu: "切換使用者選單"
-    logout: "登出"
-    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> 筆"
-      per_page: "每頁 "
-      previous: "前一個"
-      next: "下一個"
-      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: "子網域"
+        title: 電子郵件信箱
+      links:
+        forgot_your_password: 忘記密碼？
+        resend_confirmation_instructions: 重新發送確認信
+        resend_unlock_instructions: 重新發送解鎖指示
+        sign_in: 登入
+        sign_in_with_omniauth_provider: 使用 %{provider} 登入
+        sign_up: 註冊
+      login:
+        remember_me: 記住我
+        submit: 登入
+        title: 登入
       password:
-        title: "密碼"
+        title: 密碼
       password_confirmation:
-        title: "確認密碼"
-      sign_up:
-        title: "註冊"
-        submit: "註冊"
-      login:
-        title: "登入"
-        remember_me: "記住我"
-        submit: "登入"
+        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

@@ -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/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)

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/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

data/lib/active_admin/filters/active.rb

@@ -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

@@ -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/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"

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/resource/action_items.rb

@@ -59,7 +59,7 @@ module ActiveAdmin
       def add_default_action_items
         add_default_new_action_item
         add_default_edit_action_item
-        add_default_show_action_item
+        add_default_destroy_action_item
       end
 
       # Adds the default New link on index
@@ -79,7 +79,7 @@ module ActiveAdmin
       end
 
       # Adds the default Destroy link on show
-      def add_default_show_action_item
+      def add_default_destroy_action_item
         add_action_item :destroy, only: :show, if: -> { destroy_action_authorized?(resource) } do
           localizer = ActiveAdmin::Localizers.resource(active_admin_config)
           link_to(

data/lib/active_admin/resource/belongs_to.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_relative "../resource"
 
 module ActiveAdmin
   class Resource

data/lib/active_admin/resource/naming.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
     module Naming
       def resource_name
         @resource_name ||= begin
-          as = @options[:as].gsub /\s/, "" if @options[:as]
+          as = @options[:as].gsub(/\s/, "") if @options[:as]
 
           if as || !resource_class.respond_to?(:model_name)
             Name.new resource_class, as

data/lib/active_admin/resource.rb

@@ -177,7 +177,7 @@ module ActiveAdmin
     end
 
     def find_resource(id)
-      resource = resource_class.public_send *method_for_find(id)
+      resource = resource_class.public_send(*method_for_find(id))
       (decorator_class && resource) ? decorator_class.new(resource) : resource
     end
 

data/lib/active_admin/resource_collection.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
     # Changes `each` to pass in the value, instead of both the key and value.
     def each(&block)
-      values.each &block
+      values.each(&block)
     end
 
     def [](obj)

data/lib/active_admin/resource_dsl.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
 
     # Store relations that should be included
     def includes(*args)
-      config.includes.push *args
+      config.includes.push(*args)
     end
 
     #
@@ -193,7 +193,7 @@ module ActiveAdmin
 
     standard_rails_filters =
       AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.end_with?('_action') }
-    delegate *standard_rails_filters, to: :controller
+    delegate(*standard_rails_filters, to: :controller)
 
     # Specify which actions to create in the controller
     #

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "4.0.0.beta15"
+  VERSION = "4.0.0.beta17"
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -91,7 +91,7 @@ module MethodOrProcHelper
     context = self if context.nil? # default to `self` only when nil
     case obj
     when Proc
-      context.instance_exec *args, &obj
+      context.instance_exec(*args, &obj)
     when Symbol
       context.public_send obj, *args
     else

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

@@ -61,10 +61,15 @@ module ActiveAdmin
       end
 
       def header_content_for(attr)
-        if @resource_class.respond_to?(:human_attribute_name)
-          @resource_class.human_attribute_name(attr, default: attr.to_s.titleize)
+        if attr.is_a?(Symbol)
+          default = attr.to_s.titleize
+          if @resource_class.respond_to?(:human_attribute_name)
+            @resource_class.human_attribute_name(attr, default: default)
+          else
+            default
+          end
         else
-          attr.to_s.titleize
+          attr.to_s
         end
       end
 

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

@@ -94,7 +94,7 @@ module ActiveAdmin
       end
 
       def build_table_body
-        @tbody = tbody **(@tbody_html || {}) do
+        @tbody = tbody(**(@tbody_html || {})) do
           # Build enough rows for our collection
           @collection.each do |elem|
             html_options = @row_html&.call(elem) || {}

data/lib/active_admin/views/index_as_table.rb

@@ -256,9 +256,14 @@ module ActiveAdmin
         end
 
         # Display a column for the id
-        def id_column
+        def id_column(*args)
           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|
+
+          options = args.extract_options!
+          title = args[0].presence || resource_class.human_attribute_name(resource_class.primary_key)
+          sortable = options.fetch(:sortable, resource_class.primary_key)
+
+          column(title, sortable: sortable) do |resource|
             if controller.action_methods.include?("show")
               link_to resource.id, resource_path(resource)
             elsif controller.action_methods.include?("edit")