hyrax 5.0.5 → 5.1.0.pre.beta1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.1.0.pre.beta1
 platform: ruby
 authors:
 - Justin Coyne
@@ -13,7 +13,7 @@ authors:
 - Esmé Cowles
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,28 +21,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
@@ -341,28 +347,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: hydra-file_characterization
   requirement: !ruby/object:Gem::Requirement
@@ -383,14 +389,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: hydra-works
   requirement: !ruby/object:Gem::Requirement
@@ -467,6 +473,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: mailboxer
   requirement: !ruby/object:Gem::Requirement
@@ -551,20 +571,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: qa
   requirement: !ruby/object:Gem::Requirement
@@ -853,14 +859,14 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -967,14 +973,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -1205,7 +1211,6 @@ files:
 - ".dassie/bin/rails"
 - ".dassie/bin/rake"
 - ".dassie/bin/setup"
-- ".dassie/bin/spring"
 - ".dassie/bin/update"
 - ".dassie/bin/yarn"
 - ".dassie/config.ru"
@@ -1236,7 +1241,6 @@ files:
 - ".dassie/config/initializers/hyrax.rb"
 - ".dassie/config/initializers/mailboxer.rb"
 - ".dassie/config/initializers/mime_types.rb"
-- ".dassie/config/initializers/mini_magick.rb"
 - ".dassie/config/initializers/publisher.rb"
 - ".dassie/config/initializers/redis_config.rb"
 - ".dassie/config/initializers/riiif.rb"
@@ -1276,7 +1280,6 @@ files:
 - ".dassie/config/role_map.yml"
 - ".dassie/config/routes.rb"
 - ".dassie/config/solr.yml"
-- ".dassie/config/spring.rb"
 - ".dassie/config/storage.yml"
 - ".dassie/config/tinymce.yml"
 - ".dassie/config/uv/uv-config.json"
@@ -1481,7 +1484,6 @@ files:
 - ".koppie/bin/rails"
 - ".koppie/bin/rake"
 - ".koppie/bin/setup"
-- ".koppie/bin/spring"
 - ".koppie/bin/update"
 - ".koppie/bin/yarn"
 - ".koppie/config.ru"
@@ -1518,7 +1520,6 @@ files:
 - ".koppie/config/initializers/inflections.rb"
 - ".koppie/config/initializers/mailboxer.rb"
 - ".koppie/config/initializers/mime_types.rb"
-- ".koppie/config/initializers/mini_magick.rb"
 - ".koppie/config/initializers/publisher.rb"
 - ".koppie/config/initializers/redis_config.rb"
 - ".koppie/config/initializers/riiif.rb"
@@ -1545,7 +1546,6 @@ files:
 - ".koppie/config/routes.rb"
 - ".koppie/config/sidekiq.yml"
 - ".koppie/config/solr.yml"
-- ".koppie/config/spring.rb"
 - ".koppie/config/storage.yml"
 - ".koppie/config/tinymce.yml"
 - ".koppie/config/uv/uv-config.json"
@@ -2067,7 +2067,6 @@ files:
 - app/jobs/characterize_job.rb
 - app/jobs/concerns/hyrax/members_permission_job_behavior.rb
 - app/jobs/concerns/hyrax/permission_job_behavior.rb
-- app/jobs/concerns/hyrax/queued_job_behavior.rb
 - app/jobs/content_delete_event_job.rb
 - app/jobs/content_deposit_event_job.rb
 - app/jobs/content_event_job.rb
@@ -2086,8 +2085,6 @@ files:
 - app/jobs/hyrax/grant_read_job.rb
 - app/jobs/hyrax/grant_read_to_members_job.rb
 - app/jobs/hyrax/propagate_change_depositor_job.rb
-- app/jobs/hyrax/queued_delete_job.rb
-- app/jobs/hyrax/queued_indexing_job.rb
 - app/jobs/hyrax/revoke_edit_from_members_job.rb
 - app/jobs/hyrax/revoke_edit_job.rb
 - app/jobs/iiif_manifest_cache_prewarm_job.rb
@@ -2099,7 +2096,6 @@ files:
 - app/jobs/lease_expiry_job.rb
 - app/jobs/migrate_files_to_valkyrie_job.rb
 - app/jobs/migrate_resources_job.rb
-- app/jobs/migrate_sipity_entity_job.rb
 - app/jobs/resolrize_job.rb
 - app/jobs/stream_notifications_job.rb
 - app/jobs/user_edit_profile_event_job.rb
@@ -2496,6 +2492,7 @@ files:
 - app/services/hyrax/work_resource_query_service.rb
 - app/services/hyrax/work_thumbnail_path_service.rb
 - app/services/hyrax/work_uploads_handler.rb
+- app/services/hyrax/workflow.rb
 - app/services/hyrax/workflow/abstract_notification.rb
 - app/services/hyrax/workflow/action_taken_service.rb
 - app/services/hyrax/workflow/actionable_objects.rb
@@ -3001,11 +2998,13 @@ files:
 - config/features.rb
 - config/i18n-tasks.yml
 - config/initializers/1_healthz.rb
