blacklight 7.40.0 → 8.0.0.beta1

data/lib/blacklight/configuration.rb

@@ -1,9 +1,27 @@
 # frozen_string_literal: true
+
 module Blacklight
   ##
   # Blacklight::Configuration holds the configuration for a Blacklight::Controller, including
   # fields to display, facets to show, sort options, and search fields.
   class Configuration < OpenStructWithHashAccess
+    extend ActiveSupport::Autoload
+    eager_autoload do
+      autoload :Context
+      autoload :ViewConfig
+      autoload :ToolConfig
+      autoload :Fields
+      autoload :Field
+      autoload :NullField
+      autoload :NullDisplayField
+      autoload :SearchField
+      autoload :FacetField
+      autoload :SortField
+      autoload :DisplayField
+      autoload :IndexField
+      autoload :ShowField
+    end
+
     class_attribute :default_values, default: {}
 
     # Set up Blacklight::Configuration.default_values to contain the basic, required Blacklight fields
@@ -34,304 +52,271 @@ module Blacklight
       end
     end
 
-    property :logo_link
-    property :full_width_layout, default: false
-    property :header_component, default: nil
-    def header_component
-      super || Blacklight::HeaderComponent
-    end
-
-    # === Search request configuration
-
-    # @!attribute http_method
-    # @since v5.0.0
-    # @return [:get, :post] HTTP method used for search
-    property :http_method, default: :get
-    # @!attribute solr_path
-    # @return [String] The path to send requests to solr.
-    property :solr_path, default: 'select'
-    # @!attribute default_solr_params
-    # @return [Hash] Default values of parameters to send with every search request
-    property :default_solr_params, default: {}
-
-    # === Single document request configuration
-
-    # @!attribute document_solr_request_handler
-    # @return [String] The solr request handler to use when requesting only a single document
-    property :document_solr_request_handler, default: nil
-    # @!attribute document_solr_path
-    # @since v5.2.0
-    # @return [String] The url path (relative to the solr base url) to use when requesting only a single document
-    property :document_solr_path, default: 'get'
-    # @!attribute json_solr_path
-    # @since v7.34.0
-    # @return [String] The url path (relative to the solr base url) to use when using Solr's JSON Query DSL (as with the advanced search)
-    property :json_solr_path, default: nil
-    # @!attribute document_unique_id_param
-    # @since v5.2.0
-    # @return [Symbol] The solr query parameter used for sending the unique identifiers for one or more documents
-    property :document_unique_id_param, default: :ids
-    # @!attribute default_document_solr_params
-    # @return [Hash] Default values of parameters to send with every single-document request
-    property :default_document_solr_params, default: {}
-    # @!attribute fetch_many_documents_path
-    # @since v8.4.0
-    # @return [String] The url path (relative to the solr base url) to use when requesting multiple documents by id
-    property :fetch_many_documents_path, default: nil
-    # @!attribute fetch_many_document_params
-    # @since v7.0.0
-    # @return [Hash] Default values of parameters to send with every multi-document request
-    property :fetch_many_document_params, default: {}
-    # @!attribute document_pagination_params
-    # @return [Hash] Default values of parameters to send when getting the previous + next documents
-    property :document_pagination_params, default: {}
-
-    ##
-    # == Response models
-
-    # @!attribute repository_class
-    # @return [Class] Class for sending and receiving requests from a search index
-    property :repository_class, default: nil
-    def repository_class
-      super || Blacklight::Solr::Repository
-    end
-
-    # @!attribute search_builder_class
-    # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
-    property :search_builder_class, default: nil
-    def search_builder_class
-      super || locate_search_builder_class
-    end
-
-    def locate_search_builder_class
-      ::SearchBuilder
-    end
-
-    # @!attribute response_model
-    # model that maps index responses to the blacklight response model
-    # @return [Class]
-    property :response_model, default: nil
-    def response_model
-      super || Blacklight::Solr::Response
-    end
-
-    def response_model=(*args)
-      super
-    end
-
-    # @!attribute document_factory
-    # the factory that builds document
-    # @return [Class]
-    property :document_factory, default: nil
-    # A class that builds documents
-    def document_factory
-      super || Blacklight::DocumentFactory
-    end
-    # @!attribute document_model
-    # the model to use for each response document
-    # @return [Class]
-    property :document_model, default: nil
-    def document_model
-      super || ::SolrDocument
-    end
-
-    # only here to support alias_method
-    def document_model=(*args)
-      super
-    end
-
-    # @!attribute facet_paginator_class
-    # Class for paginating long lists of facet fields
-    # @return [Class]
-    property :facet_paginator_class, default: nil
-    def facet_paginator_class
-      super || Blacklight::Solr::FacetPaginator
-    end
-
-    # @!attribute connection_config
-    # repository connection configuration
-    # @since v5.13.0
-    # @return [Class]
-    property :connection_config, default: nil
-    def connection_config
-      super || Blacklight.connection_config
-    end
-
-    ##
-    # == Blacklight view configuration
-
-    # @!attribute navbar
-    # @since v5.8.0
-    # @return [#partials]
-    property :navbar, default: OpenStructWithHashAccess.new(partials: {})
-
-    # @!attribute index
-    # General configuration for all views
-    # @return [Blacklight::Configuration::ViewConfig::Index]
-    property :index, default: ViewConfig::Index.new(
-      # document presenter class used by helpers and views
-      document_presenter_class: nil,
-      # component class used to render a document
-      document_component: nil,
-      # solr field to use to render a document title
-      title_field: nil,
-      # solr field to use to render format-specific partials
-      display_type_field: nil,
-      # partials to render for each document(see #render_document_partials)
-      partials: [:index_header, :thumbnail, :index],
-      document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
-      collection_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
-      # what field, if any, to use to render grouped results
-      group: false,
-      # additional response formats for search results
-      respond_to: OpenStructWithHashAccess.new,
-      # component class used to render the facet grouping
-      facet_group_component: nil,
-      # component class used to render search constraints
-      constraints_component: nil,
-      # component class used to render the search bar
-      search_bar_component: nil,
-      # pagination parameters to pass to kaminari
-      pagination_options: Blacklight::Engine.config.blacklight.default_pagination_options.dup
-    )
-
-    # @!attribute show
-    # Additional configuration when displaying a single document
-    # @return [Blacklight::Configuration::ViewConfig::Show]
-    property :show, default: ViewConfig::Show.new(
-      # document presenter class used by helpers and views
-      document_presenter_class: nil,
-      document_component: nil,
-      display_type_field: nil,
-      # Default route parameters for 'show' requests.
-      # Set this to a hash with additional arguments to merge into the route,
-      # or set `controller: :current` to route to the current controller.
-      route: nil,
-      # partials to render for each document(see #render_document_partials)
-      partials: [:show_header, :show],
-      document_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
-    )
-
-    # @!attribute action_mapping
-    # @since v7.16.0
-    # @return [Hash{Symbol => Blacklight::Configuration::ViewConfig}]
-    property :action_mapping, default: NestedOpenStructWithHashAccess.new(
-      ViewConfig,
-      default: { top_level_config: :index },
-      show: { top_level_config: :show },
-      citation: { parent_config: :show }
-    )
-
-    # @!attribute sms
-    # @since v7.21.0
-    # @return [Blacklight::Configuration::ViewConfig]
-    property :sms, default: ViewConfig.new
-
-    # @!attribute email
-    # @since v7.21.0
-    # @return [Blacklight::Configuration::ViewConfig]
-    property :email, default: ViewConfig.new
-
-    # @!attribute
-    # Configurations for specific types of index views
-    # @return [Hash{Symbol => Blacklight::Configuration::ViewConfig}]
-    property :view, default: NestedOpenStructWithHashAccess.new(ViewConfig,
-                                                                list: {},
-                                                                atom: {
-                                                                  if: false, # by default, atom should not show up as an alternative view
-                                                                  partials: [:document],
-                                                                  summary_partials: [:index]
-                                                                },
-                                                                rss: {
-                                                                  if: false, # by default, rss should not show up as an alternative view
-                                                                  partials: [:document]
-                                                                })
-
-    ##
-    # === Blacklight behavior configuration
-
-    # @!attribute spell_max
-    # Maxiumum number of spelling suggestions to offer
-    # @return [Integer]
-    property :spell_max, default: 5
-
-    # @!attribute max_per_page
-    # Maximum number of results to show per page
-    # @return [Integer]
-    property :max_per_page, default: 100
-    # @!attribute per_page
-    # Options for the user for number of results to show per page
-    # @return [Array<Integer>]
-    property :per_page, default: [10, 20, 50, 100]
-    # @!attribute default_per_page
-    # @return [Integer]
-    property :default_per_page, default: nil
-    # @return [Integer]
-    def default_per_page
-      super || per_page.first
-    end
-
-    # @!attribute search_history_window
-    # how many searches to save in session history
-    # @return [Integer]
-    property :search_history_window, default: 100
-    # @!attribute default_facet_limit
-    # @since v5.10.0
-    # @return [Integer]
-    property :default_facet_limit, default: 10
-    # @!attribute default_more_limit
-    # @since v7.0.0
-    # @return [Integer]
-    property :default_more_limit, default: 20
-
-    # @!attribute crawler_detector
-    # proc for determining whether the session is a crawler/bot
-    # ex.: crawler_detector: lambda { |req| req.env['HTTP_USER_AGENT'] =~ /bot/ }
-    # @since v7.0.0
-    # @return [<nil, Proc>]
-    property :crawler_detector, default: nil
-
-    # @!attribute autocomplete_suggester
-    # @since v7.0.0
-    # @return [String]
-    property :autocomplete_suggester, default: 'mySuggester'
-
-    # @!attribute raw_endpoint
-    # @since v7.0.0
-    # @return [#enabled]
-    property :raw_endpoint, default: OpenStructWithHashAccess.new(enabled: false)
-
-    # @!attribute track_search_session
-    # @since v7.1.0
-    # @return [Boolean]
-    property :track_search_session, default: true
-
-    # @!attribute advanced_search
-    # @since v7.15.0
-    # @return [#enabled]
-    property :advanced_search, default: OpenStruct.new(enabled: false)
-
-    # @!attribute enable_search_bar_autofocus
-    # @since v7.2.0
-    # @return [Boolean]
-    property :enable_search_bar_autofocus, default: false
-
     BASIC_SEARCH_PARAMETERS = [:q, :qt, :page, :per_page, :search_field, :sort, :controller, :action, :'facet.page', :'facet.prefix', :'facet.sort', :rows, :format, :view].freeze
     ADVANCED_SEARCH_PARAMETERS = [{ clause: {} }, :op].freeze
