hyrax 5.0.5 → 5.1.0.pre.beta1

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

@@ -30,7 +30,12 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @files, outer_window: 2, theme: 'blacklight' %>
+     <%= paginate @files %> 
     </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.5
+appVersion: 5.0.0
 dependencies:
   - name: fcrepo
     version: 2.0.0

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/indexing_adapter_initializer.rb

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

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/config/metadata/core_metadata.yaml

@@ -20,5 +20,4 @@ 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/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.5__. 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.5/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/freyja/persister.rb

@@ -13,7 +13,6 @@ 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!
@@ -24,24 +23,18 @@ module Freyja
                 "Called from #{Gem.location_of_caller.join(':')}"
         end
       end
-      convert_and_migrate_resource(orm_object, was_wings)
+      convert_and_migrate_resource(orm_object)
 
     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, was_wings)
+    def convert_and_migrate_resource(orm_object)
       new_resource = resource_factory.to_resource(object: orm_object)
-      # 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?
+      if Hyrax.config.valkyrie_transition?
         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/')
-        # 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
+        MigrateResourcesJob.perform_later(ids: new_resource.member_ids.map(&:to_s)) if new_resource.is_a?(Hyrax::Work)
       end
       new_resource
     end

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
 

data/lib/hyrax/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'hyrax/callbacks'
 require 'hyrax/role_registry'
 
 module Hyrax
@@ -132,23 +133,8 @@ module Hyrax
     attr_writer :analytics_reporting
     attr_reader :analytics_reporting
     def 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? }
-
+      @analytics_reporting ||=
         ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS_REPORTING', false))
-      end
     end
 
     # Currently supports 'google' or 'matomo'
@@ -156,7 +142,7 @@ module Hyrax
     attr_writer :analytics_provider
     def analytics_provider
       @analytics_provider ||=
-        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'ga4')
+        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'google')
     end
 
     ##
@@ -492,31 +478,31 @@ module Hyrax
     # Path on the local file system where derivatives will be stored
     attr_writer :derivatives_path
     def derivatives_path
-      @derivatives_path ||= Pathname.new(ENV.fetch('HYRAX_DERIVATIVES_PATH', Rails.root.join('tmp', 'derivatives')))
+      @derivatives_path ||= 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 ||= Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH', Rails.root.join('tmp', 'uploads')))
+      @working_path ||= 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 ||= ->() { Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') }) }
+      @upload_path ||= ->() { ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') } }
     end
 
     attr_writer :cache_path
     def cache_path
-      @cache_path ||= ->() { Pathname.new(ENV.fetch('HYRAX_CACHE_PATH') { Rails.root.join('tmp', 'cache') }) }
+      @cache_path ||= ->() { 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 ||= Pathname.new(ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding')))
+      @branding_path ||= ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding'))
     end
 
     # @!endgroup

data/lib/hyrax/controlled_vocabulary/importer/language.rb

@@ -13,7 +13,7 @@ module Hyrax
           stdout_logger.formatter = proc do |_severity, _datetime, _progname, msg|
             "#{msg}\n"
           end
-          Hyrax.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
+          ActiveSupport::BroadcastLogger.new(Hyrax.logger, stdout_logger)
         end
 
         def import

data/lib/hyrax/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
-  class Engine < ::Rails::Engine
+  class Engine < ::Rails::Engine # rubocop:disable Metrics/ClassLength
     isolate_namespace Hyrax
 
     require 'almond-rails'
@@ -60,12 +60,15 @@ module Hyrax
       # raises PG::ConnectionBad. There's no good common ancestor to assume. That's why this test
       # is in its own tiny chunk of code – so we know that whatever the StandardError is, it's coming
       # from the attempt to connect.
-      can_connect = begin
-        ActiveRecord::Base.connection
-        true
-                    rescue StandardError
-                      false
-      end
+      #
+      # (Some time later...) Simply accessing the connection obj is not raising PG::ConnectionBad,
+      # so let's call active? too.
+      can_connect =
+        begin
+          ActiveRecord::Base.connection.active?
+        rescue StandardError
+          false
+        end
 
       can_persist = can_connect && begin
         Hyrax.config.persist_registered_roles!
@@ -88,9 +91,11 @@ module Hyrax
     end
 
     initializer 'requires' do
-      require 'wings' unless Hyrax.config.disable_wings
-      require 'freyja' unless Hyrax.config.disable_freyja
-      require 'frigg' unless Hyrax.config.disable_frigg
+      ActiveSupport::Reloader.to_prepare do
+        require 'wings' unless Hyrax.config.disable_wings
+        require 'freyja' unless Hyrax.config.disable_freyja
+        require 'frigg' unless Hyrax.config.disable_frigg
+      end
     end
 
     initializer 'routing' do

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

@@ -20,11 +20,10 @@ module Hyrax
         ##
         # @param [Hyrax::Work] obj
         # @param [Enumerable<UploadedFile>] uploaded_files
-        # @param [Enumerable<Hash>] file_set_params or nil
+        # @param [Enumerable<Hash>] file_set_params
         #
         # @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.5'
+  VERSION = '5.1.0-beta1'
 end

data/lib/hyrax.rb

@@ -23,7 +23,6 @@ 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'
 
 ##
@@ -47,6 +46,10 @@ module Hyrax
     autoload :ResourceSync
     autoload :Zotero
     autoload :Listeners
+    autoload :Workflow
+    autoload :SimpleSchemaLoader
+    autoload :VirusScanner
+    autoload :DerivativeBucketedStorage
   end
 
   ##

data/template.rb

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
-gem 'hyrax', '5.0.4'
+
+insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$/ do
+  "\n    config.add_autoload_paths_to_load_path = true"
+end
+
+gem 'hyrax', '5.1.0-beta1'
 run 'bundle install'
 generate 'hyrax:install', '-f'