+- config/initializers/ar_test_fixture_monkey_patch.rb
+- config/initializers/arel_rails_7_2_monkey_patch.rb
 - config/initializers/file_length_patch.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/new_framework_defaults_7_2.rb
 - config/initializers/simple_form.rb
 - config/initializers/storage_adapter_initializer.rb
 - config/initializers/valkyrie_id_equality.rb
@@ -3090,7 +3089,6 @@ files:
 - lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb
 - lib/generators/hyrax/templates/config/initializers/file_services.rb
 - lib/generators/hyrax/templates/config/initializers/hyrax.rb
-- lib/generators/hyrax/templates/config/initializers/mini_magick.rb
 - lib/generators/hyrax/templates/config/initializers/publisher.rb
 - lib/generators/hyrax/templates/config/initializers/redis_config.rb
 - lib/generators/hyrax/templates/config/initializers/riiif.rb
@@ -3367,7 +3365,6 @@ files:
 - lib/tasks/universal_viewer.rake
 - lib/tasks/workflow.rake
 - lib/valkyrie/indexing/null_indexing_adapter.rb
-- lib/valkyrie/indexing/redis_queue/indexing_adapter.rb
 - lib/valkyrie/indexing/solr/indexing_adapter.rb
 - lib/valkyrie/indexing_adapter.rb
 - lib/wings.rb

data/.dassie/bin/spring

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file loads Spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
-
-unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
-
-  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
-  if spring
-    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem 'spring', spring.version
-    require 'spring/binstub'
-  end
-end

data/.dassie/config/initializers/mini_magick.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-require 'mini_magick'
-
-MiniMagick.configure do |config|
-  config.shell_api = "posix-spawn"
-end

data/.dassie/config/spring.rb

@@ -1,6 +0,0 @@
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }

data/.koppie/bin/spring

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file loads Spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
-
-unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
-
-  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
-  if spring
-    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem 'spring', spring.version
-    require 'spring/binstub'
-  end
-end

data/.koppie/config/initializers/mini_magick.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-require 'mini_magick'
-
-MiniMagick.configure do |config|
-  config.shell_api = "posix-spawn"
-end

data/.koppie/config/spring.rb

@@ -1,6 +0,0 @@
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }

data/app/jobs/concerns/hyrax/queued_job_behavior.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # Grants the user's edit access on the provided FileSet
-  module QueuedJobBehavior
-    extend ActiveSupport::Concern
-
-    included do
-      queue_as Hyrax.config.ingest_queue_name
-      cattr_accessor :requeue_frequency
-    end
-
-    private
-
-    def redis_queue
-      Valkyrie::IndexingAdapter.find(:redis_queue)
-    end
-
-    def requeue(**args)
-      self.class.set(wait_until: (self.class.requeue_frequency || 5.minutes).from_now).perform_later(**args)
-    end
-  end
-end

data/app/jobs/hyrax/queued_delete_job.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  class QueuedDeleteJob < ApplicationJob
-    include QueuedJobBehavior
-
-    def perform(size: 200)
-      redis_queue.delete_queue(size: size)
-      requeue(size: size)
-    end
-  end
-end

data/app/jobs/hyrax/queued_indexing_job.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  class QueuedIndexingJob < ApplicationJob
-    include QueuedJobBehavior
-
-    def perform(size: 200)
-      redis_queue.index_queue(size: size)
-      requeue(size: size)
-    end
-  end
-end

data/app/jobs/migrate_sipity_entity_job.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# migrates a resource's sipity entity so it can be found
-class MigrateSipityEntityJob < ApplicationJob
-  # input [String] id of a migrated resource
-  def perform(id:)
-    resource = Hyrax.query_service.find_by(id: id)
-    new_gid = Hyrax::GlobalID(resource).to_s
-    return if Sipity::Entity.find_by(proxy_for_global_id: new_gid)
-
-    work = resource.internal_resource.constantize.find(id)
-    original_gid = Hyrax::GlobalID(work).to_s
-    return if new_gid == original_gid
-    original_entity = Sipity::Entity.find_by(proxy_for_global_id: original_gid)
-    return if original_entity.nil?
-    original_entity.update(proxy_for_global_id: new_gid)
-  rescue ActiveFedora::ObjectNotFoundError
-    # this happens when the resource was never in Fedora so there is nothing to migrate.
-    # We don't want to retry the job so we don't raise an error.
-  end
-end

data/config/initializers/reform_rails_6_1_monkey_patch.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
-# rubocop:disable Metrics/CyclomaticComplexity
-# rubocop:disable Lint/UselessAssignment
-module Reform
-  class Contract < Disposable::Twin
-    class Result
-      private
-
-      # this doesn't do nested errors (e.g. )
-      def filter_for(method, *args)
-        @results.collect { |r| r.public_send(method, *args).to_h }
-                .inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
-                .find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
-                  if v.is_a?(Hash)
-                    nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
-                    v = nested_errors.to_a if nested_errors.any?
-                  end
-                  v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
-                end.to_h
-      end
-    end
-  end
-end
-# rubocop:enable Metrics/CyclomaticComplexity
-# rubocop:disable Lint/UselessAssignment

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

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-require 'mini_magick'
-
-MiniMagick.configure do |config|
-  config.shell_api = "posix-spawn"
-end