-    # List the request parameters that compose the SearchState.
-    # If you use a plugin that adds to the search state, then you can add the parameters
-    # by modifiying this field.
-    # @!attribute search_state_fields
-    # @since v8.0.0
-    # @return [Array<Symbol>]
-    property :search_state_fields, default: BASIC_SEARCH_PARAMETERS + ADVANCED_SEARCH_PARAMETERS
-
-    # Have SearchState filter out unknown request parameters
-    #
-    # @!attribute filter_search_state_fields
-    # @since v8.0.0
-    # @return [Boolean]
-    property :filter_search_state_fields, default: false
+
+    # rubocop:disable Metrics/BlockLength
+    default_configuration do
+      property :logo_link, default: nil
+      property :header_component, default: Blacklight::HeaderComponent
+
+      # bootstrap_version may be set to 4 or 5
+      bootstrap_version = ENV['BOOTSTRAP_VERSION'].presence || "5"
+      property :bootstrap_version, default: /(\d)(?:\.\d){0,2}/.match(bootstrap_version)[1].to_i
+
+      # === Search request configuration
+
+      # @!attribute http_method
+      # @since v5.0.0
+      # @return [:get, :post] HTTP method used for search
+      property :http_method, default: :get
+      # @!attribute solr_path
+      # @return [String] The path to send requests to solr.
+      property :solr_path, default: 'select'
+      # @!attribute default_solr_params
+      # @return [Hash] Default values of parameters to send with every search request
+      property :default_solr_params, default: {}
+
+      # === Single document request configuration
+
+      # @!attribute document_solr_request_handler
+      # @return [String] The solr request handler to use when requesting only a single document
+      property :document_solr_request_handler, default: nil
+      # @!attribute document_solr_path
+      # @since v5.2.0
+      # @return [String] The url path (relative to the solr base url) to use when requesting only a single document
+      property :document_solr_path, default: 'get'
+      # @!attribute document_unique_id_param
+      # @since v5.2.0
+      # @return [Symbol] The solr query parameter used for sending the unique identifiers for one or more documents
+      property :document_unique_id_param, default: :ids
+      # @!attribute default_document_solr_params
+      # @return [Hash] Default values of parameters to send with every single-document request
+      property :default_document_solr_params, default: {}
+      # @!attribute fetch_many_document_params
+      # @since v7.0.0
+      # @return [Hash] Default values of parameters to send with every multi-document request
+      property :fetch_many_document_params, default: {}
+      # @!attribute document_pagination_params
+      # @return [Hash] Default values of parameters to send when getting the previous + next documents
+      property :document_pagination_params, default: {}
+
+      ##
+      # == Response models
+
+      # @!attribute repository_class
+      # @return [Class] Class for sending and receiving requests from a search index
+      property :repository_class, default: Blacklight::Solr::Repository
+      # @!attribute search_builder_class
+      # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
+      property :search_builder_class, default: ::SearchBuilder
+      # @!attribute response_model
+      # model that maps index responses to the blacklight response model
+      # @return [Class]
+      property :response_model, default: Blacklight::Solr::Response
+      # @!attribute document_model
+      # the model to use for each response document
+      # @return [Class]
+      property :document_model, default: ::SolrDocument
+      # @!attribute document_factory
+      # the factory that builds document
+      # @return [Class]
+      property :document_factory, default: Blacklight::DocumentFactory
+      # @!attribute facet_paginator_class
+      # Class for paginating long lists of facet fields
+      # @return [Class]
+      property :facet_paginator_class, default: Blacklight::Solr::FacetPaginator
+      # @!attribute connection_config
+      # repository connection configuration
+      # @since v5.13.0
+      # @return [Class]
+      property :connection_config, default: Blacklight.connection_config
+
+      ##
+      # == Blacklight view configuration
+
+      # @!attribute navbar
+      # @since v5.8.0
+      # @return [#partials]
+      property :navbar, default: OpenStructWithHashAccess.new(partials: {})
+
+      # @!attribute index
+      # General configuration for all views
+      # @return [Blacklight::Configuration::ViewConfig::Index]
+      property :index, default: ViewConfig::Index.new(
+        # document presenter class used by helpers and views
+        document_presenter_class: nil,
+        # component class used to render a document
+        document_component: Blacklight::DocumentComponent,
+        sidebar_component: Blacklight::Search::SidebarComponent,
+        # solr field to use to render a document title
+        title_field: nil,
+        # solr field to use to render format-specific partials
+        display_type_field: nil,
+        # the "field access" key to use to look up the document display fields
+        document_fields_key: :index_fields,
+        # partials to render for each document(see #render_document_partials)
+        partials: [],
+        document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
+        collection_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
+        # what field, if any, to use to render grouped results
+        group: false,
+        # additional response formats for search results
+        respond_to: OpenStructWithHashAccess.new,
+        # component class used to render the facet grouping
+        facet_group_component: nil,
+        # component class used to render search constraints
+        constraints_component: nil,
+        # component class used to render the search bar
+        search_bar_component: nil,
+        # component class used to render the header above the documents
+        search_header_component: Blacklight::SearchHeaderComponent
+      )
+
+      # @!attribute show
+      # Additional configuration when displaying a single document
+      # @return [Blacklight::Configuration::ViewConfig::Show]
+      property :show, default: ViewConfig::Show.new(
+        # document presenter class used by helpers and views
+        document_presenter_class: nil,
+        document_component: Blacklight::DocumentComponent,
+        sidebar_component: Blacklight::Document::SidebarComponent,
+        display_type_field: nil,
+        # the "field access" key to use to look up the document display fields
+        document_fields_key: :show_fields,
+        # Default route parameters for 'show' requests.
+        # Set this to a hash with additional arguments to merge into the route,
+        # or set `controller: :current` to route to the current controller.
+        route: nil,
+        # partials to render for each document(see #render_document_partials)
+        partials: [],
+        document_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
+      )
+
+      # @!attribute action_mapping
+      # @since v7.16.0
+      # @return [Hash{Symbol => Blacklight::Configuration::ViewConfig}]
+      property :action_mapping, default: NestedOpenStructWithHashAccess.new(
+        ViewConfig,
+        default: { top_level_config: :index },
+        show: { top_level_config: :show },
+        citation: { parent_config: :show }
+      )
+
+      # @!attribute sms
+      # @since v7.21.0
+      # @return [Blacklight::Configuration::ViewConfig]
+      property :sms, default: ViewConfig.new
+
+      # @!attribute email
+      # @since v7.21.0
+      # @return [Blacklight::Configuration::ViewConfig]
+      property :email, default: ViewConfig.new
+
+      # @!attribute
+      # Configurations for specific types of index views
+      # @return [Hash{Symbol => Blacklight::Configuration::ViewConfig}]
+      property :view, default: NestedOpenStructWithHashAccess.new(ViewConfig,
+                                                                  list: {},
+                                                                  atom: {
+                                                                    if: false, # by default, atom should not show up as an alternative view
+                                                                    partials: [:document],
+                                                                    summary_component: Blacklight::DocumentComponent
+                                                                  },
+                                                                  rss: {
+                                                                    if: false, # by default, rss should not show up as an alternative view
+                                                                    partials: [:document]
+                                                                  })
+
+      ##
+      # === Blacklight behavior configuration
+
+      # @!attribute spell_max
+      # Maxiumum number of spelling suggestions to offer
+      # @return [Integer]
+      property :spell_max, default: 5
+
+      # @!attribute max_per_page
+      # Maximum number of results to show per page
+      # @return [Integer]
+      property :max_per_page, default: 100
+      # @!attribute per_page
+      # Options for the user for number of results to show per page
+      # @return [Array<Integer>]
+      property :per_page, default: [10, 20, 50, 100]
+      # @!attribute default_per_page
+      # @return [Integer]
+      property :default_per_page, default: nil
+
+      # @!attribute search_history_window
+      # how many searches to save in session history
+      # @return [Integer]
+      property :search_history_window, default: 100
+      # @!attribute default_facet_limit
+      # @since v5.10.0
+      # @return [Integer]
+      property :default_facet_limit, default: 10
+      # @!attribute default_more_limit
+      # @since v7.0.0
+      # @return [Integer]
+      property :default_more_limit, default: 20
+
+      # @!attribute crawler_detector
+      # proc for determining whether the session is a crawler/bot
+      # ex.: crawler_detector: lambda { |req| req.env['HTTP_USER_AGENT'] =~ /bot/ }
+      # @since v7.0.0
+      # @return [<nil, Proc>]
+      property :crawler_detector, default: nil
+
+      # @!attribute autocomplete_suggester
+      # @since v7.0.0
+      # @return [String]
+      property :autocomplete_suggester, default: 'mySuggester'
+
+      # @!attribute raw_endpoint
+      # @since v7.0.0
+      # @return [#enabled]
+      property :raw_endpoint, default: OpenStructWithHashAccess.new(enabled: false)
+
+      # @!attribute track_search_session
+      # @since v7.1.0
+      # @return [Boolean]
+      property :track_search_session, default: true
+
+      # @!attribute advanced_search
+      # @since v7.15.0
+      # @return [#enabled]
+      property :advanced_search, default: OpenStruct.new(enabled: false)
+
+      # @!attribute enable_search_bar_autofocus
+      # @since v7.2.0
+      # @return [Boolean]
+      property :enable_search_bar_autofocus, default: false
+
+      # List the request parameters that compose the SearchState.
+      # If you use a plugin that adds to the search state, then you can add the parameters
+      # by modifiying this field.
+      # @!attribute search_state_fields
+      # @since v8.0.0
+      # @return [Array<Symbol>]
+      property :search_state_fields, default: BASIC_SEARCH_PARAMETERS + ADVANCED_SEARCH_PARAMETERS
+
+      # Have SearchState filter out unknown request parameters
+      #
+      # @!attribute filter_search_state_fields
+      # @since v8.0.0
+      # @return [Boolean]
+      property :filter_search_state_fields, default: true
+
+      # Additional Blacklight configuration setting for document-type specific
+      # configuration.
+      # @!attribute fields_for_type
+      # @since v8.0.0
+      # @return [Hash{Symbol => Blacklight::Configuration}]
+      # @see [#for_display_type]
+      property :fields_for_type, default: {}.with_indifferent_access
+    end
+    # rubocop:enable Metrics/BlockLength
 
     ##
     # Create collections of solr field configurations.
