hyrax 5.0.4 → 5.1.0.pre.beta1

data/.koppie/config/environments/production.rb

@@ -26,8 +26,10 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = Uglifier.new(:harmony => true)
-  # config.assets.css_compressor = :sass
+  config.assets.configure do |env|
+    env.js_compressor = :uglifier
+    # env.css_compressor = :sass
+  end
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false

data/.koppie/config/environments/test.rb

@@ -43,7 +43,7 @@ Rails.application.configure do
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
 
   config.log_level = :warn
 end

data/.koppie/config/initializers/hyrax.rb

@@ -317,23 +317,26 @@ Qa::Authorities::Local.register_subauthority('subjects', 'Qa::Authorities::Local
 Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority')
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
 
-custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
-                  Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
-                  Hyrax::CustomQueries::Navigators::FindFiles,
-                  Hyrax::CustomQueries::FindAccessControl,
-                  Hyrax::CustomQueries::FindCollectionsByType,
-                  Hyrax::CustomQueries::FindFileMetadata,
-                  Hyrax::CustomQueries::FindIdsByModel,
-                  Hyrax::CustomQueries::FindManyByAlternateIds,
-                  Hyrax::CustomQueries::FindModelsByAccess,
-                  Hyrax::CustomQueries::FindCountBy,
-                  Hyrax::CustomQueries::FindByDateRange]
-custom_queries.each do |handler|
-  Hyrax.query_service.custom_queries.register_query_handler(handler)
+Rails.application.reloader.to_prepare do
+  custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
+                    Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
+                    Hyrax::CustomQueries::Navigators::FindFiles,
+                    Hyrax::CustomQueries::FindAccessControl,
+                    Hyrax::CustomQueries::FindCollectionsByType,
+                    Hyrax::CustomQueries::FindFileMetadata,
+                    Hyrax::CustomQueries::FindIdsByModel,
+                    Hyrax::CustomQueries::FindManyByAlternateIds,
+                    Hyrax::CustomQueries::FindModelsByAccess,
+                    Hyrax::CustomQueries::FindCountBy,
+                    Hyrax::CustomQueries::FindByDateRange]
+  custom_queries.each do |handler|
+    Hyrax.query_service.custom_queries.register_query_handler(handler)
+  end
 end
 
+
 ActiveFedora.init(solr_config_path: Rails.root.join('config', 'solr.yml'))

data/.koppie/config/initializers/riiif.rb

@@ -35,32 +35,35 @@ end
 module Hyrax
   # Adds file locking to Riiif::File
   # @see RiiifFileResolver
-  class RiiifFile < Riiif::File
-    include ActiveSupport::Benchmarkable
-
-    attr_reader :id
-    def initialize(input_path, tempfile = nil, id:)
-      super(input_path, tempfile)
-      raise(ArgumentError, "must specify id") if id.blank?
-      @id = id
-    end
+  Rails.application.reloader.to_prepare do
+    class RiiifFile < Riiif::File
+      include ActiveSupport::Benchmarkable
+
+      attr_reader :id
+      def initialize(input_path, tempfile = nil, id:)
+        super(input_path, tempfile)
+        raise(ArgumentError, "must specify id") if id.blank?
+        @id = id
+      end
 
-    # Wrap extract in a read lock and benchmark it
-    def extract(transformation, image_info = nil)
-      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
-        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
-          super
+      # Wrap extract in a read lock and benchmark it
+      def extract(transformation, image_info = nil)
+        Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+          benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+            super
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def logger
-      Hyrax.logger
+      def logger
+        Hyrax.logger
+      end
     end
   end
 
+
   class RiiifFileResolver
     include ActiveSupport::Benchmarkable
 

data/Dockerfile

@@ -1,5 +1,5 @@
-ARG ALPINE_VERSION=3.19
-ARG RUBY_VERSION=3.2.6
+ARG ALPINE_VERSION=3.21
+ARG RUBY_VERSION=3.3.6
 
 FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION AS hyrax-base
 
@@ -7,6 +7,9 @@ ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
 ARG RUBYGEMS_VERSION=""
 
+RUN addgroup -S --gid 101 app && \
+  adduser -S -G app -u 1001 -s /bin/sh -h /app app
+
 RUN apk --no-cache upgrade && \
   apk --no-cache add acl \
   build-base \
@@ -32,8 +35,6 @@ RUN apk --no-cache upgrade && \
 RUN setfacl -d -m o::rwx /usr/local/bundle && \
   gem update --silent --system $RUBYGEMS_VERSION
 
-RUN addgroup -S --gid 101 app && \
-  adduser -S -G app -u 1001 -s /bin/sh -h /app app
 USER app
 
 RUN mkdir -p /app/samvera/hyrax-webapp
