hyrax 3.3.0 → 3.4.2

data/lib/wings/setup.rb

@@ -93,8 +93,10 @@ Valkyrie.config.storage_adapter = :active_fedora
 custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
                   Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
                   Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildFilesetsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildFilesetsNavigator, # deprecated; use ChildFileSetsNavigator
                   Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
                   Hyrax::CustomQueries::Navigators::FindFiles,
                   Wings::CustomQueries::FindAccessControl, # override Hyrax::CustomQueries::FindAccessControl
                   Wings::CustomQueries::FindCollectionsByType,

data/lib/wings/valkyrie/persister.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'active_fedora/cleaner'
+
 module Wings
   module Valkyrie
     ##

data/lib/wings/valkyrie/query_service.rb

@@ -86,12 +86,10 @@ module Wings
         return enum_for(:find_many_by_ids, ids: ids) unless block_given?
 
         ids.map(&:to_s).uniq.each do |id|
-          begin
-            af_object = ActiveFedora::Base.find(id)
-            yield resource_factory.to_resource(object: af_object)
-          rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
-            next
-          end
+          af_object = ActiveFedora::Base.find(id)
+          yield resource_factory.to_resource(object: af_object)
+        rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
+          next
         end
       end
 
@@ -168,9 +166,10 @@ module Wings
         id ||= resource.id
         raise ArgumentError, "Resource has no id; is it persisted?" unless id
 
+        property = Hyrax.config.admin_set_predicate.qname.last if property.to_sym == :admin_set_id
         active_fedora_model = model ? model_class_for(model) : ActiveFedora::Base
-
         uri = active_fedora_model.id_to_uri(id.to_s)
+
         active_fedora_model.where("+(#{property}_ssim: \"#{uri}\" OR #{property}_ssim: \"#{id}\")").map do |obj|
           resource_factory.to_resource(object: obj)
         end

data/lib/wings/valkyrie/storage.rb

@@ -28,6 +28,12 @@ module Wings
         super
       end
 
