activeadmin 2.6.1 → 3.2.3

data/lib/active_admin/resource_controller/resource_class_methods.rb

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

data/lib/active_admin/resource_controller/scoping.rb

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

data/lib/active_admin/resource_controller/sidebars.rb

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

data/lib/active_admin/resource_controller/streaming.rb

@@ -1,4 +1,5 @@
-require 'csv'
+# frozen_string_literal: true
+require "csv"
 
 module ActiveAdmin
   class ResourceController < BaseController
@@ -18,23 +19,24 @@ module ActiveAdmin
       protected
 
       def stream_resource(&block)
-        headers['X-Accel-Buffering'] = 'no'
-        headers['Cache-Control'] = 'no-cache'
+        headers["X-Accel-Buffering"] = "no"
+        headers["Cache-Control"] = "no-cache"
+        headers["Last-Modified"] = Time.current.httpdate
 
         if ActiveAdmin.application.disable_streaming_in.include? Rails.env
-          self.response_body = block['']
+          self.response_body = block[String.new]
         else
           self.response_body = Enumerator.new &block
         end
       end
 
       def csv_filename
-        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_s(:default)}.csv"
+        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_s}.csv"
       end
 
       def stream_csv
-        headers['Content-Type'] = 'text/csv; charset=utf-8' # In Rails 5 it's set to HTML??
-        headers['Content-Disposition'] = %{attachment; filename="#{csv_filename}"}
+        headers["Content-Type"] = "text/csv; charset=utf-8" # In Rails 5 it's set to HTML??
+        headers["Content-Disposition"] = %{attachment; filename="#{csv_filename}"}
         stream_resource &active_admin_config.csv_builder.method(:build).to_proc.curry[self]
       end
 

data/lib/active_admin/resource_controller.rb

@@ -1,11 +1,13 @@
-require 'active_admin/resource_controller/action_builder'
-require 'active_admin/resource_controller/data_access'
-require 'active_admin/resource_controller/decorators'
-require 'active_admin/resource_controller/polymorphic_routes'
-require 'active_admin/resource_controller/scoping'
-require 'active_admin/resource_controller/streaming'
-require 'active_admin/resource_controller/sidebars'
-require 'active_admin/resource_controller/resource_class_methods'
+# frozen_string_literal: true
+require "active_admin/collection_decorator"
+require "active_admin/resource_controller/action_builder"
+require "active_admin/resource_controller/data_access"
+require "active_admin/resource_controller/decorators"
+require "active_admin/resource_controller/polymorphic_routes"
+require "active_admin/resource_controller/scoping"
+require "active_admin/resource_controller/streaming"
+require "active_admin/resource_controller/sidebars"
+require "active_admin/resource_controller/resource_class_methods"
 
 module ActiveAdmin
   # All Resources Controller inherits from this controller.
@@ -24,13 +26,13 @@ module ActiveAdmin
     include Streaming
     include Sidebars
     include ViewHelpers::DownloadFormatLinksHelper
-    extend  ResourceClassMethods
+    extend ResourceClassMethods
 
     def self.active_admin_config=(config)
       if @active_admin_config = config
         defaults resource_class: config.resource_class,
-                 route_prefix:   config.route_prefix,
-                 instance_name:  config.resource_name.singular
+                 route_prefix: config.route_prefix,
+                 instance_name: config.resource_name.singular
       end
     end
 

data/lib/active_admin/resource_dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   # This is the class where all the register blocks are evaluated.
   class ResourceDSL < DSL
@@ -62,11 +63,12 @@ module ActiveAdmin
     #
     def permit_params(*args, &block)
       param_key = config.param_key.to_sym
-      belongs_to_param = config.belongs_to_param
-      create_another_param = :create_another if config.create_another
 
       controller do
         define_method :permitted_params do
+          belongs_to_param = active_admin_config.belongs_to_param
+          create_another_param = :create_another if active_admin_config.create_another
+
           permitted_params =
             active_admin_namespace.permitted_params +
               Array.wrap(belongs_to_param) +
@@ -183,31 +185,15 @@ module ActiveAdmin
     # == Before / After Destroy
     # Called before and after the object is destroyed from the database.
     #
