activeadmin 2.9.0 → 3.2.0

data/lib/active_admin/filters/active_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
 
@@ -40,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/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
@@ -20,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
@@ -30,7 +31,7 @@ module ActiveAdmin
           case column.type
           when :date, :datetime
             :date_range
-          when :string, :text
+          when :string, :text, :citext
             :string
           when :integer, :float, :decimal
             :numeric

data/lib/active_admin/filters/formtastic_addons.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Filters
     module FormtasticAddons
@@ -46,7 +47,7 @@ module ActiveAdmin
       #
 
       def searchable_has_many_through?
-        if reflection && reflection.options[:through]
+        if klass.ransackable_associations.include?(method.to_s) && reflection && reflection.options[:through]
           reflection.through_reflection.klass.ransackable_attributes.include? reflection.foreign_key
         else
           false

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

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.
 #
@@ -8,7 +9,7 @@
 #     include Base
 #     include Base::SearchMethodSelect
 #
-#     filter :equals, :greater_than, :less_than
+#     filter :eq, :gt, :lt
 #   end
 #
 module ActiveAdmin
@@ -64,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/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
@@ -14,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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Inputs
     module Filters
@@ -5,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/select_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Inputs
     module Filters
@@ -42,6 +43,8 @@ module ActiveAdmin
           else
             super
           end
+        rescue ActiveRecord::QueryCanceled => error
+          raise ActiveRecord::QueryCanceled.new "#{error.message.strip} while querying the values for the ActiveAdmin :#{method} filter"
         end
 
         def pluck_column

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Inputs
     module Filters
@@ -5,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/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
@@ -47,6 +48,7 @@ module ActiveAdmin
       #   menu.add parent: 'Dashboard', label: 'My Child Dashboard'
       #
       def add(options)
+        options = options.dup # Make sure parameter is not modified
         parent_chain = Array.wrap(options.delete(:parent))
 
         item = if parent = parent_chain.shift

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
@@ -27,7 +28,7 @@ module ActiveAdmin
   class Namespace
     class << self
       def setting(name, default)
-        Deprecation.warn "This method does not do anything and will be removed."
+        ActiveAdmin.deprecator.warn "This method does not do anything and will be removed."
       end
     end
 
@@ -59,7 +60,7 @@ module ActiveAdmin
       settings.respond_to?(method) ? settings.send(method, *args) : super
     end
 
-    # Register a resource into this namespace. The preffered method to access this is to
+    # Register a resource into this namespace. The preferred method to access this is to
     # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
     def register(resource_class, options = {}, &block)
@@ -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, { active_admin_resource: 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
@@ -118,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/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
 
@@ -27,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/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"
 
@@ -35,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/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"
@@ -71,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/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,24 +31,19 @@ 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
 
     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}?"
@@ -56,8 +52,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
+
+      ActiveAdmin.deprecator.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 +98,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 +106,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