hyrax 4.0.0.rc1 → 4.0.0.rc3

data/app/services/hyrax/lock_manager.rb

@@ -4,24 +4,54 @@ module Hyrax
   class LockManager
     class UnableToAcquireLockError < StandardError; end
 
-    attr_reader :client
-
+    ##
     # @param [Fixnum] time_to_live How long to hold the lock in milliseconds
     # @param [Fixnum] retry_count How many times to retry to acquire the lock before raising UnableToAcquireLockError
     # @param [Fixnum] retry_delay Maximum wait time in milliseconds before retrying. Wait time is a random value between 0 and retry_delay.
     def initialize(time_to_live, retry_count, retry_delay)
       @ttl = time_to_live
-      @client = Redlock::Client.new([Redis.current], retry_count: retry_count, retry_delay: retry_delay)
+      @retry_count = retry_count
+      @retry_delay = retry_delay
     end
 
+    ##
     # Blocks until lock is acquired or timeout.
     def lock(key)
       returned_from_block = nil
-      client.lock(key, @ttl) do |locked|
-        raise UnableToAcquireLockError unless locked
-        returned_from_block = yield
+
+      pool.then do |conn|
+        client(conn).lock(key, @ttl) do |locked|
+          raise UnableToAcquireLockError unless locked
+          returned_from_block = yield
+        end
       end
+
       returned_from_block
+    rescue ConnectionPool::TimeoutError => err
+      Hyrax.logger.error(err.message)
+      raise(ConnectionPool::TimeoutError,
+            "Failed to aquire a lock from Redlock due to a Redis connection " /
+            "timeout: #{err}. If you are using Redis via `ConnectionPool` " /
+            "you may wish to increase the pool size.")
+    end
+
+    private
+
+    ##
+    # @api_private
+    def client(conn)
+      Redlock::Client.new([conn], retry_count: @retry_count, retry_delay: @retry_delay)
+    end
+
+    ##
+    # @api private
+    #
+    # @note support both a ConnectionPool and a raw Redis client for now.
+    #   we should drop support for `Redis.current` in 5.0.0.
+    #   `#then` supports both options. for a ConnectionPool it will block
+    #   until a connection is available.
+    def pool
+      Hyrax.config.redis_connection || Redis.current
     end
   end
 end

data/app/services/hyrax/solr_service.rb

@@ -128,8 +128,8 @@ module Hyrax
 
     # Wraps ActiveFedora::Base#search_by_id(id, opts)
     # @return [Array<SolrHit>] the response docs wrapped in SolrHit objects
-    def search_by_id(id, opts = {})
-      result = Hyrax::SolrService.query("id:#{id}", opts.merge(rows: 1))
+    def search_by_id(id, **opts)
+      result = Hyrax::SolrService.query("id:#{id}", **opts.merge(rows: 1))
 
       raise Hyrax::ObjectNotFoundError, "Object '#{id}' not found in solr" if result.empty?
       result.first

data/app/services/hyrax/visibility_reader.rb

@@ -41,7 +41,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/visibility_writer.rb

@@ -44,7 +44,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/workflow/permission_query.rb

@@ -55,7 +55,7 @@ module Hyrax
           workflow_actions_scope.arel_table[:id].in(
             workflow_state_actions_scope.arel_table.project(
               workflow_state_actions_scope.arel_table[:workflow_action_id]
-            ).where(workflow_state_actions_scope.arel.constraints.reduce)
+            ).where(workflow_state_actions_scope.arel.constraints.reduce(:+))
           )
         )
       end
@@ -307,7 +307,7 @@ module Hyrax
 
         entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
         Sipity::WorkflowRole.where(
-          workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
+          workflow_scope.arel.constraints.reduce(:+).or(entity_specific_scope.arel.constraints.reduce(:+))
         )
       end
 
@@ -358,7 +358,7 @@ module Hyrax
                 agent_scope.arel_table.project(
                   agent_scope.arel_table[:id]
                 ).where(
-                  agent_scope.arel.constraints.reduce.and(entity_responsibilities[:entity_id].eq(entity.id))
+                  agent_scope.arel.constraints.reduce(:+).and(entity_responsibilities[:entity_id].eq(entity.id))
                 )
               )
             )