@@ -56,7 +57,7 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
 
 
 FROM hyrax-base AS hyrax-worker-base
@@ -88,7 +89,7 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
 
 
 FROM hyrax-worker-base AS hyrax-engine-dev

data/app/actors/hyrax/actors/add_to_work_actor.rb

@@ -69,7 +69,7 @@ module Hyrax
       end
 
       def add_permissions_error(work)
-        work.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
+        work.errors.add(:in_works_ids, "Works can only be related to each other if user has ability to edit both.")
       end
     end
   end

data/app/actors/hyrax/actors/apply_order_actor.rb

@@ -41,7 +41,7 @@ module Hyrax
             env.curation_concern.ordered_members << work
             env.curation_concern.save!
           else
-            env.curation_concern.errors[:ordered_member_ids] << "Works can only be related to each other if user has ability to edit both."
+            env.curation_concern.errors.add(:ordered_member_ids, "Works can only be related to each other if user has ability to edit both.")
           end
         end
       end

data/app/assets/stylesheets/hyrax/_tinymce.scss

@@ -12,3 +12,9 @@
 .home_marketing_text #content_block_external_key {
   color: black;
 }
+
+// Prevents text from being clipped in Tiny MCE bottom status bar and drop-down style menu (Issue #6789)
+.tox .tox-statusbar { overflow: visible !important; }
+.tox .tox-tbtn--bespoke .tox-tbtn__select-label { overflow: visible !important; }
+.tox .tox-tbtn { overflow: visible !important; }
+.tox-tinymce { overflow: visible !important; }

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

@@ -360,6 +360,7 @@ module Hyrax
       # that they have not removed from the upload widget.
       uploaded_files = params.fetch(:uploaded_files, [])
       selected_files = params.fetch(:selected_files, {}).values
+                             .map { |f| f.permit(:expires, :file_name, :url, {}) }
       browse_everything_urls = uploaded_files &
                                selected_files.map { |f| f[:url] }
 

data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb

@@ -21,14 +21,14 @@ module Hyrax
 
       def after_destroy_error
         if source.admin_set?
-          @permission_template_access.errors[:base] <<
-            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants'))
           redirect_to hyrax.edit_admin_admin_set_path(source_id,
                                                       anchor: 'participants'),
                       alert: @permission_template_access.errors.full_messages.to_sentence
         else
-          @permission_template_access.errors[:base] <<
-            t('hyrax.dashboard.collections.form.permission_update_errors.sharing')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.dashboard.collections.form.permission_update_errors.sharing'))
           redirect_to hyrax.edit_dashboard_collection_path(source_id,
                                                            anchor: 'sharing'),
                       alert: @permission_template_access.errors.full_messages.to_sentence

data/app/controllers/hyrax/api/zotero_controller.rb

@@ -14,7 +14,7 @@ module Hyrax
         session[:request_token] = request_token
         current_user.zotero_token = request_token
         current_user.save
-        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url)
+        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url), allow_other_host: true
       rescue OAuth::Unauthorized
         redirect_to root_url, alert: 'Invalid Zotero client key pair'
       end

data/app/jobs/batch_create_job.rb

@@ -32,8 +32,8 @@ class BatchCreateJob < Hyrax::ApplicationJob
       title = [titles[upload_id]] if titles[upload_id]
       resource_type = Array.wrap(resource_types[upload_id]) if resource_types[upload_id]
       job_attributes = job_attributes.merge(uploaded_files: [upload_id],
-                                    title: title,
-                                    resource_type: resource_type)
+                                            title: title,
+                                            resource_type: resource_type)
       child_operation = Hyrax::Operation.create!(user: user,
                                                  operation_type: "Create Work",
                                                  parent: operation)

data/app/models/admin_set.rb

@@ -105,13 +105,13 @@ class AdminSet < ActiveFedora::Base
 
   def check_if_empty
     return true if members.empty?
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_not_empty')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_not_empty'))
     throw :abort
   end
 
   def check_if_not_default_set
     return true unless Hyrax::AdminSetCreateService.default_admin_set?(id: id)
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_default_set')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_default_set'))
     throw :abort
   end
 end

data/app/models/concerns/hyrax/permissions/writable.rb

@@ -23,8 +23,7 @@ module Hyrax
         valid = true
         paranoid_edit_permissions.each do |validation|
           next unless validation[:condition].call(self)
-          errors[validation[:key]] ||= []
-          errors[validation[:key]] << validation[:message]
+          errors.add(validation[:key], validation[:message])
           valid = false
         end
         valid

data/app/models/concerns/hyrax/valkyrie_lazy_migration.rb

@@ -22,6 +22,7 @@ module Hyrax
         instance_variables.each do |ivar|
           next if ivar == :@name
           next if ivar == :@klass