@@ -380,7 +365,7 @@ module Blacklight
     def initialize(hash = {})
       self.class.initialize_default_configuration unless self.class.initialized_default_configuration?
 
-      super(self.class.default_values.deep_dup.merge(hash))
+      super(self.class.default_values.deep_transform_values(&method(:_deep_copy)).merge(hash))
       yield(self) if block_given?
 
       @view_config ||= {}
@@ -396,6 +381,11 @@ module Blacklight
       super || Rails.application.routes.url_helpers.root_path
     end
 
+    # @return [Integer]
+    def default_per_page
+      super || per_page.first
+    end
+
     # DSL helper
     # @yield [config]
     # @yieldparam [Blacklight::Configuration]
@@ -409,8 +399,7 @@ module Blacklight
     # if not set, defaults to first defined search field
     # @return [Blacklight::Configuration::SearchField]
     def default_search_field
-      field = super || search_fields.values.find { |f| f.default == true }
-      field || search_fields.values.first
+      @default_search_field ||= super || search_fields.values.find { |f| f.default == true } || search_fields.values.first
     end
 
     # Returns default sort field, used for simpler display in history, etc.
@@ -488,7 +477,7 @@ module Blacklight
     # Note: Rails provides `#deep_dup`, but it aggressively `#dup`'s class names too, turning them
     # into anonymous class instances.
     def deep_copy
