activeadmin 2.13.1 → 3.0.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,37 +33,32 @@
     empty: "未定义"
     previous: "上一个"
     next: "下一个"
-    download: "下载:"
-    has_many_new: "新建一个%{model}"
+    download: "下载："
+    has_many_new: "新增一个%{model}"
     has_many_delete: "删除"
     has_many_remove: "清除"
+    move: "移动"
     filters:
       buttons:
         filter: "过滤"
         clear: "清除条件"
       predicates:
-        contains: "包含"
-        equals: "等于"
-        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 +74,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 +103,7 @@
       author_missing: "匿名"
       title_content: "(%{count})条评论"
       errors:
-        empty_text: "评论保存失败，内空不能为空."
+        empty_text: "评论保存失败，内空不能为空。"
     devise:
       username:
         title: "用户名"
@@ -121,8 +132,8 @@
         title: "重新发送送解锁命令"
         submit: "重新发送送解锁命令"
       resend_confirmation_instructions:
-        title: " 重新发送确认指示"
-        submit: " 重新发送确认指示"
+        title: " 重新发送确认说明"
+        submit: " 重新发送确认说明"
       links:
         sign_up: "注册"
         sign_in: "登录"

data/config/locales/zh-TW.yml

@@ -24,13 +24,6 @@
       buttons:
         filter: "篩選"
         clear: "清除篩選條件"
-      predicates:
-        contains: "包含"
-        equals: "等於"
-        starts_with: "開頭為"
-        ends_with: "結尾為"
-        greater_than: "大於"
-        less_than: "小於"
     search_status:
       headline: "搜尋條件:"
       current_scope: "子集："

data/lib/active_admin/asset_registration.rb

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

@@ -4,7 +4,9 @@ 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

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

data/lib/active_admin/dependency.rb

@@ -56,10 +56,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.supports_zeitwerk?
-      RUBY_ENGINE != "jruby"
-    end
-
     class Matcher
       attr_reader :name
 

data/lib/active_admin/engine.rb

@@ -12,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/filters/active_filter.rb

@@ -41,7 +41,7 @@ module ActiveAdmin
 
       def predicate_name
         I18n.t(
-          "active_admin.filters.predicates.#{condition.predicate.name}",
+          "ransack.predicates.#{condition.predicate.name}",
           default: ransack_predicate_name)
       end
 

data/lib/active_admin/filters/forms.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
       # Returns the default filter type for a given attribute. If you want
       # to use a custom search method, you have to specify the type yourself.
       def default_input_type(method, options = {})
-        if method =~ /_(eq|equals|cont|contains|start|starts_with|end|ends_with)\z/
+        if method =~ /_(eq|cont|start|end)\z/
           :string
         elsif klass._ransackers.key?(method.to_s)
           klass._ransackers[method.to_s].type

data/lib/active_admin/filters/resource_extension.rb

@@ -3,8 +3,8 @@ 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
 
@@ -61,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
@@ -73,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/inputs/filters/base/search_method_select.rb

@@ -9,7 +9,7 @@
 #     include Base
 #     include Base::SearchMethodSelect
 #
-#     filter :equals, :greater_than, :less_than
+#     filter :eq, :gt, :lt
 #   end
 #
 module ActiveAdmin
@@ -65,7 +65,7 @@ module ActiveAdmin
 
           def filter_options
             filters.collect do |filter|
-              [I18n.t("active_admin.filters.predicates.#{filter}"), "#{method}_#{filter}"]
+              [I18n.t("ransack.predicates.#{filter}").capitalize, "#{method}_#{filter}"]
             end
           end
 

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

@@ -15,12 +15,12 @@ module ActiveAdmin
         end
 
         def gt_input_name
-          column && column.type == :date ? "#{method}_gteq" : "#{method}_gteq_datetime"
+          "#{method}_gteq"
         end
         alias :input_name :gt_input_name
 
         def lt_input_name
-          column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
+          "#{method}_lteq"
         end
 
         def input_html_options

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

@@ -6,7 +6,7 @@ module ActiveAdmin
         include Base
         include Base::SearchMethodSelect
 
-        filter :equals, :greater_than, :less_than
+        filter :eq, :gt, :lt
       end
     end
   end

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

@@ -6,7 +6,7 @@ module ActiveAdmin
         include Base
         include Base::SearchMethodSelect
 
