hyrax 5.0.3 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e1143acd065d9ea879f9d47024e4b14603dce26ce528082ba1d358a3aec9629
-  data.tar.gz: 4b75c209e9caace3457521ec1af21fc59d8250bf6a4536e74af63061d07d69bf
+  metadata.gz: 97ecad85144a7592892b75201b53b2d021541fb2a02188783149f51c07f89e31
+  data.tar.gz: '0943ac40e085f7beb166f24cbfc32fd90cdee77bf504f4457864ee145bb4e24a'
 SHA512:
-  metadata.gz: 248c5cdb08d506306f7e7664f17647b7af8c0afea32a583d1fe1698cf2346b57caa3d276f4c684627326ff174340a27ea5a74cf8c79d83b79d23285feef8c06e
-  data.tar.gz: dbe9e52dea97e0162fa943120f6f3507cb25ad0fd945a7baf693ded264ee5b7308d20894f8220af43471f0cb08fb1c3b7512a5e116261bba22c425369baece15
+  metadata.gz: 4380562339d0c5506e0fe73ec1a5970bf440e2f28398424d722b21a1d42632979a314adea6be892056d476d5fe94fb5da79e731decbcb01a03c794e425d54da2
+  data.tar.gz: ed3bfd922ff65c64b9d0c8411f5806f9ed80a9f2dcc03e1afcbc140e96e7e5bdf13fe4066ed6e3e76839a4edb61438c5c0e60b97707e592712f4617478ae7c33

data/Gemfile

@@ -21,4 +21,5 @@ group :development, :test do
   gem 'ruby-prof', require: false
   gem 'semaphore_test_boosters'
   gem "simplecov", require: false
+  gem 'timecop'
 end

data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb

@@ -102,6 +102,7 @@ module Hyrax
     def find_file_metadata(file_set:, use: :original_file, mime_type: nil)
       if mime_type.nil?
         use = :thumbnail_file if use == :thumbnail
+        use = :original_file unless Hyrax::FileMetadata::Use.keys.include?(use)
         use = Hyrax::FileMetadata::Use.uri_for(use: use)
         results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
       else

data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb

@@ -14,9 +14,9 @@ module Hyrax
           @works_count = @accessible_works.count
           @top_works = paginate(top_works_list, rows: 10)
           @top_file_set_downloads = paginate(top_files_list, rows: 10)
-
-          @pageviews = Hyrax::Analytics.daily_events('work-view'), @downloads = Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
-
+          # rubocop:disable Style/ParallelAssignment
+          @pageviews, @downloads = Hyrax::Analytics.daily_events('work-view'), Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
+          # rubocop:enable Style/ParallelAssignment
           respond_to do |format|
             format.html
             format.csv { export_data }
@@ -34,7 +34,7 @@ module Hyrax
           end
         end
 
-  private
+        private
 
         def accessible_works
           models = Hyrax::ModelRegistry.work_rdf_representations.map { |m| "\"#{m}\"" }

data/app/jobs/batch_create_job.rb

@@ -25,18 +25,19 @@ class BatchCreateJob < Hyrax::ApplicationJob
   private
 
   def create(user, titles, resource_types, uploaded_files, attributes, operation)
-    model = attributes.delete(:model) || attributes.delete('model')
+    job_attributes = attributes
+    model = job_attributes.delete(:model) || job_attributes.delete('model')
     raise ArgumentError, 'attributes must include "model" => ClassName.to_s' unless model
     uploaded_files.each do |upload_id|
       title = [titles[upload_id]] if titles[upload_id]
       resource_type = Array.wrap(resource_types[upload_id]) if resource_types[upload_id]
-      attributes = attributes.merge(uploaded_files: [upload_id],
-                                    title: title,
-                                    resource_type: resource_type)
+      job_attributes = job_attributes.merge(uploaded_files: [upload_id],
+                                            title: title,
+                                            resource_type: resource_type)
       child_operation = Hyrax::Operation.create!(user: user,
                                                  operation_type: "Create Work",
                                                  parent: operation)
-      CreateWorkJob.perform_later(user, model, attributes, child_operation)
+      CreateWorkJob.perform_later(user, model, job_attributes, child_operation)
     end
   end
 end

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

@@ -0,0 +1,22 @@
+# 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/create_work_job.rb

@@ -39,11 +39,12 @@ class CreateWorkJob < Hyrax::ApplicationJob
   end
 
   def batch_create_valkyrie_work(work, attributes, user)