-      deep_transform_values_in_object(self, &method(:_deep_copy))
+      deep_transform_values(&method(:_deep_copy))
     end
 
     # builds a copy for the provided controller class
@@ -520,14 +509,12 @@ module Blacklight
         view_type = nil
       end
 
-      @view_config[[view_type, action_name]] ||= begin
-        if view_type.nil?
-          action_config(action_name)
-        else
-          base_config = action_config(action_name)
-          base_config.merge(view.fetch(view_type, {}))
-        end
-      end
+      @view_config[[view_type, action_name]] ||= if view_type.nil?
+                                                   action_config(action_name)
+                                                 else
+                                                   base_config = action_config(action_name)
+                                                   base_config.merge(view.fetch(view_type, {}))
+                                                 end
     end
 
     # YARD will include inline disabling as docs, cannot do multiline inside @!macro.  AND this must be separate from doc block.
@@ -537,10 +524,13 @@ module Blacklight
     # @!macro partial_if_unless
     #   @param name [String] the name of the document partial
     #   @param opts [Hash]
+    #   @option opts [Class] :component draw a component
+    #   @option opts [String] :partial partial to draw if component is false
     #   @option opts [Symbol,Proc] :if render this action if the method identified by the symbol or the proc evaluates to true. The proc will receive the action configuration and the document or documents for the action.
     #   @option opts [Symbol,Proc] :unless render this action unless the method identified by the symbol or the proc evaluates to true. The proc will receive the action configuration and the document or documents for the action.
     def add_show_tools_partial(name, opts = {})
       opts[:partial] ||= 'document_action'