data/lib/valkyrie/indexing/redis_queue/indexing_adapter.rb

@@ -1,142 +0,0 @@
-# frozen_string_literal: true
-module Valkyrie
-  module Indexing
-    module RedisQueue
-      class IndexingAdapter
-        ##
-        # @!attribute [r] connection
-        #   @return [RSolr::Client]
-        attr_writer :connection
-        attr_accessor :index_queue_name, :delete_queue_name
-
-        ##
-        # @param connection [RSolr::Client] The RSolr connection to index to.
-        def initialize(connection: nil, index_queue_name: 'toindex', delete_queue_name: 'todelete')
-          @connection = connection
-          @index_queue_name = index_queue_name
-          @delete_queue_name = delete_queue_name
-        end
-
-        def connection
-          @connection ||= default_connection
-        end
-
-        def save(resource:)
-          persist([resource])
-        end
-
-        def save_all(resources:)
-          persist(resources)
-        end
-
-        # Deletes a Solr Document using the ID
-        # @return [Array<Valkyrie::Resource>] resources which have been deleted from Solr
-        def delete(resource:)
-          connection.zadd(delete_queue_name, Time.current.to_i, resource.id.to_s)
-        end
-
-        # Delete the Solr index of all Documents
-        def wipe!
-          connection.del(index_queue_name)
-          connection.del(index_queue_name + "-error")
-          connection.del(delete_queue_name)
-          connection.del(delete_queue_name + "-error")
-        end
-
-        def reset!
-          self.connection = default_connection
-        end
-
-        def index_queue(size: 200)
-          set = connection.zpopmin(index_queue_name, size)
-          return [] if set.blank?
-          # we have to load these one at a time because find_all_by_id gets duplicates during wings transition
-          resources = set.map { |id, _time| Hyrax.query_service.find_by(id: id) }
-          solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
-          solr_indexer.save_all(resources: resources)
-          solr_indexer.connection.commit
-        rescue
-          # if anything goes wrong, try to requeue the items
-          set.each { |id, time| connection.zadd(index_queue_name + "-error", time, id) }
-          raise
-        end
-
-       # If a batch fails, try running them one at a time to get down to just records that really fail
-        def index_error_queue(size: 200)
-          size.times do
-            set = connection.zpopmin(index_queue_name + "-error", 1)
-            return [] if set.blank?
-            # we have to load these one at a time because find_all_by_id gets duplicates during wings transition
-            resources = set.map { |id, _time| Hyrax.query_service.find_by(id: id) }
-            solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
-            solr_indexer.save_all(resources: resources)
-            solr_indexer.connection.commit
-          end
-        rescue
-          # if anything goes wrong, try to requeue the items
-          set.each { |id, _time| connection.zadd(index_queue_name + "-error", Time.now.to_i, id) }
-          raise
-        end
-
-        # We reach in to solr directly here to prevent needing to load the objects unnecessarily
-        def delete_queue(size: 200)
-          set = connection.zpopmin(delete_queue_name, size)
-          return [] if set.blank?
-          solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
-          set.each do |id, _time|
-            solr_indexer.connection.delete_by_id id.to_s, { softCommit: true }
-          end
-          solr_indexer.connection.commit
-        rescue
-          # if anything goes wrong, try to requeue the items
-          set.each { |id, time| connection.zadd(delete_queue_name + "-error", time, id) }
-          raise
-        end
-
-        # If a batch fails, try running them one at a time to get down to just records that really fail
-        def delete_error_queue(size: 200)
-          size.times do
-            set = connection.zpopmin(delete_queue_name + "-error", 1)
-            return [] if set.blank?
-            solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
-            set.each do |id, _time|
-              solr_indexer.connection.delete_by_id id.to_s, { softCommit: true }
-            end
-            solr_indexer.connection.commit
-          end
-        rescue
-          # if anything goes wrong, try to requeue the items
-          set.each { |id, _time| connection.zadd(delete_queue_name + "-error", Time.now.to_i, id) }
-          raise
-        end
-
-        def list_index
-          connection.zrange(index_queue_name, 0, -1, with_scores: true)
-        end
-
-        def list_delete
-          connection.zrange(delete_queue_name, 0, -1, with_scores: true)
-        end
-
-        def list_index_errors
-          connection.zrange(index_queue_name + "-error", 0, -1, with_scores: true)
-        end
-
-        def list_delete_errors
-          connection.zrange(delete_queue_name + "-error", 0, -1, with_scores: true)
-        end
-        private
-
-        def persist(resources)
-          resources.map do |r|
-            connection.zadd(index_queue_name, Time.current.to_i, r.id.to_s)
-          end
-        end
-
-        def default_connection
-          Hyrax.config.redis_connection
-        end
-      end
-    end
-  end
-end