+          next if ivar == :@uncountable
           instance_variable_set(ivar, legacy_model.model_name.send(ivar[1..-1]))
         end
       end

data/app/models/hyrax/collection_type.rb

@@ -163,26 +163,26 @@ module Hyrax
 
     def ensure_no_collections
       return true unless collections?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.not_empty'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_admin_set_type
       return true unless admin_set? && collection_type_settings_changed? && exists_for_machine_id?(ADMIN_SET_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_user_collection_type
       return true unless user_collection? && collection_type_settings_changed? && exists_for_machine_id?(USER_COLLECTION_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections'))
       throw :abort
     end
 
     def ensure_no_settings_changes_if_collections_exist
       return true unless collections?
       return true unless collection_type_settings_changed?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty'))
       throw :abort
     end
 

data/app/models/single_use_link.rb

@@ -31,7 +31,7 @@ class SingleUseLink < ActiveRecord::Base
   end
 
   def cannot_be_destroyed
-    errors[:base] << "Single Use Link has already been used" if destroyed?
+    errors.add(:base, "Single Use Link has already been used") if destroyed?
   end
 
   def set_defaults

data/app/services/hyrax/listeners.rb

@@ -20,6 +20,7 @@ module Hyrax
     autoload :ACLIndexListener
     autoload :ActiveFedoraACLIndexListener
     autoload :BatchNotificationListener
+    autoload :FileListener
     autoload :FileMetadataListener
     autoload :FileSetLifecycleListener
     autoload :FileSetLifecycleNotificationListener

data/app/services/hyrax/statistics/term_query.rb

@@ -59,7 +59,7 @@ module Hyrax
         end
 
         # Allows us to create a Flot charts pie-graph
-        def as_json(opts)
+        def as_json(opts = nil)
           @data.as_json(opts)
         end
       end

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/hyrax/workflow.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Hyrax
+  module Workflow
+    extend ActiveSupport::Autoload
+
+    autoload :WorkflowFactory
+  end
+end

data/app/validators/hyrax/has_one_title_validator.rb

@@ -4,7 +4,7 @@ module Hyrax
   class HasOneTitleValidator < ActiveModel::Validator
     def validate(record)
       return unless record.title.reject(&:empty?).empty?
-      record.errors[:title] << "You must provide a title"
+      record.errors.add(:title, "You must provide a title")
     end
   end
 end

data/config/initializers/1_healthz.rb

@@ -9,7 +9,8 @@
 # application's `Gemfile`.
 #
 # @see https://github.com/sportngin/okcomputer/
-begin
+
+Rails.application.reloader.to_prepare do
   OkComputer.mount_at = 'healthz'
 
   require 'hyrax/health_checks'

data/config/initializers/ar_test_fixture_monkey_patch.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module ActiveRecord
+  module TestFixtures
+    def fixture_path
+      fixture_paths[0]
+    end
+  end
+end

data/config/initializers/arel_rails_7_2_monkey_patch.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class Arel::Table
+  def table_name
+    name
+  end
+end

data/config/initializers/listeners.rb

@@ -2,8 +2,10 @@
 
 Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraACLIndexListener.new) unless Hyrax.config.disable_wings
 
-Hyrax.publisher.default_listeners.each do |listener|
-  Hyrax.publisher.subscribe(listener)
+Rails.application.reloader.to_prepare do
+  Hyrax.publisher.default_listeners.each do |listener|
+    Hyrax.publisher.subscribe(listener)
+  end
 end
 
 # Publish events from old style Hyrax::Callbacks to trigger the listeners

data/config/initializers/new_framework_defaults_7_2.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Any options set here are to override Rails 7.2 configuration defaults
+
+# These fix a couple of issues arising from Rails 7.2 enforcement of HTML5 semantics
+# by default when using certain Rails methods
+Rails.application.config.action_view.button_to_generates_button_tag = false
+Rails.application.config.action_view.sanitizer_vendor = Rails::HTML4::Sanitizer

data/docker-compose-sirenia.yml

@@ -109,7 +109,7 @@ services:
       - sirenia
 
   fcrepo:
-    image: fcrepo/fcrepo:6.5.1-RC3-tomcat9
+    image: fcrepo/fcrepo:6.5.1-tomcat9
     environment:
       - >-
         CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8

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.4__. If you are looking for instructions on installing a different
+v5.1.0-beta1__. 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.
 
@@ -46,7 +46,7 @@ Prerequisites are required for both creating a Hyrax\-based app and contributing
 Hyrax requires the following software to work:
 
 1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 8.11.1, which includes the log4j library update)