+
       add_action(show.document_actions, name, opts)
       klass && ActionBuilder.new(klass, name, opts).build
     end
@@ -567,9 +557,9 @@ module Blacklight
     ##
     # Add a section of config that only applies to documents with a matching display type
     def for_display_type display_type, &_block
-      self.fields_for_type ||= {}
+      fields_for_type[display_type] ||= self.class.new
 
-      (fields_for_type[display_type] ||= self.class.new).tap do |conf|
+      fields_for_type[display_type].tap do |conf|
         yield(conf) if block_given?
       end
     end
@@ -577,45 +567,21 @@ module Blacklight
     ##
     # Return a list of fields for the index display that should be used for the
     # provided document.  This respects any configuration made using for_display_type
-    def index_fields_for(document_or_display_types)
-      display_types = if document_or_display_types.is_a? Blacklight::Document
-                        Deprecation.warn self, "Calling index_fields_for with a #{document_or_display_types.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
-                        document_or_display_types[index.display_type_field || 'format']
-                      else
-                        document_or_display_types
-                      end
-
-      fields = {}.with_indifferent_access
-
-      Array.wrap(display_types).each do |display_type|
-        fields = fields.merge(for_display_type(display_type).index_fields)
+    # @deprecated
+    def index_fields_for(display_types)
+      Array(display_types).inject(index_fields) do |fields, display_type|
+        fields.merge(for_display_type(display_type).index_fields)
       end