-    delegate :before_build,   :after_build,   to: :controller
-    delegate :before_create,  :after_create,  to: :controller
-    delegate :before_update,  :after_update,  to: :controller
-    delegate :before_save,    :after_save,    to: :controller
+    delegate :before_build, :after_build, to: :controller
+    delegate :before_create, :after_create, to: :controller
+    delegate :before_update, :after_update, to: :controller
+    delegate :before_save, :after_save, to: :controller
     delegate :before_destroy, :after_destroy, to: :controller
 
-    # This code defines both *_filter and *_action for Rails 5.0 and  *_action for Rails >= 5.1
-    phases = [
-      :before, :skip_before,
-      :after,  :skip_after,
-      :around, :skip
-    ]
-    keywords = if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1
-                 [:action]
-               else
-                 [:action, :filter]
-               end
-
-    keywords.each do |name|
-      phases.each do |action|
-       define_method "#{action}_#{name}" do |*args, &block|
-         controller.public_send "#{action}_action", *args, &block
-       end
-     end
-    end
+    standard_rails_filters =
+      AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.match(/_action\z/) }
+    delegate *standard_rails_filters, to: :controller
 
     # Specify which actions to create in the controller
     #

data/lib/active_admin/router.rb

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

data/lib/active_admin/scope.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class Scope
 
@@ -45,17 +46,17 @@ module ActiveAdmin
         @scope_block = block
       end
 
-      @localizer        = options[:localizer]
-      @show_count       = options.fetch(:show_count, true)
-      @display_if_block = options[:if]      || proc { true }
-      @default_block    = options[:default] || proc { false }
-      @group            = options[:group].try(:to_sym)
+      @localizer = options[:localizer]
+      @show_count = options.fetch(:show_count, true)
+      @display_if_block = options[:if] || proc { true }
+      @default_block = options[:default] || proc { false }
+      @group = options[:group].try(:to_sym)
     end
 
     def name
       case @name
       when String then @name
-      when Symbol then @localizer ? @localizer.t(@name, scope: 'scopes') : @name.to_s.titleize
+      when Symbol then @localizer ? @localizer.t(@name, scope: "scopes") : @name.to_s.titleize
       else @name
       end
     end

data/lib/active_admin/settings_node.rb

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

data/lib/active_admin/sidebar_section.rb

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

data/lib/active_admin/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
-  VERSION = '2.6.1'
+  VERSION = "3.2.3"
 end

data/lib/active_admin/view_factory.rb

@@ -1,27 +1,28 @@
-require 'active_admin/abstract_view_factory'
+# frozen_string_literal: true
+require "active_admin/abstract_view_factory"
 
 module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  global_navigation:   ActiveAdmin::Views::TabbedNavigation,
-              utility_navigation:  ActiveAdmin::Views::TabbedNavigation,
-              site_title:          ActiveAdmin::Views::SiteTitle,
-              unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
-              action_items:        ActiveAdmin::Views::ActionItems,
-              title_bar:           ActiveAdmin::Views::TitleBar,
-              header:              ActiveAdmin::Views::Header,
-              footer:              ActiveAdmin::Views::Footer,
-              index_scopes:        ActiveAdmin::Views::Scopes,
-              blank_slate:         ActiveAdmin::Views::BlankSlate
+    register global_navigation: ActiveAdmin::Views::TabbedNavigation,
+             utility_navigation: ActiveAdmin::Views::TabbedNavigation,
+             site_title: ActiveAdmin::Views::SiteTitle,
+             unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
+             action_items: ActiveAdmin::Views::ActionItems,
+             title_bar: ActiveAdmin::Views::TitleBar,
+             header: ActiveAdmin::Views::Header,
+             footer: ActiveAdmin::Views::Footer,
+             index_scopes: ActiveAdmin::Views::Scopes,
+             blank_slate: ActiveAdmin::Views::BlankSlate
 
     # Register All The Pages
-    register  index_page: ActiveAdmin::Views::Pages::Index,
-              show_page:  ActiveAdmin::Views::Pages::Show,
-              new_page:   ActiveAdmin::Views::Pages::Form,
-              edit_page:  ActiveAdmin::Views::Pages::Form,
-              layout:     ActiveAdmin::Views::Pages::Layout,
-              page:       ActiveAdmin::Views::Pages::Page
+    register index_page: ActiveAdmin::Views::Pages::Index,
+             show_page: ActiveAdmin::Views::Pages::Show,
+             new_page: ActiveAdmin::Views::Pages::Form,
+             edit_page: ActiveAdmin::Views::Pages::Form,
+             layout: ActiveAdmin::Views::Pages::Layout,
+             page: ActiveAdmin::Views::Pages::Page
 
   end
 end

