activeadmin 2.2.0 → 2.12.0

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Comment < ActiveRecord::Base
 
     self.table_name = "#{table_name_prefix}active_admin_comments#{table_name_suffix}"
 
     belongs_to :resource, polymorphic: true, optional: true
-    belongs_to :author,   polymorphic: true
+    belongs_to :author, polymorphic: true
 
     validates_presence_of :body, :namespace, :resource
 
@@ -18,8 +19,8 @@ module ActiveAdmin
     def self.find_for_resource_in_namespace(resource, namespace)
       where(
         resource_type: resource_type(resource),
-        resource_id:   resource.id,
-        namespace:     namespace.to_s
+        resource_id: resource.id,
+        namespace: namespace.to_s
       ).order(ActiveAdmin.application.namespaces[namespace.to_sym].comments_order)
     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,5 +1,6 @@
-require 'active_admin/views'
-require 'active_admin/views/components/panel'
+# frozen_string_literal: true
+require "active_admin/views"
+require "active_admin/views/components/panel"
 
 module ActiveAdmin
   module Comments
@@ -22,13 +23,13 @@ module ActiveAdmin
         protected
 
         def title
-          I18n.t 'active_admin.comments.title_content', count: @comments.total_count
+          I18n.t "active_admin.comments.title_content", count: @comments.total_count
         end
 
         def build_comments
           if @comments.any?
             @comments.each(&method(:build_comment))
-            div page_entries_info(@comments).html_safe, class: 'pagination_information'
+            div page_entries_info(@comments).html_safe, class: "pagination_information"
           else
             build_empty_message
           end
@@ -42,56 +43,56 @@ module ActiveAdmin
 
         def build_comment(comment)
           div for: comment do
-            div class: 'active_admin_comment_meta' do
-              h4 class: 'active_admin_comment_author' do
-                comment.author ? auto_link(comment.author) : I18n.t('active_admin.comments.author_missing')
+            div class: "active_admin_comment_meta" do
+              h4 class: "active_admin_comment_author" do
+                comment.author ? auto_link(comment.author) : I18n.t("active_admin.comments.author_missing")
               end
               span pretty_format comment.created_at
               if authorized?(ActiveAdmin::Auth::DESTROY, comment)
-                text_node link_to I18n.t('active_admin.comments.delete'), comments_url(comment.id), method: :delete, data: { confirm: I18n.t('active_admin.comments.delete_confirmation') }
+                text_node link_to I18n.t("active_admin.comments.delete"), comments_url(comment.id), method: :delete, data: { confirm: I18n.t("active_admin.comments.delete_confirmation") }
               end
             end
-            div class: 'active_admin_comment_body' do
+            div class: "active_admin_comment_body" do
               simple_format comment.body
             end
           end
         end
 
         def build_empty_message
-          span I18n.t('active_admin.comments.no_comments_yet'), class: 'empty'
+          span I18n.t("active_admin.comments.no_comments_yet"), class: "empty"
         end
 
         def comments_url(*args)
           parts = []
           parts << active_admin_namespace.name unless active_admin_namespace.root?
           parts << active_admin_namespace.comments_registration_name.underscore
-          parts << 'path'
-          send parts.join('_'), *args
+          parts << "path"
+          send parts.join("_"), *args
         end
 
         def comment_form_url
           parts = []
           parts << active_admin_namespace.name unless active_admin_namespace.root?
           parts << active_admin_namespace.comments_registration_name.underscore.pluralize
-          parts << 'path'
-          send parts.join '_'
+          parts << "path"
+          send parts.join "_"
         end
 
         def build_comment_form
           active_admin_form_for(ActiveAdmin::Comment.new, url: comment_form_url) do |f|
             f.inputs do
-              f.input :resource_type, as: :hidden,  input_html: { value: ActiveAdmin::Comment.resource_type(parent.resource) }
-              f.input :resource_id,   as: :hidden,  input_html: { value: parent.resource.id }
-              f.input :body,          label: false, input_html: { size: '80x8' }
+              f.input :resource_type, as: :hidden, input_html: { value: ActiveAdmin::Comment.resource_type(parent.resource) }
+              f.input :resource_id, as: :hidden, input_html: { value: parent.resource.id }
+              f.input :body, label: false, input_html: { size: "80x8" }
             end
             f.actions do
