hyrax 3.4.1 → 3.4.2

data/lib/wings/services/custom_queries/find_file_metadata.rb

@@ -33,7 +33,20 @@ module Wings
       #
       # @raise [Hyrax::ObjectNotFoundError]
       def find_file_metadata_by(id:, use_valkyrie: true)
-        find_file_metadata_by_alternate_identifier(alternate_identifier: id, use_valkyrie: use_valkyrie)
+        fcrepo_flag =
+          begin
+            ::Valkyrie::StorageAdapter.adapter_for(id: id).is_a?(::Valkyrie::Storage::Fedora)
+          rescue ::Valkyrie::StorageAdapter::AdapterNotFoundError
+            true # assume fcrepo if we can't find an adapter
+          end
+
+        if fcrepo_flag
+          find_file_metadata_by_alternate_identifier(alternate_identifier: id, use_valkyrie: use_valkyrie)
+        else
+          result = ActiveFedora::Base.where(file_identifier_ssim: id.to_s).first ||
+                   raise(Hyrax::ObjectNotFoundError)
+          result.valkyrie_resource
+        end
       end
 
       # Find a Hyrax::FileMetadata using an alternate ID, and map it to a
@@ -48,8 +61,8 @@ module Wings
       #
       # @raise [Hyrax::ObjectNotFoundError]
       def find_file_metadata_by_alternate_identifier(alternate_identifier:, use_valkyrie: true)
-        alternate_identifier = ::Valkyrie::ID.new(alternate_identifier)
-        object = Hydra::PCDM::File.find(alternate_identifier.to_s)
+        alternate_identifier = ::Valkyrie::ID.new(alternate_identifier).to_s
+        object = Hydra::PCDM::File.find(alternate_identifier)
         raise Hyrax::ObjectNotFoundError if object.new_record?
 
         if use_valkyrie == false
@@ -73,11 +86,9 @@ module Wings
       #   if there are no ids or none of the ids map to Hyrax::FileMetadata
       def find_many_file_metadata_by_ids(ids:, use_valkyrie: true)
         ids.each_with_object([]) do |alt_id, results|
-          begin
-            results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
-          rescue Hyrax::ObjectNotFoundError
-            next
-          end
+          results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
+        rescue Hyrax::ObjectNotFoundError
+          next
         end
       end
 

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
 

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.4.1'
+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.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 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"
@@ -2227,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
@@ -2303,7 +2341,6 @@ files:
 - app/views/catalog/_index_gallery_collection_wrapper.html.erb
 - app/views/catalog/_index_header_list_collection.html.erb
 - app/views/catalog/_index_header_list_default.html.erb
-- app/views/catalog/_index_header_list_hyrax_pcdm_collection.html.erb
 - app/views/catalog/_index_list_default.html.erb
 - app/views/catalog/_search_form.html.erb
 - app/views/catalog/_thumbnail_list_collection.html.erb
@@ -2748,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
@@ -2778,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
@@ -2996,6 +3042,8 @@ 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
@@ -3036,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
@@ -3098,7 +3148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.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

data/app/views/catalog/_index_header_list_hyrax_pcdm_collection.html.erb

@@ -1,4 +0,0 @@
-<div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
-  <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
-</div>