-1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.7.6 (if not using the Valkyrie Postgres adapter)
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.7.6 && < 5 (if using legacy ActiveFedora) or >= 6.5.1 (if using the Valkyrie Fedora adapter)
 1. A SQL RDBMS ([PostgreSQL](https://www.postgresql.org) recommended)
 1. [Redis](http://redis.io/), a key-value store
 1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
@@ -102,7 +102,7 @@ Once ffmpeg has been installed, enable transcoding by setting `config.enable_ffm
 
 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 3.2. When starting a new project, we recommend using the latest Ruby 3.2 version.
+Hyrax supports Ruby 3.3. When starting a new project, we recommend using the latest Ruby 3.3 version.
 
 ## Redis
 
@@ -112,11 +112,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax requires Rails 6. We recommend the latest Rails 6.1 release.
+Hyrax requires Rails 7. We recommend the latest Rails 7.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 6.1.7.7
+gem install rails -v 7.2.2.1
 ```
 
 ### JavaScript runtime
@@ -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.4/template.rb
+HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.1.0-beta1/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,9 +32,9 @@ SUMMARY
   # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
-  spec.add_dependency 'rails', '~> 6.1'
+  spec.add_dependency 'rails', '~> 7.2', '< 8.0'
 
-  spec.add_dependency 'active-fedora', '~> 14.0'
+  spec.add_dependency 'active-fedora', '~> 15.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 7.29'
@@ -56,22 +56,22 @@ SUMMARY
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'google-analytics-data', '~> 0.6'
-  spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'hydra-editor', '~> 6.0'
+  spec.add_dependency 'hydra-derivatives', '~> 4.0'
+  spec.add_dependency 'hydra-editor', '~> 7.0'
   spec.add_dependency 'hydra-file_characterization', '~> 1.1'
-  spec.add_dependency 'hydra-head', '~> 12.0'
+  spec.add_dependency 'hydra-head', '~> 13.0'
   spec.add_dependency 'hydra-works', '>= 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
   spec.add_dependency 'json-schema' # for Arkivo
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
+  spec.add_dependency 'listen', '~> 3.9'
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'nest', '~> 3.1'
   spec.add_dependency 'noid-rails', '~> 3.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'openseadragon', '~> 0.9'
-  spec.add_dependency 'posix-spawn'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
@@ -92,7 +92,7 @@ SUMMARY
 
   spec.add_development_dependency "capybara", '~> 3.29'
   spec.add_development_dependency 'capybara-screenshot', '~> 1.0'
-  spec.add_development_dependency 'database_cleaner', '~> 1.3'
+  spec.add_development_dependency 'database_cleaner', '>= 1.3'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "factory_bot", '~> 4.4'
   spec.add_development_dependency 'mida', '~> 0.3'
@@ -100,7 +100,7 @@ SUMMARY
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 6.0'
+  spec.add_development_dependency 'rspec-rails', '~> 7.0'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver", '~> 4.4'
   spec.add_development_dependency 'i18n-debug'

data/lib/generators/hyrax/config_generator.rb

@@ -59,11 +59,6 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
     copy_file 'config/initializers/hyrax.rb'
   end
 
-  # Add mini-magick configuration
-  def minimagick_config
-    copy_file 'config/initializers/mini_magick.rb'
-  end
-
   def tinymce_config
     copy_file 'config/tinymce.yml'
   end

data/lib/generators/hyrax/install_generator.rb

@@ -188,7 +188,7 @@ module Hyrax
       generate 'hyrax:riiif' unless options[:'skip-riiif']
     end
 
-    def insert_env_queue_adapter
+    def insert_application_config
       insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$/ do
         "\n    config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE') { 'async' }.to_sym\n"
       end

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

@@ -29,35 +29,37 @@ Rails.application.reloader.to_prepare do
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
-  Riiif::Engine.config.cache_duration = 1.month
+  Riiif::Engine.config.cache_duration = 1.day
 end
 
 module Hyrax
   # Adds file locking to Riiif::File
   # @see RiiifFileResolver
-  class RiiifFile < Riiif::File
-    include ActiveSupport::Benchmarkable
-
-    attr_reader :id
-    def initialize(input_path, tempfile = nil, id:)
-      super(input_path, tempfile)
-      raise(ArgumentError, "must specify id") if id.blank?
-      @id = id
-    end
+  Rails.application.reloader.to_prepare do
+    class RiiifFile < Riiif::File
+      include ActiveSupport::Benchmarkable
+
+      attr_reader :id
+      def initialize(input_path, tempfile = nil, id:)
+        super(input_path, tempfile)
+        raise(ArgumentError, "must specify id") if id.blank?
+        @id = id
+      end
 
-    # Wrap extract in a read lock and benchmark it
-    def extract(transformation, image_info = nil)
-      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
-        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
-          super
+      # Wrap extract in a read lock and benchmark it
+      def extract(transformation, image_info = nil)
+        Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+          benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+            super
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def logger
-      Hyrax.logger
+      def logger
+        Hyrax.logger
+      end
     end
   end