-    uploaded_file_ids = attributes.delete(:uploaded_files)
+    form_attributes = attributes
+    uploaded_file_ids = form_attributes.delete(:uploaded_files)
     files = Hyrax::UploadedFile.find(uploaded_file_ids)
-    permissions_params = attributes.delete(:permissions_attributes)
+    permissions_params = form_attributes.delete(:permissions_attributes)
     form = Hyrax::FormFactory.new.build(work, nil, nil)
-    form.validate(attributes)
+    form.validate(form_attributes)
 
     transactions['change_set.create_work']
       .with_step_args(

data/app/jobs/hyrax/queued_delete_job.rb

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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_files_to_valkyrie_job.rb

@@ -2,6 +2,11 @@
 # Responsible for conditionally enqueuing the file and thumbnail migration
 # logic of an ActiveFedora object.
 class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
+  # Define a logger for this job
+  def logger
+    FileUtils.mkdir_p(Hyrax.config.working_path)
+    @logger ||= Logger.new(Hyrax.config.working_path.join('migrate_files_to_valkyrie_job.log'))
+  end
   ##
   #
   # @param resource [Hyrax::FileSet]
@@ -33,6 +38,7 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
     # @todo should we trigger a job if the member is a child work?
     paths = Hyrax::DerivativePath.derivatives_for_reference(resource)
     paths.each do |path|
+      next unless File.size?(path) # skip blank files
       container = container_for(path)
       mime_type = Marcel::MimeType.for(extension: File.extname(path))
       directives = { url: path, container: container, mime_type: mime_type }
@@ -50,27 +56,33 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
 
     files = Hyrax.custom_queries.find_many_file_metadata_by_ids(ids: resource.file_ids)
     files.each do |file|
-      # If it doesn't start with fedora, we've likely already migrated it.
-      next unless /^fedora:/.match?(file.file_identifier.to_s)
-      resource.file_ids.delete(file.id)
+      begin
+        # If it doesn't start with fedora, we've likely already migrated it.
+        next unless /^fedora:/.match?(file.file_identifier.to_s)
+        resource.file_ids.delete(file.id)
 
-      Tempfile.create do |tempfile|
-        tempfile.binmode
-        tempfile.write(URI.open(file.file_identifier.to_s.gsub("fedora:", "http:")).read)
-        tempfile.rewind
+        Tempfile.create do |tempfile|
+          tempfile.binmode
+          tempfile.write(URI.open(file.file_identifier.to_s.gsub("fedora:", "http:")).read)
+          tempfile.rewind
 
-        # valkyrie_file = Hyrax.storage_adapter.upload(resource: resource, file: tempfile, original_filename: file.original_filename)
-        valkyrie_file = Hyrax::ValkyrieUpload.file(
-          filename: resource.label,
-          file_set: resource,
-          io: tempfile,
-          use: file.pcdm_use.select {|use| Hyrax::FileMetadata::Use.use_list.include?(use)},
-          user: User.find_or_initialize_by(User.user_key_field => resource.depositor),
-          mime_type: file.mime_type,
-          skip_derivatives: true
-        )
-        valkyrie_file = copy_attributes(valkyrie_file:, original_file: file)
-        Hyrax.persister.save(resource: valkyrie_file)
+          # valkyrie_file = Hyrax.storage_adapter.upload(resource: resource, file: tempfile, original_filename: file.original_filename)
+          valkyrie_file = Hyrax::ValkyrieUpload.file(
+            filename: resource.label,
+            file_set: resource,
+            io: tempfile,
+            use: file.pcdm_use.select {|use| Hyrax::FileMetadata::Use.use_list.include?(use)},
+            user: User.find_or_initialize_by(User.user_key_field => resource.depositor),
+            mime_type: file.mime_type,
+            skip_derivatives: true
+          )
+          valkyrie_file = copy_attributes(valkyrie_file:, original_file: file)
+          Hyrax.persister.save(resource: valkyrie_file)
+        end
+      rescue StandardError => e
+        # Log errors specific to file migration
+        logger.error("Error migrating file #{file.id} for resource #{resource.id}: #{e.message}")
+        logger.error(e.backtrace.join("\n"))
       end
     end
     # reindex the file set after migrating files to include characterization info
@@ -93,9 +105,9 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
   #
   # @param filename [String] the name of the derivative file: i.e. 'x-thumbnail.jpg'
   # @return [String]
-  def container_for(filename)
+  def container_for(path)
     # we want the portion between the '-' and the '.'
-    file_blob = File.basename(filename, '.*').split('-').last
+    file_blob = File.basename(path, '.*').split('-').last
 
     case file_blob
     when 'thumbnail'

data/app/jobs/migrate_sipity_entity_job.rb

@@ -0,0 +1,21 @@
+# 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/app/models/concerns/hyrax/solr_document_behavior.rb

@@ -82,9 +82,12 @@ module Hyrax
 
     # Method to return the model
     def hydra_model(classifier: nil)
+      # finds the model from the solr document
       model = first('has_model_ssim')&.safe_constantize
-      model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
-      model || model_classifier(classifier).classifier(self).best_model
+      # this returns nil if it isn't a valid model
+      resource_model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
+      # if valkyrie_transition is enabled, we generally want to use the resource model if it exists
+      resource_model || model || model_classifier(classifier).classifier(self).best_model
     end
 
     def depositor(default = '')

data/app/models/hyrax/file_metadata.rb

@@ -44,16 +44,31 @@ module Hyrax
 
       # @return [Array<RDF::URI>] list of all uses
       def use_list
-        [ORIGINAL_FILE,
-         THUMBNAIL_IMAGE,
-         EXTRACTED_TEXT,
-         INTERMEDIATE_FILE,
-         PRESERVATION_FILE,
-         SERVICE_FILE,
-         TRANSCRIPT]
+        [
+          EXTRACTED_TEXT,
+          INTERMEDIATE_FILE,
+          ORIGINAL_FILE,
+          PRESERVATION_FILE,
+          SERVICE_FILE,
+          THUMBNAIL_IMAGE,
+          TRANSCRIPT
+        ]
       end
       module_function :use_list
 
+      def keys
+        [
+          :extracted_file,
+          :intermediate_file,
+          :original_file,
+          :preservation_file,
+          :service_file,
+          :thumbnail_file,
+          :transcript_file
+        ]
+      end
+      module_function :keys
+
       ##
       # @param use [RDF::URI, Symbol]
       #

data/app/services/hyrax/analytics/ga4/base.rb

@@ -88,7 +88,7 @@ module Hyrax
         end
 
         def unwrap_metric(metric)
-          metric.metric_values.first.value.to_i
+          metric&.metric_values&.first&.value.to_i
         end
       end
     end

data/app/services/hyrax/analytics/ga4.rb

@@ -76,7 +76,11 @@ module Hyrax
           end
 
           def account_info
-            @account_info ||= JSON.parse(account_json_string)
+            @account_info ||= if account_json_string.is_a? Hash
+                                account_json_string
+                              else
+                                JSON.parse(account_json_string)
+                              end
           end
 
           KEYS.each do |key|

data/app/services/hyrax/user_stat_importer.rb

@@ -49,7 +49,7 @@ module Hyrax
 
     def process_files(stats, user, start_date)
       file_ids_for_user(user).each do |file_id|
-        file = ::FileSet.find(file_id)
+        file = Hyrax.query_service.find_by(id: file_id)
         view_stats = extract_stats_for(object: file, from: FileViewStat, start_date: start_date, user: user)
         stats = tally_results(view_stats, :views, stats) if view_stats.present?
         delay

data/app/services/migrate_resource_service.rb

@@ -8,7 +8,7 @@ class MigrateResourceService
   end
 
   def model
-    @model || Wings::ModelRegistry.lookup(resource.class).to_s
+    @model ||= Wings::ModelRegistry.lookup(resource.class).to_s
   end
 
   def call

data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb

@@ -1,5 +1,5 @@
 <div class="card">
-  
+
   <div class="card-header">
     <h4><%= t('.top_collections') %>
     <div class="btn-group float-right">
@@ -41,15 +41,11 @@
       </tbody>
     </table>
   </div>
-  
+
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_collections %>
+      <%= paginate @top_collections, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 
 </div>
-
-
-
-

data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb

@@ -14,8 +14,8 @@
       <tbody>
           <% @top_file_set_downloads.each do |download| %>
             <tr>
-              <td><%= download[1] %></td> 
-              <td><%= download[0] %></td>  
+              <td><%= download[1] %></td>
+              <td><%= download[0] %></td>
               <td><%= download[2] %></td>
             </tr>
           <% end %>
@@ -24,10 +24,7 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-     <%= paginate @top_file_set_downloads %> 
+      <%= paginate @top_file_set_downloads, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 </div>
- 
-
-

data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb

@@ -24,16 +24,15 @@
               <td><%= work[0] %></td>
               <td><%= work[2] %></td>
               <td><%= work[3] %></td>
-            </tr>       
+            </tr>
         <% end %>
       </tbody>
     </table>
   </div>
-  
 
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_works %>
+      <%= paginate @top_works, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 

data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb

@@ -30,12 +30,7 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-     <%= paginate @files %> 
+      <%= paginate @files, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 </div>
-
-
-
-
-

data/chart/hyrax/Chart.yaml

@@ -3,7 +3,7 @@ name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
 version: 3.7.0
-appVersion: 5.0.0
+appVersion: 5.0.5
 dependencies:
   - name: fcrepo
     version: 2.0.0

data/config/initializers/indexing_adapter_initializer.rb

@@ -7,3 +7,7 @@ Valkyrie::IndexingAdapter.register(
 Valkyrie::IndexingAdapter.register(
   Valkyrie::Indexing::NullIndexingAdapter.new, :null_index
 )
+Valkyrie::IndexingAdapter.register(
+  Valkyrie::Indexing::RedisQueue::IndexingAdapter.new,
+  :redis_queue
+)

data/config/metadata/core_metadata.yaml

@@ -20,4 +20,5 @@ attributes:
     type: string
     predicate: http://id.loc.gov/vocabulary/relators/dpt
     index_keys:
+      - "depositor_ssim"
       - "depositor_tesim"

data/docker-compose-dassie.yml

@@ -68,14 +68,14 @@ services:
   chrome:
     image: selenium/standalone-chromium:4
     environment:
-#      - START_XVFB=false
+      #      - START_XVFB=false
       - SE_NODE_SESSION_TIMEOUT=800
       - SE_ENABLE_TRACING=false
       - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
       - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
       - SE_BROWSER_ARGS_HEADLESS=--headless=new
-#    logging:
-#      driver: none
+    #    logging:
+    #      driver: none
     volumes:
       - /dev/shm:/dev/shm
     shm_size: 2g
@@ -118,7 +118,7 @@ services:
   memcached:
     image: bitnami/memcached
     ports:
-      - '11211:11211'
+      - "11211:11211"
     networks:
       - hyrax
 

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.3__. If you are looking for instructions on installing a different
+v5.0.5__. 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.
 
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.3/template.rb
+HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.5/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/lib/freyja/persister.rb

@@ -13,6 +13,7 @@ module Freyja
     #   was modified in the database between been read into memory and persisted
     # rubocop:disable Lint/UnusedMethodArgument
     def save(resource:, external_resource: false, perform_af_validation: false)
+      was_wings = resource.respond_to?(:wings?) && resource.wings?
       orm_object = resource_factory.from_resource(resource: resource)
       orm_object.transaction do
         orm_object.save!
@@ -23,18 +24,24 @@ module Freyja
                 "Called from #{Gem.location_of_caller.join(':')}"
         end
       end
-      convert_and_migrate_resource(orm_object)
+      convert_and_migrate_resource(orm_object, was_wings)
 
     rescue ActiveRecord::StaleObjectError
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."
     end
     # rubocop:enable Lint/UnusedMethodArgument
 
-    def convert_and_migrate_resource(orm_object)
+    def convert_and_migrate_resource(orm_object, was_wings)
       new_resource = resource_factory.to_resource(object: orm_object)
-      if Hyrax.config.valkyrie_transition?
+      # if the resource was wings and is now a Valkyrie resource, we need to migrate sipity, files, and members
+      if Hyrax.config.valkyrie_transition? && was_wings && !new_resource.wings?
         MigrateFilesToValkyrieJob.perform_later(new_resource) if new_resource.is_a?(Hyrax::FileSet) && new_resource.file_ids.size == 1 && new_resource.file_ids.first.id.to_s.match('/files/')
-        MigrateResourcesJob.perform_later(ids: new_resource.member_ids.map(&:to_s)) if new_resource.is_a?(Hyrax::Work)
+        # migrate any members if the resource is a Hyrax work
+        if new_resource.is_a?(Hyrax::Work)
+          member_ids = new_resource.member_ids.map(&:to_s)
+          MigrateResourcesJob.perform_later(ids: member_ids) unless member_ids.empty?
+          MigrateSipityEntityJob.perform_now(id: new_resource.id.to_s)
+        end
       end
       new_resource
     end

data/lib/hyrax/configuration.rb

@@ -132,8 +132,23 @@ module Hyrax
     attr_writer :analytics_reporting
     attr_reader :analytics_reporting
     def analytics_reporting?
-      @analytics_reporting ||=
+      @analytics_reporting ||= begin
+        required_env_vars = %w[
+          HYRAX_ANALYTICS_REPORTING
+          GOOGLE_ANALYTICS_ID
+          GOOGLE_ANALYTICS_PROPERTY_ID
+        ]
+
+        required_env_vars << if ENV['GOOGLE_ACCOUNT_JSON'].blank?
+                               'GOOGLE_ACCOUNT_JSON_PATH'
+                             else
+                               'GOOGLE_ACCOUNT_JSON'
+                             end
+
+        return false if required_env_vars.any? { |var| ENV.fetch(var, '').blank? }
+
         ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS_REPORTING', false))
+      end
     end
 
     # Currently supports 'google' or 'matomo'
@@ -141,7 +156,7 @@ module Hyrax
     attr_writer :analytics_provider
     def analytics_provider
       @analytics_provider ||=
-        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'google')
+        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'ga4')
     end
 
     ##