-              f.action :submit, label: I18n.t('active_admin.comments.add')
+              f.action :submit, label: I18n.t("active_admin.comments.add")
             end
           end
         end
 
         def default_id_for_prefix
-          'active_admin_comments_for'
+          "active_admin_comments_for"
         end
       end
 

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

@@ -1,2 +1,3 @@
-require 'active_admin/views'
-require 'active_admin/orm/active_record/comments/views/active_admin_comments'
+# 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,21 +1,22 @@
-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'
-require 'active_admin/orm/active_record/comments/resource_helper'
+# 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"
+require "active_admin/orm/active_record/comments/resource_helper"
 
 # Add the comments configuration
-ActiveAdmin::Application.inheritable_setting :comments,                   true
-ActiveAdmin::Application.inheritable_setting :comments_registration_name, 'Comment'
-ActiveAdmin::Application.inheritable_setting :comments_order,             "created_at ASC"
-ActiveAdmin::Application.inheritable_setting :comments_menu,              {}
+ActiveAdmin::Application.inheritable_setting :comments, true
+ActiveAdmin::Application.inheritable_setting :comments_registration_name, "Comment"
+ActiveAdmin::Application.inheritable_setting :comments_order, "created_at ASC"
+ActiveAdmin::Application.inheritable_setting :comments_menu, {}
 
 # Insert helper modules
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
-ActiveAdmin::Resource.send  :include, ActiveAdmin::Comments::ResourceHelper
+ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
-ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
+ActiveAdmin.autoload :Comment, "active_admin/orm/active_record/comments/comment"
 
 # Hint i18n-tasks about model and attribute translations used by default install
 # i18n-tasks-use t('activerecord.models.comment')
@@ -36,7 +37,7 @@ ActiveAdmin.after_load do |app|
 
       menu namespace.comments ? namespace.comments_menu : false
 
-      config.comments      = false # Don't allow comments on comments
+      config.comments = false # Don't allow comments on comments
       config.batch_actions = false # The default destroy batch action isn't showing up anyway...
 
       scope :all, show_count: false
@@ -51,7 +52,7 @@ ActiveAdmin.after_load do |app|
       # Store the author and namespace
       before_save do |comment|
         comment.namespace = active_admin_config.namespace.name
-        comment.author    = current_active_admin_user
+        comment.author = current_active_admin_user
       end
 
       controller do
@@ -67,7 +68,7 @@ ActiveAdmin.after_load do |app|
               redirect_back fallback_location: active_admin_root
             end
             failure.html do
-              flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
+              flash[:error] = I18n.t "active_admin.comments.errors.empty_text"
               redirect_back fallback_location: active_admin_root
             end
           end
@@ -88,12 +89,12 @@ ActiveAdmin.after_load do |app|
       permit_params :body, :namespace, :resource_id, :resource_type
 
       index do
-        column I18n.t('active_admin.comments.resource_type'), :resource_type
-        column I18n.t('active_admin.comments.author_type'),   :author_type
-        column I18n.t('active_admin.comments.resource'),      :resource
-        column I18n.t('active_admin.comments.author'),        :author
-        column I18n.t('active_admin.comments.body'),          :body
-        column I18n.t('active_admin.comments.created_at'),    :created_at
+        column I18n.t("active_admin.comments.resource_type"), :resource_type
+        column I18n.t("active_admin.comments.author_type"), :author_type
+        column I18n.t("active_admin.comments.resource"), :resource
+        column I18n.t("active_admin.comments.author"), :author
+        column I18n.t("active_admin.comments.body"), :body
+        column I18n.t("active_admin.comments.created_at"), :created_at
         actions
       end
     end

data/lib/active_admin/orm/active_record.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # ActiveRecord-specific plugins should be required here
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
 