@@ -399,7 +399,7 @@ module Hyrax
               ).where(
                 permissions.arel_table[:workflow_role_id].in(
                   role_scope.arel_table.project(role_scope.arel_table[:id]).where(
-                    role_scope.arel.constraints.reduce
+                    role_scope.arel.constraints.reduce(:+)
                   )
                 )
               )
@@ -441,7 +441,7 @@ module Hyrax
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_workflow_actions_available_for_current_state(entity:)
         workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
-        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
+        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce(:+))
       end
     end
   end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -5,8 +5,8 @@ module Hyrax
   class CollectionMembershipValidator < ActiveModel::Validator
     ##
     # @param multiple_membership_checker
-    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
-      @multiple_membership_checker = multiple_membership_checker
+    def initialize(options = {})
+      @multiple_membership_checker = options[:multiple_membership_checker] || Hyrax::MultipleMembershipChecker
       super(options)
     end
 

data/app/views/layouts/hyrax/dashboard.html.erb

@@ -16,7 +16,7 @@
         <%= render 'hyrax/dashboard/sidebar' %>
       </div>
       <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
-        <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
+        <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
         <%= render '/flash_msg' %>
         <% if content_for?(:page_header) %>
           <div class="row">

data/app/views/layouts/hyrax.html.erb

@@ -15,7 +15,7 @@
     <div id="content-wrapper" class="container" role="main">
       <%= content_for(:container_header) %>
       <%= render '/flash_msg' %>
-      <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
+      <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
       <% if content_for?(:page_header) %>
         <div class="row">
           <div class="col-12 main-header">

data/config/initializers/kaminari_engine_patch.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Add support for engine routes to kaminari
+Rails.application.config.to_prepare do
+  Kaminari::Helpers::Tag.class_eval do
+    def page_url_for(page)
+      params = params_for(page)
+      params[:only_path] = true
+      if @options[:route_set]
+        @options[:route_set].url_for params
+      else
+        @template.url_for params
+      end
+    end
+  end
+end

data/docker-compose-koppie.yml

@@ -104,7 +104,6 @@ services:
 
   postgres:
     image: postgres:latest
-    restart: always
     env_file:
       - .koppie/.env
     ports:

data/docker-compose.yml

@@ -99,7 +99,6 @@ services:
 
   postgres:
     image: postgres:latest
-    restart: always
     environment:
       - POSTGRES_USER=hyrax_user
       - POSTGRES_PASSWORD=hyrax_password

data/documentation/legacyREADME.md

