hyrax 5.0.4 → 5.1.0.pre.beta1

data/lib/hyrax/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'hyrax/callbacks'
 require 'hyrax/role_registry'
 
 module Hyrax

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

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.4'
+  VERSION = '5.1.0-beta1'
 end

data/lib/hyrax.rb

@@ -46,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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0.pre.beta1
 platform: ruby
 authors:
 - Justin Coyne
@@ -11,10 +11,9 @@ authors:
 - Jeremy Friesen
 - Trey Pendragon
 - Esmé Cowles
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,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
@@ -342,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
@@ -384,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
@@ -468,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
@@ -552,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
@@ -854,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
@@ -968,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
@@ -1206,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"
@@ -1237,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"
@@ -1277,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"
@@ -1482,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"
@@ -1519,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"
@@ -1546,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"
@@ -2493,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
@@ -2998,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
@@ -3087,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
@@ -3425,7 +3426,6 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -3440,8 +3440,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

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/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