-
-      fields.merge(index_fields)
     end
 
     ##
     # Return a list of fields for the show page that should be used for the
     # provided document.  This respects any configuration made using for_display_type
-    def show_fields_for(document_or_display_types)
-      display_types = if document_or_display_types.is_a? Blacklight::Document
-                        Deprecation.warn self, "Calling show_fields_for with a #{document_or_display_types.class} is deprecated and will be removed in Blacklight 8. Pass the display type instead."
-                        document_or_display_types[show.display_type_field || 'format']
-                      else
-                        document_or_display_types
-                      end
-
-      unless display_types.respond_to?(:each)
-        Deprecation.warn self, "Calling show_fields_for with a scalar value is deprecated. It must receive an Enumerable."
-        display_types = Array.wrap(display_types)
+    # @deprecated
+    def show_fields_for(display_types)
+      Array(display_types).inject(show_fields) do |fields, display_type|
+        fields.merge(for_display_type(display_type).show_fields)
       end
-      fields = {}.with_indifferent_access
-
-      display_types.each do |display_type|
-        fields = fields.merge(for_display_type(display_type).show_fields)
-      end
-
-      fields.merge(show_fields)
     end
 
     # @!visibility private
@@ -638,34 +604,13 @@ module Blacklight
     def _deep_copy(value)
       case value
       when Module then value