-require 'active_admin/orm/active_record/comments'
+require "active_admin/orm/active_record/comments"

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
   #
@@ -65,7 +66,7 @@ module ActiveAdmin
     end
 
     def controller_name
-      [namespace.module_name, camelized_resource_name + "Controller"].compact.join('::')
+      [namespace.module_name, camelized_resource_name + "Controller"].compact.join("::")
     end
 
     # Override from `ActiveAdmin::Resource::Controllers`

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,6 +1,7 @@
+# frozen_string_literal: true
 ActiveAdmin::Dependency.pundit!
 
-require 'pundit'
+require "pundit"
 
 # Add a setting to the application to configure the pundit default policy
 ActiveAdmin::Application.inheritable_setting :pundit_default_policy, nil
@@ -30,13 +31,11 @@ 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
+      Pundit.policy!(user, namespace(policy_target(subject)))
     rescue Pundit::NotDefinedError => e
-      if default_policy_class
+      if (policy = compat_policy(subject))
+        policy
+      elsif default_policy_class
         default_policy(user, subject)
       else
         raise e
@@ -46,9 +45,9 @@ 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::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}?"
       end
@@ -56,8 +55,41 @@ 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)
+      target = policy_target(subject)
+
+      return unless default_policy_namespace &&
+        target.class.to_s.include?(default_policy_module) &&
+        (policy = Pundit.policy(user, 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.match?(/^#{default_policy_module}::/)
         [default_policy_namespace.to_sym, object]
       else
         object
@@ -76,6 +108,10 @@ module ActiveAdmin
       ActiveAdmin.application.pundit_policy_namespace
     end
 
+    def default_policy_module
+      default_policy_namespace.to_s.camelize
+    end
+
   end
 
 end

data/lib/active_admin/resource/action_items.rb

@@ -1,4 +1,5 @@
-require 'active_admin/helpers/optional_display'
+# frozen_string_literal: true
+require "active_admin/helpers/optional_display"
 
 module ActiveAdmin
 
@@ -64,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::CREATE, active_admin_config.resource_class)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:new_model), new_resource_path
           end
@@ -74,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::UPDATE, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:edit_model), edit_resource_path(resource)
           end
@@ -84,10 +85,10 @@ module ActiveAdmin
       # Adds the default Destroy link on show
       def add_default_show_action_item
         add_action_item :destroy, only: :show do
-          if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
+          if controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:delete_model), resource_path(resource), method: :delete,
-              data: { confirm: localizer.t(:delete_confirmation) }
+                                                                         data: { confirm: localizer.t(:delete_confirmation) }
           end
         end
       end

data/lib/active_admin/resource/attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   class Resource
@@ -36,7 +37,7 @@ module ActiveAdmin
       end
 
       def counter_cache_col?(c)
-        c.name.end_with?('_count')
+        c.name.end_with?("_count")
       end
 
       def filtered_col?(c)

data/lib/active_admin/resource/belongs_to.rb

@@ -1,4 +1,5 @@
-require 'active_admin/resource'
+# frozen_string_literal: true
+require "active_admin/resource"
 
 module ActiveAdmin
   class Resource
@@ -14,6 +15,9 @@ module ActiveAdmin
       # The resource which initiated this relationship
       attr_reader :owner
 
+      # The name of the relation
+      attr_reader :target_name
+
       def initialize(owner, target_name, options = {})
         @owner = owner
         @target_name = target_name
@@ -43,7 +47,7 @@ module ActiveAdmin
       end
 
       def to_param
-        :"#{@target_name}_id"
+        (@options[:param] || "#{@target_name}_id").to_sym
       end
     end
   end

data/lib/active_admin/resource/controllers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Resource
     module Controllers
@@ -6,7 +7,7 @@ module ActiveAdmin
       # Returns a properly formatted controller name for this
       # config within its namespace
       def controller_name
-        [namespace.module_name, resource_name.plural.camelize + "Controller"].compact.join('::')
+        [namespace.module_name, resource_name.plural.camelize + "Controller"].compact.join("::")
       end
 
       # Returns the controller for this config

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
 