-        filter :contains, :equals, :starts_with, :ends_with
+        filter :cont, :eq, :start, :end
 
         # If the filter method includes a search condition, build a normal string search field.
         # Else, build a search field with a companion dropdown to choose a search condition from.

data/lib/active_admin/namespace_settings.rb

@@ -119,7 +119,7 @@ module ActiveAdmin
         :title,
         :email,
     ]
-    register :filter_method_for_large_association, "_starts_with"
+    register :filter_method_for_large_association, "_start"
 
     # Switch between asset pipeline and webpacker assets
     register :use_webpacker, false

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -28,5 +28,13 @@ module ActiveAdmin
       self.resource_type = self.class.resource_type(resource)
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      authorizable_ransackable_attributes
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      authorizable_ransackable_associations
+    end
+
   end
 end

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

@@ -36,7 +36,7 @@ module ActiveAdmin
 
           text_node paginate @comments
 
-          if authorized?(ActiveAdmin::Auth::CREATE, ActiveAdmin::Comment)
+          if authorized?(ActiveAdmin::Auth::NEW, ActiveAdmin::Comment)
             build_comment_form
           end
         end

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

@@ -72,15 +72,15 @@ ActiveAdmin.after_load do |app|
               redirect_back fallback_location: active_admin_root
             end
           end
+        end
 
-          def destroy
-            destroy! do |success, failure|
-              success.html do
-                redirect_back fallback_location: active_admin_root
-              end
-              failure.html do
-                redirect_back fallback_location: active_admin_root
-              end
+        def destroy
+          destroy! do |success, failure|
+            success.html do
+              redirect_back fallback_location: active_admin_root
+            end
+            failure.html do
+              redirect_back fallback_location: active_admin_root
             end
           end
         end

data/lib/active_admin/pundit_adapter.rb

@@ -44,8 +44,6 @@ module ActiveAdmin
     def format_action(action, subject)
       # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
       case action
-      when Auth::CREATE then :create?
-      when Auth::UPDATE then :update?
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?
       else "#{action}?"

data/lib/active_admin/resource/action_items.rb

@@ -65,7 +65,7 @@ module ActiveAdmin
       # Adds the default New link on index
       def add_default_new_action_item
         add_action_item :new, only: :index do
-          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
+          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::NEW, active_admin_config.resource_class)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:new_model), new_resource_path
           end
@@ -75,7 +75,7 @@ module ActiveAdmin
       # Adds the default Edit link on show
       def add_default_edit_action_item
         add_action_item :edit, only: :show do
-          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::EDIT, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:edit_model), edit_resource_path(resource)
           end

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "2.13.1"
+  VERSION = "3.0.0"
 end

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
           authorized?(ActiveAdmin::Auth::READ, resource)
           url_for config.route_instance_path resource, url_options
         elsif config.controller.action_methods.include?("edit") &&
-          authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          authorized?(ActiveAdmin::Auth::EDIT, resource)
           url_for config.route_edit_instance_path resource, url_options
         end
       end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -24,7 +24,14 @@ module ActiveAdmin
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        ERB::Util.html_escape(render_in_context(resource, display_name_method_for(resource))) unless resource.nil?
+        unless resource.nil?
+          result = render_in_context(resource, display_name_method_for(resource))
+          if result.to_s&.strip&.present?
+            ERB::Util.html_escape(result)
+          else
+            ERB::Util.html_escape(render_in_context(resource, DISPLAY_NAME_FALLBACK))
+          end
+        end
       end
 
       # Looks up and caches the first available display name method.

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

@@ -102,10 +102,6 @@ module ActiveAdmin
         form_builder.object
       end
 
-      def form_buffers
-        raise "'form_buffers' has been removed from ActiveAdmin::FormBuilder, please read https://github.com/activeadmin/activeadmin/blob/master/docs/5-forms.md for details."
-      end
-
       private
 
       def create_another_checkbox

data/lib/active_admin/views/index_as_table.rb

@@ -304,10 +304,6 @@ module ActiveAdmin
           end
         end
 
-        def default_actions
-          raise "`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead."
-        end
-
         # Add links to perform actions.
         #
         # ```ruby
@@ -377,7 +373,7 @@ module ActiveAdmin
           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)
+          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::EDIT, 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)

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