@@ -50,7 +50,7 @@ The Samvera community is here to help. Please see our [support guide](../.github
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v4.0.0.rc1__. If you are looking for instructions on installing a different
+v4.0.0.rc3__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -129,7 +129,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 2.5, 2.6, and 2.7. When starting a new project, we recommend using the latest Ruby 2.7 version.
+Hyrax supports Ruby 2.7, 3.0, 3.1 and 3.2. When starting a new project, we recommend using the latest Ruby 3.2 version.
 
 ## Redis
 
@@ -159,7 +159,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc1/template.rb
+rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -32,7 +32,7 @@ SUMMARY
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 6.0'
 
-  spec.add_dependency 'active-fedora', '~> 13.1', '>= 13.1.2'
+  spec.add_dependency 'active-fedora', '~> 14.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 7.29'
@@ -41,6 +41,7 @@ SUMMARY
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
+  spec.add_dependency 'connection_pool', '~> 2.4'
   spec.add_dependency 'draper', '~> 4.0'
   spec.add_dependency 'dry-events', '~> 0.2.0'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
@@ -53,18 +54,16 @@ SUMMARY
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
   spec.add_dependency 'hydra-editor', '~> 6.0'
-  spec.add_dependency 'hydra-file_characterization', '~> 1.1.2'
+  spec.add_dependency 'hydra-file_characterization', '~> 1.1'
   spec.add_dependency 'hydra-head', '~> 12.0'
   spec.add_dependency 'hydra-works', '>= 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
   spec.add_dependency 'json-schema' # for Arkivo
-  # Pin more tightly because 0.x gems are potentially unstable
-  spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'nest', '~> 3.1'
-  spec.add_dependency 'noid-rails', '~> 3.0.0'
+  spec.add_dependency 'noid-rails', '~> 3.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'openseadragon'
@@ -79,7 +78,6 @@ SUMMARY
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
-  spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 3.0.1'

data/lib/generators/hyrax/templates/config/initializers/redis_config.rb

@@ -1,4 +1,11 @@
 # frozen_string_literal: true
 require 'redis'
+require 'connection_pool'
 config = YAML.safe_load(ERB.new(IO.read(Rails.root.join('config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-Redis.current = Redis.new(config.merge(thread_safe: true))
+config[:thread_safe] = true
+
+size = ENV.fetch("HYRAX_REDIS_POOL_SIZE", 5)
+timeout = ENV.fetch("HYRAX_REDIS_TIMEOUT", 5)
+
+Hyrax.config.redis_connection =
+  ConnectionPool::Wrapper.new(size: size, timeout: timeout) { Redis.new(config) }

data/lib/hyrax/configuration.rb

@@ -393,6 +393,11 @@ module Hyrax
       @banner_image ||= 'https://user-images.githubusercontent.com/101482/29949206-ffa60d2c-8e67-11e7-988d-4910b8787d56.jpg'
     end
 
+    attr_writer :breadcrumb_builder
+    def breadcrumb_builder
+      @breadcrumb_builder ||= Hyrax::BootstrapBreadcrumbsBuilder
+    end
+
     ##
     # @return [Boolean]
     def disable_wings
@@ -611,9 +616,10 @@ module Hyrax
       @persistent_hostpath ||= "http://localhost/files/"
     end
 
+    attr_accessor :redis_connection
     attr_writer :redis_namespace
     def redis_namespace
-      @redis_namespace ||= "hyrax"
+      @redis_namespace ||= ENV.fetch("HYRAX_REDIS_NAMESPACE", "hyrax")
     end
 
     attr_writer :libreoffice_path
@@ -880,6 +886,17 @@ module Hyrax
       @derivative_services ||= [Hyrax::FileSetDerivativesService]
     end
 
+    attr_writer :visibility_map
+    # A mapping from visibility string values to permissions; the default and
+    # reference implementation is provided by {Hyrax::VisibilityMap}.
+    #
+    # @return [Hyrax::VisibilityMap]
+    # @see Hyrax::VisibilityReader
+    # @see Hyrax::VisibilityWriter
+    def visibility_map
+      @visibility_map ||= Hyrax::VisibilityMap.instance
+    end
+
     private
 
     # @param [Symbol, #to_s] model_name - symbol representing the model

data/lib/hyrax/controlled_vocabularies/resource_label_caching.rb

@@ -27,7 +27,7 @@ module Hyrax
       # @note adds behavior to clear the cache whenever a manual fetch of data
       #   is performed.
       # @see ActiveTriples::Resource#fetch
-      def fetch(*)
+      def fetch(*, **)
         Rails.cache.delete(cache_key)
         super
       end

data/lib/hyrax/engine.rb

@@ -107,6 +107,8 @@ module Hyrax
 
         ActiveFedora::Base.translate_uri_to_id = c.translate_uri_to_id
         ActiveFedora::Base.translate_id_to_uri = c.translate_id_to_uri
+        ActiveFedora::File.translate_uri_to_id = c.translate_uri_to_id
+        ActiveFedora::File.translate_id_to_uri = c.translate_id_to_uri
 
         ::Noid::Rails.config.template = c.noid_template
         ::Noid::Rails.config.minter_class = c.noid_minter_class

data/lib/hyrax/redis_event_store.rb

@@ -7,9 +7,11 @@ module Hyrax
     class << self
       # @return [Fixnum, nil] the id of the event, or `nil` on failure(?!)
       def create(action, timestamp)
-        event_id = instance.incr("events:latest_id")
-        instance.hmset("events:#{event_id}", "action", action, "timestamp", timestamp)
-        event_id
+        instance.then do |redis|
+          event_id = redis.incr("events:latest_id")
+          redis.hmset("events:#{event_id}", "action", action, "timestamp", timestamp)
+          event_id
+        end
       rescue Redis::CommandError => e
         logger.error("unable to create event: #{e}")
         nil
@@ -23,12 +25,16 @@ module Hyrax
       #
       # @return [Redis]
       def instance
-        if Redis.current.is_a? Redis::Namespace
-          Redis.current.namespace = namespace
+        connection = Hyrax.config.redis_connection || Redis.current
+
+        if connection.is_a? Redis::Namespace
+          connection.namespace = namespace
+          connection
+        elsif connection == Redis.current
+          Redis.current = Redis::Namespace.new(namespace, redis: connection)
         else
-          Redis.current = Redis::Namespace.new(namespace, redis: Redis.current)
+          connection
         end
-        Redis.current
       end
 
       ##
@@ -44,11 +50,13 @@ module Hyrax
     #
     # @return [Enumerable<Hash<Symbol, String>>]
     def fetch(size)
-      RedisEventStore.instance.lrange(@key, 0, size).map do |event_id|
-        {
-          action: RedisEventStore.instance.hget("events:#{event_id}", "action"),
-          timestamp: RedisEventStore.instance.hget("events:#{event_id}", "timestamp")
-        }
+      Hyrax::RedisEventStore.instance.then do |redis|
+        redis.lrange(@key, 0, size).map do |event_id|
+          {
+            action: redis.hget("events:#{event_id}", "action"),
+            timestamp: redis.hget("events:#{event_id}", "timestamp")
+          }
+        end
       end
     rescue Redis::CommandError, Redis::CannotConnectError
       RedisEventStore.logger.error("unable to fetch event: #{@key}")
@@ -62,7 +70,7 @@ module Hyrax
     #
     # @return [Integer, nil] the value successfully pushed; or `nil` on failure(!?)
     def push(value)
-      RedisEventStore.instance.lpush(@key, value)
+      Hyrax::RedisEventStore.instance.then { |r| r.lpush(@key, value) }
     rescue Redis::CommandError, Redis::CannotConnectError
       RedisEventStore.logger.error("unable to push event: #{@key}")
       nil

data/lib/hyrax/transactions/transaction.rb

@@ -95,7 +95,8 @@ module Hyrax
       def call(value)
         Success(
           steps.inject(value) do |val, step_name|
-            yield container[step_name].call(val, *step_arguments_for(step_name))
+            args = step_arguments_for(step_name)
+            yield container[step_name].call(val, *args[0..-2], **Hash(args[-1]))
           end
         )
       end
@@ -119,7 +120,7 @@ module Hyrax
       #   tx = Hyrax::Transactions::Transaction.new(steps: [:first_step, :second_step])
       #   result = tx.with_step_args(second_step: {named_parameter: :param_value}).call(:value)
       #
-      def with_step_args(args)
+      def with_step_args(**args)
         raise(ArgumentError, key_err_msg(args.keys)) if
           args.keys.any? { |key| !step?(key) }
 

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '4.0.0.rc1'
+  VERSION = '4.0.0.rc3'
 end

data/lib/hyrax.rb

@@ -20,7 +20,6 @@ require 'hyrax/version'
 require 'hyrax/inflections'
 require 'hyrax/name'
 require 'hyrax/valkyrie_can_can_adapter'
-require 'kaminari_route_prefix'
 require 'valkyrie/indexing_adapter'
 require 'valkyrie/indexing/solr/indexing_adapter'
 require 'valkyrie/indexing/null_indexing_adapter'

data/lib/wings/valkyrie/storage.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'faraday/multipart'
+
 module Wings
   module Valkyrie
     ##
@@ -67,8 +69,9 @@ module Wings
 
         reader = RDF::Reader.for(content_type: response.headers['content-type'])
         version_graph = RDF::Graph.new << reader.new(response.body)
+        query = { predicate: RDF::Vocab::Fcrepo4.hasVersion }
 
-        version_graph.query(predicate: RDF::Vocab::Fcrepo4.hasVersion).objects.map do |uri|
+        version_graph.query(query).objects.map do |uri|
           timestamp =
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '4.0.0.rc1'
+gem 'hyrax', '4.0.0.rc3'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.1.2
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.1.2
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +162,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -328,14 +336,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -398,20 +406,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari_route_prefix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
@@ -474,14 +468,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -696,20 +690,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: samvera-nesting_indexer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
@@ -2962,6 +2942,7 @@ files:
 - config/i18n-tasks.yml
 - config/initializers/1_healthz.rb
 - config/initializers/indexing_adapter_initializer.rb
+- config/initializers/kaminari_engine_patch.rb
 - config/initializers/listeners.rb
 - config/initializers/reform_rails_6_1_monkey_patch.rb
 - config/initializers/simple_form.rb
@@ -3329,7 +3310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user