-      when NestedOpenStructWithHashAccess then value.class.new(value.nested_class, deep_transform_values_in_object(value.to_h, &method(:_deep_copy)))
-      when OpenStruct then value.class.new(deep_transform_values_in_object(value.to_h, &method(:_deep_copy)))
+      when NestedOpenStructWithHashAccess then value.class.new(value.nested_class, value.to_h.deep_transform_values(&method(:_deep_copy)))
+      when OpenStruct then value.class.new(value.to_h.deep_transform_values(&method(:_deep_copy)))
       else
         value.dup
       end
     end
 
-    # This is a little shim to support Rails 6 (which has Hash#deep_transform_values) and
-    # earlier versions (which use our backport). Once we drop support for Rails 6, this
-    # can go away.
-    def deep_transform_values_in_object(object, &block)
-      return object.deep_transform_values(&block) if object.respond_to?(:deep_transform_values)
-
-      _deep_transform_values_in_object(object, &block)
-    end
-
-    # Ported from Rails 6
-    def _deep_transform_values_in_object(object, &block)
-      case object
-      when Hash
-        object.transform_values { |value| _deep_transform_values_in_object(value, &block) }
-      when Array
-        object.map { |e| _deep_transform_values_in_object(e, &block) }
-      else
-        yield(object)
-      end
-    end
-
     def action_config(action, default: :index)
       action_config = action_mapping[action]
       action_config ||= action_mapping[:default]