data/lib/active_admin/view_helpers/active_admin_application_helper.rb

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

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module AutoLinkHelper
@@ -28,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/breadcrumb_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module BreadcrumbHelper
@@ -6,7 +7,7 @@ module ActiveAdmin
       def breadcrumb_links(path = request.path)
         # remove leading "/" and split up the URL
         # and remove last since it's used as the page title
-        parts = path.split('/').select(&:present?)[0..-2]
+        parts = path.split("/").select(&:present?)[0..-2]
 
         parts.each_with_index.map do |part, index|
           # 1. try using `display_name` if we can locate a DB object
@@ -15,13 +16,13 @@ module ActiveAdmin
           if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index - 1]
             parent = active_admin_config.belongs_to_config.try :target
             config = parent && parent.resource_name.route_key == parts[index - 1] ? parent : active_admin_config
-            name   = display_name config.find_resource part
+            name = display_name config.find_resource part
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, default: part.titlecase
 
           # Don't create a link if the resource's show action is disabled
           if !config || config.defined_actions.include?(:show)
-            link_to name, '/' + parts[0..index].join('/')
+            link_to name, "/" + parts[0..index].join("/")
           else
             name
           end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -1,22 +1,37 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
       DISPLAY_NAME_FALLBACK = -> {
-        name = ""
         klass = self.class
-        name << klass.model_name.human         if klass.respond_to? :model_name
-        name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
+        name = if klass.respond_to?(:model_name)
+                 if klass.respond_to?(:primary_key)
+                   "#{klass.model_name.human} ##{send(klass.primary_key)}"
+                 else
+                   klass.model_name.human
+                 end
+               elsif klass.respond_to?(:primary_key)
+                 " ##{send(klass.primary_key)}"
+               end
         name.present? ? name : to_s
       }
+
       def DISPLAY_NAME_FALLBACK.inspect
-        'DISPLAY_NAME_FALLBACK'
+        "DISPLAY_NAME_FALLBACK"
       end
 
       # 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.
@@ -26,7 +41,7 @@ module ActiveAdmin
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= begin
           methods = active_admin_application.display_name_methods - association_methods_for(resource)
-          method  = methods.detect { |method| resource.respond_to? method }
+          method = methods.detect { |method| resource.respond_to? method }
 
           if method != :to_s || resource.method(method).source_location
             method
@@ -74,7 +89,7 @@ module ActiveAdmin
           format_collection(object)
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
-             defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
+             defined?(::Mongoid) && object.class.include?(Mongoid::Document)
             auto_link object
           elsif defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Relation)
             format_collection(object)
@@ -85,7 +100,7 @@ module ActiveAdmin
       end
 
       def format_collection(collection)
-        safe_join(collection.map { |item| pretty_format(item) }, ', ')
+        safe_join(collection.map { |item| pretty_format(item) }, ", ")
       end
 
       def boolean_attr?(resource, attr, value)

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
@@ -18,7 +19,7 @@ module ActiveAdmin
       def build_download_format_links(formats = self.class.formats)
         params = request.query_parameters.except :format, :commit
         div class: "download_links" do
-          span I18n.t('active_admin.download')
+          span I18n.t("active_admin.download")
           formats.each do |format|
             a format.upcase, href: url_for(params: params, format: format)
           end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FormHelper
@@ -15,7 +16,7 @@ module ActiveAdmin
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except    = Array.wrap(options[:except]).map &:to_s
+        except = Array.wrap(options[:except]).map &:to_s
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
@@ -37,7 +38,7 @@ module ActiveAdmin
               { "#{k}[]" => v }
             end
           when nil
-            { k => '' }
+            { k => "" }
           when TrueClass, FalseClass
             { k => v }
           else

data/lib/active_admin/view_helpers/flash_helper.rb

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

data/lib/active_admin/view_helpers/form_helper.rb

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

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Utility methods for internal use.
 # @private
 module MethodOrProcHelper

data/lib/active_admin/view_helpers/scope_name_helper.rb

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

data/lib/active_admin/view_helpers/sidebar_helper.rb

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

data/lib/active_admin/view_helpers/title_helper.rb

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

data/lib/active_admin/view_helpers/view_factory_helper.rb

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

data/lib/active_admin/view_helpers.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
 
     # Require all ruby files in the view helpers dir
