activeadmin 2.9.0 → 2.13.0

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

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,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
 

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

data/lib/active_admin/helpers/scope_chain.rb

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

data/lib/active_admin/inputs/datepicker_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Inputs
     class DatepickerInput < ::Formtastic::Inputs::StringInput

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This is a common set of Formtastic overrides needed to build a filter form
 # that lets you select from a set of search methods for a given attribute.
 #

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/active_admin/inputs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Inputs
     extend ActiveSupport::Autoload

data/lib/active_admin/localizers/resource_localizer.rb

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

data/lib/active_admin/localizers.rb

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

data/lib/active_admin/menu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # Each Namespace builds up it's own menu as the global navigation

data/lib/active_admin/menu_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   DEFAULT_MENU = :default

data/lib/active_admin/menu_item.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class MenuItem
     include Menu::MenuNode

data/lib/active_admin/namespace.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/resource_collection"
 
 module ActiveAdmin
@@ -71,7 +72,7 @@ module ActiveAdmin
       reset_menu!
 
       # Dispatch a registration event
-      ActiveSupport::Notifications.publish ActiveAdmin::Resource::RegisterEvent, config
+      ActiveSupport::Notifications.instrument ActiveAdmin::Resource::RegisterEvent, config
 
       # Return the config
       config

data/lib/active_admin/namespace_settings.rb

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

data/lib/active_admin/order_clause.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class OrderClause
     attr_reader :field, :order, :active_admin_config

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Comment < ActiveRecord::Base
 

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/views"
 require "active_admin/views/components/panel"
 

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

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "active_admin/views"
 require "active_admin/orm/active_record/comments/views/active_admin_comments"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/orm/active_record/comments/views"
 require "active_admin/orm/active_record/comments/show_page_helper"
 require "active_admin/orm/active_record/comments/namespace_helper"

data/lib/active_admin/orm/active_record.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # ActiveRecord-specific plugins should be required here
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid

data/lib/active_admin/orm/mongoid.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 # Mongoid-specific plugins should be required here

data/lib/active_admin/page.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # Page is the primary data storage for page configuration in Active Admin
   #

data/lib/active_admin/page_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # All Pages controllers inherit from this controller.

data/lib/active_admin/page_dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # This is the class where all the register_page blocks are evaluated.
   class PageDSL < DSL

data/lib/active_admin/page_presenter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # A simple object that gets used to present different aspects of views

data/lib/active_admin/pundit_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin::Dependency.pundit!
 
 require "pundit"
@@ -30,16 +31,13 @@ module ActiveAdmin
     end
 
     def retrieve_policy(subject)
-      case subject
-      when nil then Pundit.policy!(user, namespace(resource))
-      when Class then Pundit.policy!(user, namespace(subject.new))
-      else Pundit.policy!(user, namespace(subject))
-      end
-    rescue Pundit::NotDefinedError => e
-      if default_policy_class
-        default_policy(user, subject)
+      target = policy_target(subject)
+      if (policy = policy(namespace(target)) || compat_policy(subject))
+        policy
+      elsif default_policy_class
+        default_policy(subject)
       else
-        raise e
+        raise Pundit::NotDefinedError, "unable to find a compatible policy for `#{target}`"
       end
     end
 
@@ -56,8 +54,42 @@ module ActiveAdmin
 
     private
 
+    def policy_target(subject)
+      case subject
+      when nil then resource
+      when Class then subject.new
+      else subject
+      end
+    end
+
+    # This method is needed to fallback to our previous policy searching logic.
+    # I.e.: when class name contains `default_policy_namespace` (eg: ShopAdmin)
+    # we should try to search it without namespace. This is because that's
+    # the only thing that worked in this case before we fixed our buggy namespace
+    # detection, so people are probably relying on it.
+    # This fallback might be removed in future versions of ActiveAdmin, so
+    # pundit_adapter search will work consistently with provided namespaces
+    def compat_policy(subject)
+      return unless default_policy_namespace
+
+      target = policy_target(subject)
+
+      return unless target.class.to_s.include?(default_policy_module) &&
+        (policy = policy(target))
+
+      policy_name = policy.class.to_s
+
+      Deprecation.warn "You have `pundit_policy_namespace` configured as `#{default_policy_namespace}`, " \
+        "but ActiveAdmin was unable to find policy #{default_policy_module}::#{policy_name}. " \
+        "#{policy_name} will be used instead. " \
+        "This behavior will be removed in future versions of ActiveAdmin. " \
+        "To fix this warning, move your #{policy_name} policy to the #{default_policy_module} namespace"
+
+      policy
+    end
+
     def namespace(object)
-      if default_policy_namespace && !object.class.to_s.include?(default_policy_namespace.to_s.camelize)
+      if default_policy_namespace && !object.class.to_s.start_with?("#{default_policy_module}::")
         [default_policy_namespace.to_sym, object]
       else
         object
@@ -68,7 +100,7 @@ module ActiveAdmin
       ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
     end
 
-    def default_policy(user, subject)
+    def default_policy(subject)
       default_policy_class.new(user, subject)
     end
 
@@ -76,6 +108,18 @@ module ActiveAdmin
       ActiveAdmin.application.pundit_policy_namespace
     end
 
+    def default_policy_module
+      default_policy_namespace.to_s.camelize
+    end
+
+    def policy(target)
+      policies[target] ||= Pundit.policy(user, target)
+    end
+
+    def policies
+      @policies ||= {}
+    end
+
   end
 
 end

data/lib/active_admin/resource/action_items.rb

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

data/lib/active_admin/resource/attributes.rb

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

data/lib/active_admin/resource/belongs_to.rb

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

data/lib/active_admin/resource/controllers.rb

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

data/lib/active_admin/resource/includes.rb

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

data/lib/active_admin/resource/menu.rb

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

data/lib/active_admin/resource/model.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Model
     def initialize(resource, record)

data/lib/active_admin/resource/naming.rb

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

data/lib/active_admin/resource/ordering.rb

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

data/lib/active_admin/resource/page_presenters.rb

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

data/lib/active_admin/resource/pagination.rb

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

data/lib/active_admin/resource/routes.rb

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

data/lib/active_admin/resource/scope_to.rb

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

data/lib/active_admin/resource/scopes.rb

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

data/lib/active_admin/resource/sidebars.rb

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

data/lib/active_admin/resource.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/resource/action_items"
 require "active_admin/resource/attributes"
 require "active_admin/resource/controllers"
@@ -98,11 +99,11 @@ module ActiveAdmin
     # The class this resource wraps. If you register the Post model, Resource#resource_class
     # will point to the Post class
     def resource_class
-      ActiveSupport::Dependencies.constantize(resource_class_name)
+      resource_class_name.constantize
     end
 
     def decorator_class
-      ActiveSupport::Dependencies.constantize(decorator_class_name) if decorator_class_name
+      decorator_class_name&.constantize
     end
 
     def resource_name_extension

data/lib/active_admin/resource_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # This is a container for resources, which acts much like a Hash.
   # It's assumed that an added resource responds to `resource_name`.

data/lib/active_admin/resource_controller/action_builder.rb

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