@@ -7,12 +8,12 @@ module ActiveAdmin
       # To disable this menu item, call `menu(false)` from the DSL
       def menu_item_options=(options)
         if options == false
-          @include_in_menu   = false
+          @include_in_menu = false
           @menu_item_options = {}
         else
           @include_in_menu = true
           @navigation_menu_name = options[:menu_name]
-          @menu_item_options    = default_menu_options.merge options
+          @menu_item_options = default_menu_options.merge options
         end
       end
 
@@ -27,8 +28,8 @@ module ActiveAdmin
         {
           id: resource_name.plural,
           label: proc { resource.plural_resource_label },
-          url:   proc { resource.route_collection_path(params, url_options) },
-          if:    proc { authorized?(Auth::READ, menu_resource_class) }
+          url: proc { resource.route_collection_path(params, url_options) },
+          if: proc { authorized?(Auth::READ, menu_resource_class) }
         }
       end
 

data/lib/active_admin/resource/model.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  class Model
+    def initialize(resource, record)
+      @record = record
+
+      if resource
+        @record.extend(resource.resource_name_extension)
+      end
+    end
+
+    def to_model
+      @record
+    end
+  end
+end

data/lib/active_admin/resource/naming.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Resource
 
     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
@@ -17,13 +18,13 @@ module ActiveAdmin
       # Returns the name to call this resource such as "Bank Account"
       def resource_label
         resource_name.translate count: 1,
-          default: resource_name.to_s.gsub('::', ' ').titleize
+                                default: resource_name.to_s.gsub("::", " ").titleize
       end
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        defaults = { count:   Helpers::I18n::PLURAL_MANY_COUNT,
-                    default: resource_label.pluralize.titleize }
+        defaults = { count: Helpers::I18n::PLURAL_MANY_COUNT,
+                     default: resource_label.pluralize.titleize }
         resource_name.translate defaults.merge options
       end
 
@@ -46,7 +47,7 @@ module ActiveAdmin
       end
 
       def translate(options = {})
-        I18n.t i18n_key, { scope: [:activerecord, :models] }.merge(options)
+        I18n.t i18n_key, **{ scope: [:activerecord, :models] }.merge(options)
       end
 
       def route_key

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
@@ -42,8 +43,6 @@ module ActiveAdmin
         config[:route_collection_name] == config[:route_instance_name]
       end
 
-      private
-
       class RouteBuilder
         def initialize(resource)
           @resource = resource
@@ -98,19 +97,19 @@ module ActiveAdmin
           suffix = options[:suffix] || "path"
           route = []
 
-          route << options[:action]           # "batch_action", "edit" or "new"
-          route << resource.route_prefix      # "admin"
+          route << options[:action] # "batch_action", "edit" or "new"
+          route << resource.route_prefix # "admin"
           route << belongs_to_name if nested? # "category"
-          route << resource_path_name         # "posts" or "post"
-          route << suffix                     # "path" or "index path"
+          route << resource_path_name # "posts" or "post"
+          route << suffix # "path" or "index path"
 
-          route.compact.join('_').to_sym      # :admin_category_posts_path
+          route.compact.join("_").to_sym # :admin_category_posts_path
         end
 
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?
-            [instance.public_send(belongs_to_name).to_param, instance.to_param]
+            [instance.public_send(belongs_to_target_name).to_param, instance.to_param]
           else
             instance.to_param
           end
@@ -123,11 +122,19 @@ module ActiveAdmin
         end
 
         def nested?
-          resource.belongs_to? && resource.belongs_to_config.required?
+          resource.belongs_to? && belongs_to_config.required?
+        end
+
+        def belongs_to_target_name
+          belongs_to_config.target_name
         end
 
         def belongs_to_name
-          resource.belongs_to_config.target.resource_name.singular if nested?
+          belongs_to_config.target.resource_name.singular
+        end
+
+        def belongs_to_config
+          resource.belongs_to_config
         end
 
         def routes