@@ -477,31 +492,31 @@ module Hyrax
     # Path on the local file system where derivatives will be stored
     attr_writer :derivatives_path
     def derivatives_path
-      @derivatives_path ||= ENV.fetch('HYRAX_DERIVATIVES_PATH', Rails.root.join('tmp', 'derivatives'))
+      @derivatives_path ||= Pathname.new(ENV.fetch('HYRAX_DERIVATIVES_PATH', Rails.root.join('tmp', 'derivatives')))
     end
 
     # Path on the local file system where originals will be staged before being ingested into Fedora.
     attr_writer :working_path
     def working_path
-      @working_path ||= ENV.fetch('HYRAX_UPLOAD_PATH', Rails.root.join('tmp', 'uploads'))
+      @working_path ||= Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH', Rails.root.join('tmp', 'uploads')))
     end
 
     # @todo do we use both upload_path and working path?
     # Path on the local file system where originals will be staged before being ingested into Fedora.
     attr_writer :upload_path
     def upload_path
-      @upload_path ||= ->() { ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') } }
+      @upload_path ||= ->() { Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') }) }
     end
 
     attr_writer :cache_path
     def cache_path
-      @cache_path ||= ->() { ENV.fetch('HYRAX_CACHE_PATH') { Rails.root.join('tmp', 'cache') } }
+      @cache_path ||= ->() { Pathname.new(ENV.fetch('HYRAX_CACHE_PATH') { Rails.root.join('tmp', 'cache') }) }
     end
 
     # Path on the local file system where where log and banners will be stored.
     attr_writer :branding_path
     def branding_path
-      @branding_path ||= ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding'))
+      @branding_path ||= Pathname.new(ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding')))
     end
 
     # @!endgroup

data/lib/hyrax/transactions/steps/add_file_sets.rb

@@ -20,10 +20,11 @@ module Hyrax
         ##
         # @param [Hyrax::Work] obj
         # @param [Enumerable<UploadedFile>] uploaded_files
-        # @param [Enumerable<Hash>] file_set_params
+        # @param [Enumerable<Hash>] file_set_params or nil
         #
         # @return [Dry::Monads::Result]
         def call(obj, uploaded_files: [], file_set_params: [])
+          return Success(obj) if uploaded_files.empty? && file_set_params.blank? # Skip if no files to attach
           if @handler.new(work: obj).add(files: uploaded_files, file_set_params: file_set_params).attach
             file_sets = obj.member_ids.map do |member|
               Hyrax.query_service.find_by(id: member) if Hyrax.query_service.find_by(id: member).is_a? Hyrax::FileSet

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.3'
+  VERSION = '5.0.5'
 end

data/lib/hyrax.rb

@@ -23,6 +23,7 @@ require 'hyrax/valkyrie_can_can_adapter'
 require 'retriable'
 require 'valkyrie/indexing_adapter'
 require 'valkyrie/indexing/solr/indexing_adapter'
+require 'valkyrie/indexing/redis_queue/indexing_adapter'
 require 'valkyrie/indexing/null_indexing_adapter'
 
 ##

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

@@ -0,0 +1,142 @@
+# 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

data/template.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-gem 'hyrax', '5.0.3'
+gem 'hyrax', '5.0.4'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.5
 platform: ruby
 authors:
 - Justin Coyne
@@ -11,10 +11,9 @@ authors:
 - Jeremy Friesen
 - Trey Pendragon
 - Esmé Cowles
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2068,6 +2067,7 @@ 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,6 +2086,8 @@ 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
@@ -2097,6 +2099,7 @@ 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
@@ -3364,6 +3367,7 @@ 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
@@ -3425,7 +3429,6 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -3440,8 +3443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
   interface for common repository features. Hyrax offers the ability to create repository