+      ##
+      # @api private
+      def self.cast_to_valkyrie_id(id)
+        ::Valkyrie::ID.new(id.to_s.sub(/^.+\/\//, PROTOCOL))
+      end
+
       ##
       # @param key [Symbol] the key for plugin behavior to check support for
       #
@@ -140,7 +146,7 @@ module Wings
       end
 
       def cast_to_valkyrie_id(id)
-        ::Valkyrie::ID.new(id.to_s.sub(/^.+\/\//, PROTOCOL))
+        self.class.cast_to_valkyrie_id(id)
       end
     end
   end

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.3.0'
+gem 'hyrax', '3.4.2'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -424,6 +424,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: json-ld
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -584,6 +598,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: qa
   requirement: !ruby/object:Gem::Requirement
@@ -768,16 +796,16 @@ dependencies:
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
@@ -1102,20 +1130,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: shoulda-callback-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -1234,11 +1262,13 @@ files:
 - ".dassie/app/controllers/hyrax/generic_works_controller.rb"
 - ".dassie/app/controllers/hyrax/monographs_controller.rb"
 - ".dassie/app/controllers/hyrax/namespaced_works/nested_works_controller.rb"
+- ".dassie/app/forms/collection_resource_form.rb"
 - ".dassie/app/forms/hyrax/generic_work_form.rb"
 - ".dassie/app/forms/hyrax/namespaced_works/nested_work_form.rb"
 - ".dassie/app/forms/monograph_form.rb"
 - ".dassie/app/helpers/application_helper.rb"
 - ".dassie/app/helpers/hyrax_helper.rb"
+- ".dassie/app/indexers/collection_resource_indexer.rb"
 - ".dassie/app/indexers/generic_work_indexer.rb"
 - ".dassie/app/indexers/monograph_indexer.rb"
 - ".dassie/app/indexers/namespaced_works/nested_work_indexer.rb"
@@ -1247,6 +1277,7 @@ files:
 - ".dassie/app/models/ability.rb"
 - ".dassie/app/models/application_record.rb"
 - ".dassie/app/models/collection.rb"
+- ".dassie/app/models/collection_resource.rb"
 - ".dassie/app/models/concerns/.keep"
 - ".dassie/app/models/file_set.rb"
 - ".dassie/app/models/generic_work.rb"
@@ -1296,6 +1327,7 @@ files:
 - ".dassie/config/initializers/clamav.rb"
 - ".dassie/config/initializers/cookies_serializer.rb"
 - ".dassie/config/initializers/devise.rb"
+- ".dassie/config/initializers/file_services.rb"
 - ".dassie/config/initializers/filter_parameter_logging.rb"
 - ".dassie/config/initializers/hydra_config.rb"
 - ".dassie/config/initializers/hyrax.rb"
@@ -1330,6 +1362,7 @@ files:
 - ".dassie/config/locales/namespaced_works/nested_work.it.yml"
 - ".dassie/config/locales/namespaced_works/nested_work.pt-BR.yml"
 - ".dassie/config/locales/namespaced_works/nested_work.zh.yml"
+- ".dassie/config/metadata/collection_resource.yaml"
 - ".dassie/config/metadata/monograph.yaml"
 - ".dassie/config/metadata/sample_metadata.yaml"
 - ".dassie/config/puma.rb"
@@ -1445,6 +1478,9 @@ files:
 - ".dassie/solr/conf/xslt/example_rss.xsl"
 - ".dassie/solr/conf/xslt/luke.xsl"
 - ".dassie/solr/sample_solr_documents.yml"
+- ".dassie/spec/forms/collection_resource_form_spec.rb"
+- ".dassie/spec/indexers/collection_resource_indexer_spec.rb"
+- ".dassie/spec/models/collection_resource_spec.rb"
 - ".dassie/storage/.keep"
 - ".dassie/tmp/pids/.keep"
 - ".dassie/values.stage.yaml"
@@ -1461,6 +1497,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/SUPPORT.md"
+- ".github/release.yml"
 - ".github/stale.yml"
 - ".github/workflows/main.yml"
 - ".github/workflows/release.yml"
@@ -1819,6 +1856,7 @@ files:
 - app/indexers/hyrax/permission_indexer.rb
 - app/indexers/hyrax/repository_reindexer.rb
 - app/indexers/hyrax/resource_indexer.rb
+- app/indexers/hyrax/thumbnail_indexer.rb
 - app/indexers/hyrax/valkyrie_collection_indexer.rb
 - app/indexers/hyrax/valkyrie_file_set_indexer.rb
 - app/indexers/hyrax/valkyrie_indexer.rb
@@ -1831,6 +1869,7 @@ files:
 - app/jobs/attach_files_to_work_job.rb
 - app/jobs/attach_files_to_work_with_ordered_members_job.rb
 - app/jobs/batch_create_job.rb
+- app/jobs/change_depositor_event_job.rb
 - app/jobs/characterize_job.rb
 - app/jobs/concerns/hyrax/members_permission_job_behavior.rb
 - app/jobs/concerns/hyrax/permission_job_behavior.rb
@@ -1852,6 +1891,7 @@ files:
 - app/jobs/hyrax/grant_edit_to_members_job.rb
 - 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/revoke_edit_from_members_job.rb
 - app/jobs/hyrax/revoke_edit_job.rb
 - app/jobs/iiif_manifest_cache_prewarm_job.rb
@@ -1864,6 +1904,7 @@ files:
 - app/jobs/resolrize_job.rb
 - app/jobs/stream_notifications_job.rb
 - app/jobs/user_edit_profile_event_job.rb
+- app/jobs/valkyrie_create_derivatives_job.rb
 - app/jobs/valkyrie_ingest_job.rb
 - app/jobs/visibility_copy_job.rb
 - app/mailers/hyrax/contact_mailer.rb
@@ -2100,6 +2141,7 @@ files:
 - app/services/hyrax/caching_iiif_manifest_builder.rb
 - app/services/hyrax/callbacks.rb
 - app/services/hyrax/change_content_depositor_service.rb
+- app/services/hyrax/change_depositor_service.rb
 - app/services/hyrax/characterization/file_set_description.rb
 - app/services/hyrax/characterization/model_wrapper.rb
 - app/services/hyrax/characterization/valkyrie_characterization_service.rb
@@ -2127,11 +2169,13 @@ files:
 - app/services/hyrax/custom_queries/find_ids_by_model.rb
 - app/services/hyrax/custom_queries/find_many_by_alternate_ids.rb
 - app/services/hyrax/custom_queries/navigators/child_collections_navigator.rb
+- app/services/hyrax/custom_queries/navigators/child_file_sets_navigator.rb
 - app/services/hyrax/custom_queries/navigators/child_filesets_navigator.rb
 - app/services/hyrax/custom_queries/navigators/child_works_navigator.rb
 - app/services/hyrax/custom_queries/navigators/collection_members.rb
 - app/services/hyrax/custom_queries/navigators/find_files.rb
 - app/services/hyrax/custom_queries/navigators/parent_collections_navigator.rb
+- app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb
 - app/services/hyrax/database_migrator.rb
 - app/services/hyrax/default_middleware_stack.rb
 - app/services/hyrax/derivative_path.rb
@@ -2177,6 +2221,7 @@ files:
 - app/services/hyrax/listeners/trophy_cleanup_listener.rb
 - app/services/hyrax/listeners/workflow_listener.rb
 - app/services/hyrax/local_file_service.rb
+- app/services/hyrax/location_service.rb
 - app/services/hyrax/lock_manager.rb
 - app/services/hyrax/lockable.rb
 - app/services/hyrax/manifest_builder_service.rb
@@ -2218,6 +2263,8 @@ files:
 - app/services/hyrax/time_service.rb
 - app/services/hyrax/tolerant_select_service.rb
 - app/services/hyrax/user_stat_importer.rb
+- app/services/hyrax/valkyrie_persist_derivatives.rb
+- app/services/hyrax/valkyrie_upload.rb
 - app/services/hyrax/versioning_service.rb
 - app/services/hyrax/virus_checker_service.rb
 - app/services/hyrax/visibility_intention.rb
@@ -2263,6 +2310,22 @@ files:
 - app/strategies/hyrax/strategies/yaml_strategy.rb
 - app/uploaders/hyrax/avatar_uploader.rb
 - app/uploaders/hyrax/uploaded_file_uploader.rb
+- app/utils/hyrax/data_destroyers/collection_branding_destroyer.rb
+- app/utils/hyrax/data_destroyers/collection_types_destroyer.rb
+- app/utils/hyrax/data_destroyers/default_admin_set_id_cache_destroyer.rb
+- app/utils/hyrax/data_destroyers/featured_works_destroyer.rb
+- app/utils/hyrax/data_destroyers/permission_templates_destroyer.rb
+- app/utils/hyrax/data_destroyers/repository_metadata_destroyer.rb
+- app/utils/hyrax/data_destroyers/stats_destroyer.rb
+- app/utils/hyrax/data_maintenance.rb
+- app/utils/hyrax/required_data_seeder.rb
+- app/utils/hyrax/required_data_seeders/collection_seeder.rb
+- app/utils/hyrax/required_data_seeders/collection_type_seeder.rb
+- app/utils/hyrax/test_data_seeder.rb
+- app/utils/hyrax/test_data_seeders/collection_seeder.rb
+- app/utils/hyrax/test_data_seeders/collection_type_seeder.rb
+- app/utils/hyrax/test_data_seeders/user_seeder.rb
+- app/validators/hyrax/collection_membership_validator.rb
 - app/validators/hyrax/has_one_title_validator.rb
 - app/values/hyrax/chart_data.rb
 - app/views/_controls.html.erb
@@ -2722,7 +2785,7 @@ files:
 - config/initializers/listeners.rb
 - config/initializers/nesting_indexer_initializer.rb
 - config/initializers/simple_form.rb
-- config/initializers/valkryrie_storage.rb
+- config/initializers/storage_adapter_initializer.rb
 - config/initializers/valkyrie_id_equality.rb
 - config/locales/hyrax.de.yml
 - config/locales/hyrax.en.yml
@@ -2752,6 +2815,15 @@ files:
 - lib/generators/hyrax/assets_generator.rb
 - lib/generators/hyrax/clamav_generator.rb
 - lib/generators/hyrax/collection_generator.rb
+- lib/generators/hyrax/collection_resource/USAGE
+- lib/generators/hyrax/collection_resource/collection_resource_generator.rb
+- lib/generators/hyrax/collection_resource/templates/collection.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_form.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_form_spec.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_indexer_spec.rb.erb
+- lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml
+- lib/generators/hyrax/collection_resource/templates/collection_spec.rb.erb
 - lib/generators/hyrax/config_generator.rb
 - lib/generators/hyrax/health_check_generator.rb
 - lib/generators/hyrax/install_generator.rb
@@ -2887,6 +2959,7 @@ files:
 - lib/generators/hyrax/work_resource/work_resource_generator.rb
 - lib/hyrax.rb
 - lib/hyrax/active_fedora_dummy_model.rb
+- lib/hyrax/administrative_set_name.rb
 - lib/hyrax/arkivo.rb
 - lib/hyrax/arkivo/actor.rb
 - lib/hyrax/arkivo/config.rb
@@ -2897,6 +2970,7 @@ files:
 - lib/hyrax/configuration.rb
 - lib/hyrax/controlled_vocabularies.rb
 - lib/hyrax/controlled_vocabularies/location.rb
+- lib/hyrax/controlled_vocabularies/resource_label_caching.rb
 - lib/hyrax/controlled_vocabulary/importer/downloader.rb
 - lib/hyrax/controlled_vocabulary/importer/language.rb
 - lib/hyrax/controller_resource.rb
@@ -2941,8 +3015,11 @@ files:
 - lib/hyrax/specs/spy_listener.rb
 - lib/hyrax/transactions.rb
 - lib/hyrax/transactions/admin_set_create.rb
+- lib/hyrax/transactions/admin_set_destroy.rb
+- lib/hyrax/transactions/admin_set_update.rb
 - lib/hyrax/transactions/apply_change_set.rb
 - lib/hyrax/transactions/collection_create.rb
+- lib/hyrax/transactions/collection_destroy.rb
 - lib/hyrax/transactions/collection_update.rb
 - lib/hyrax/transactions/container.rb
 - lib/hyrax/transactions/create_work.rb
@@ -2955,6 +3032,9 @@ files:
 - lib/hyrax/transactions/steps/apply_collection_type_permissions.rb
 - lib/hyrax/transactions/steps/apply_permission_template.rb
 - lib/hyrax/transactions/steps/apply_visibility.rb
+- lib/hyrax/transactions/steps/change_depositor.rb
+- lib/hyrax/transactions/steps/check_for_empty_admin_set.rb
+- lib/hyrax/transactions/steps/delete_access_control.rb
 - lib/hyrax/transactions/steps/delete_resource.rb
 - lib/hyrax/transactions/steps/destroy_work.rb
 - lib/hyrax/transactions/steps/ensure_admin_set.rb
@@ -2962,17 +3042,22 @@ files:
 - lib/hyrax/transactions/steps/remove_file_set_from_work.rb
 - lib/hyrax/transactions/steps/save.rb
 - lib/hyrax/transactions/steps/save_access_control.rb
+- lib/hyrax/transactions/steps/save_collection_banner.rb
+- lib/hyrax/transactions/steps/save_collection_logo.rb
 - lib/hyrax/transactions/steps/save_work.rb
 - lib/hyrax/transactions/steps/set_collection_type_gid.rb
 - lib/hyrax/transactions/steps/set_default_admin_set.rb
 - lib/hyrax/transactions/steps/set_modified_date.rb
 - lib/hyrax/transactions/steps/set_uploaded_date_unless_present.rb
+- lib/hyrax/transactions/steps/set_user_as_creator.rb
 - lib/hyrax/transactions/steps/set_user_as_depositor.rb
+- lib/hyrax/transactions/steps/update_work_members.rb
 - lib/hyrax/transactions/steps/validate.rb
 - lib/hyrax/transactions/transaction.rb
 - lib/hyrax/transactions/update_work.rb
 - lib/hyrax/transactions/work_create.rb
 - lib/hyrax/transactions/work_destroy.rb
+- lib/hyrax/transactions/work_update.rb
 - lib/hyrax/valkyrie_can_can_adapter.rb
 - lib/hyrax/valkyrie_simple_path_generator.rb
 - lib/hyrax/version.rb
@@ -2999,6 +3084,8 @@ files:
 - lib/wings/active_fedora_classifier.rb
 - lib/wings/active_fedora_converter.rb
 - lib/wings/active_fedora_converter/default_work.rb
+- lib/wings/active_fedora_converter/file_metadata_node.rb
+- lib/wings/active_fedora_converter/instance_builder.rb
 - lib/wings/active_fedora_converter/nested_resource.rb
 - lib/wings/attribute_transformer.rb
 - lib/wings/converter_value_mapper.rb
@@ -3061,7 +3148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user