@@ -38,8 +38,8 @@ module ActiveAdmin
               text_node(meta(name: name, content: content))
             end
 
-            active_admin_application.javascripts.each do |path|
-              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path) : javascript_include_tag(path)
+            active_admin_application.javascripts.each do |path, options|
+              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path, **options) : javascript_include_tag(path, **options)
               text_node(javascript_tag)
             end
 
@@ -49,7 +49,8 @@ module ActiveAdmin
               text_node(favicon_tag)
             end
 
-            text_node csrf_meta_tag
+            text_node csrf_meta_tags
+            text_node csp_meta_tag
           end
         end
 

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

@@ -112,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::NEW, 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)

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

@@ -40,13 +40,7 @@ module ActiveAdmin
         protected
 
         def default_title
-          title = display_name(resource)
-
-          if title.blank?
-            title = "#{active_admin_config.resource_label} ##{resource.id}"
-          end
-
-          title
+          display_name(resource)
         end
 
         module DefaultMainContent

data/lib/active_admin.rb

@@ -3,7 +3,6 @@ require "active_support/core_ext"
 require "set"
 
 require "ransack"
-require "ransack_ext"
 require "kaminari"
 require "formtastic"
 require "formtastic_i18n"

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -18,6 +18,23 @@ ActiveAdmin.setup do |config|
   #
   # config.site_title_image = "logo.png"
 
+  # == Load Paths
+  #
+  # By default Active Admin files go inside app/admin/.
+  # You can change this directory.
+  #
+  # eg:
+  #   config.load_paths = [File.join(Rails.root, 'app', 'ui')]
+  #
+  # Or, you can also load more directories.
+  # Useful when setting namespaces with users that are not your main AdminUser entity.
+  #
+  # eg:
+  #   config.load_paths = [
+  #     File.join(Rails.root, 'app', 'admin'),
+  #     File.join(Rails.root, 'app', 'cashier')
+  #   ]
+
   # == Default Namespace
   #
   # Set the default namespace each administration resource
@@ -303,7 +320,7 @@ ActiveAdmin.setup do |config|
   #    :title,
   #    :email,
   #  ]
-  # config.filter_method_for_large_association = '_starts_with'
+  # config.filter_method_for_large_association = '_start'
 
   # == Head
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -145,20 +145,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -309,46 +309,6 @@ files:
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
-- docs/.gitignore
-- docs/0-installation.md
-- docs/1-general-configuration.md
-- docs/10-custom-pages.md
-- docs/11-decorators.md
-- docs/12-arbre-components.md
-- docs/13-authorization-adapter.md
-- docs/14-gotchas.md
-- docs/2-resource-customization.md
-- docs/3-index-pages.md
-- docs/3-index-pages/custom-index.md
-- docs/3-index-pages/index-as-block.md
-- docs/3-index-pages/index-as-blog.md
-- docs/3-index-pages/index-as-grid.md
-- docs/3-index-pages/index-as-table.md
-- docs/4-csv-format.md
-- docs/5-forms.md
-- docs/6-show-pages.md
-- docs/7-sidebars.md
-- docs/8-custom-actions.md
-- docs/9-batch-actions.md
-- docs/CNAME
-- docs/Gemfile
-- docs/Gemfile.lock
-- docs/README.md
-- docs/_config.yml
-- docs/_includes/footer.html
-- docs/_includes/google-analytics.html
-- docs/_includes/head.html
-- docs/_includes/toc.html
-- docs/_includes/top-menu.html
-- docs/_layouts/default.html
-- docs/documentation.md
-- docs/images/activeadmin.png
-- docs/images/code-header.png
-- docs/images/divider.png
-- docs/images/features.png
-- docs/images/tidelift.svg
-- docs/index.html
-- docs/stylesheets/main.css
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -530,7 +490,6 @@ files:
 - lib/generators/active_admin/webpacker/templates/active_admin.scss
 - lib/generators/active_admin/webpacker/templates/print.scss
 - lib/generators/active_admin/webpacker/webpacker_generator.rb
-- lib/ransack_ext.rb
 - vendor/assets/javascripts/jquery-ui/data.js
 - vendor/assets/javascripts/jquery-ui/disable-selection.js
 - vendor/assets/javascripts/jquery-ui/escape-selector.js
@@ -562,7 +521,8 @@ files:
 homepage: https://activeadmin.info
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -578,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style