-    Dir[File.expand_path('view_helpers', __dir__) + "/*.rb"].each { |f| require f }
+    Dir[File.expand_path("view_helpers", __dir__) + "/*.rb"].each { |f| require f }
 
     include ActiveAdminApplicationHelper
     include AutoLinkHelper

data/lib/active_admin/views/action_items.rb

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class FormtasticProxy < ::Arbre::Rails::Forms::FormBuilderProxy
@@ -16,7 +17,7 @@ module ActiveAdmin
       end
 
       def to_s
-        opening_tag << children.to_s << closing_tag
+        opening_tag + children.to_s + closing_tag
       end
     end
 
@@ -101,24 +102,20 @@ 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
         create_another = params[:create_another]
         label = @resource.class.model_name.human
         Arbre::Context.new do
-          li class: 'create_another' do
+          li class: "create_another" do
             input(
               checked: create_another,
-              id: 'create_another',
-              name: 'create_another',
-              type: 'checkbox'
+              id: "create_another",
+              name: "create_another",
+              type: "checkbox"
             )
-            label(I18n.t('active_admin.create_another', model: label), for: 'create_another')
+            label(I18n.t("active_admin.create_another", model: label), for: "create_another")
           end
         end
       end
@@ -130,7 +127,7 @@ module ActiveAdmin
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
+        legend_tag = legend ? "<legend><span>#{ERB::Util.html_escape(legend)}</span></legend>" : ""
         fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require "active_admin/filters/active"
+
+module ActiveAdmin
+  module Views
+
+    class ActiveFiltersSidebarContent < ActiveAdmin::Component
+      builder_method :active_filters_sidebar_content
+
+      def build
+        active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+        active_scopes = assigns[:search].instance_variable_get("@scope_args")
+
+        scope_block(current_scope)
+        filters_list(active_filters, active_scopes)
+      end
+
+      def scope_block(current_scope)
+        return unless current_scope
+
+        h4 I18n.t("active_admin.search_status.current_scope"), style: "display: inline"
+        b scope_name(current_scope), class: "current_scope_name"
+      end
+
+      def filters_list(active_filters, active_scopes)
+        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? && active_scopes.blank?
+              li I18n.t("active_admin.search_status.no_current_filters")
+            else
+              active_filters.filters.each { |filter| filter_item(filter) }
+              active_scopes.each { |name, value| scope_item(name, value) }
+            end
+          end
+        end
+      end
+
+      def filter_item(filter)
+        li filter.html_options do
+          span filter.label
+          b to_sentence(filter.values.map { |v| pretty_format(v) })
+        end
+      end
+
+      def scope_item(name, value)
+        filter_name = name.gsub(/_eq$/, "")
+        filter = active_admin_config.filters[filter_name.to_sym]
+        label = filter.try(:[], :label) || filter_name.titleize
+
+        li class: "current_filter_#{name}" do
+          span "#{label} #{Ransack::Translate.predicate('eq')}"
+          b value
+        end
+      end
+    end
+
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -5,7 +6,7 @@ module ActiveAdmin
       builder_method :attributes_table_for
 
       def build(obj, *attrs)
-        @collection     = Array.wrap(obj)
+        @collection = Array.wrap(obj)
         @resource_class = @collection.first.class
         options = {}
         options[:for] = @collection.first if single_record?
@@ -20,7 +21,7 @@ module ActiveAdmin
       end
 
       def row(*args, &block)
-        title   = args[0]
+        title = args[0]
         options = args.extract_options!
         classes = [:row]
         if options[:class]
@@ -28,7 +29,7 @@ module ActiveAdmin
         elsif title.present?
           classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
-        options[:class] = classes.join(' ')
+        options[:class] = classes.join(" ")
 
         @table << tr(options) do
           th do
@@ -45,7 +46,7 @@ module ActiveAdmin
       protected
 
       def default_id_for_prefix
-        'attributes_table'
+        "attributes_table"
       end
 
       # Build Colgroups
@@ -75,7 +76,7 @@ module ActiveAdmin
       end
 
       def empty_value
-        span I18n.t('active_admin.empty'), class: "empty"
+        span I18n.t("active_admin.empty"), class: "empty"
       end
 
       def content_for(record, attr)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     # Build a Blank Slate
@@ -5,7 +6,7 @@ module ActiveAdmin
       builder_method :blank_slate
 
       def default_class_name
-        'blank_slate_container'
+        "blank_slate_container"
       end
 
       def build(content)