hyrax 3.0.2 → 3.1.0

data/lib/wings/setup.rb

@@ -77,6 +77,7 @@ Valkyrie.config.storage_adapter = :active_fedora
 #       A refactor is needed to add the default implementations to hyrax.rb and only handle the wings specific overrides here.
 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::FindFiles,

data/lib/wings/valkyrie/storage.rb

@@ -19,6 +19,7 @@ module Wings
       DEFAULT_CTYPE = 'application/octet-stream'
       LINK_HEADER = "<http://www.w3.org/ns/ldp#NonRDFSource>; rel=\"type\""
       FILES_PATH = 'files'
+      VERSIONS_SLUG = '/fcr:versions'
 
       attr_reader :sha1
 
@@ -27,6 +28,14 @@ module Wings
         super
       end
 
+      ##
+      # @param key [Symbol] the key for plugin behavior to check support for
+      #
+      # @return [Boolean] whether
+      def supports?(key)
+        key == :versions
+      end
+
       def upload(file:, original_filename:, resource:, content_type: DEFAULT_CTYPE, # rubocop:disable Metrics/ParameterLists
                  resource_uri_transformer: default_resource_uri_transformer, use: Hydra::PCDM::Vocab::PCDMTerms.File,
                  id_hint: 'original', **extra_arguments)
@@ -41,7 +50,49 @@ module Wings
                         id_hint: id_hint, **extra_arguments)
              end
 
-        find_by(id: ::Valkyrie::ID.new(id.to_s.sub(/^.+\/\//, PROTOCOL)))
+        find_by(id: cast_to_valkyrie_id(id))
+      end
+
+      ##
+      # @return [Enumerable<Version> ordered list of versions
+      def find_versions(id:)
+        response = connection.http.get(fedora_identifier(id: id) + VERSIONS_SLUG)
+        return [] if response.status == 404
+
+        reader = RDF::Reader.for(content_type: response.headers['content-type'])
+        version_graph = RDF::Graph.new << reader.new(response.body)
+
+        version_graph.query(predicate: RDF::Vocab::Fcrepo4.hasVersion).objects.map do |uri|
+          timestamp =
+            version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
+                         .first_object
+                         .object
+          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
+        end.sort
+      end
+
+      ##
+      # abstractly, {Version} objects should have an {#id} and be orderable
+      # over {#<=>} (allowing e.g. `#sort` to define a consistent order---
+      # oldest to newest---for a collection of versions). the {#id} should be a
+      # globally unique identifier for the version.
+      #
+      # this implementation uses an orderable {#version_token}. in practice
+      # the token is the fcrepo created date for the version, as extracted from
+      # the versions graph.
+      Version = Struct.new(:id, :version_token, :adapter) do
+        include Comparable
+
+        ##
+        # @return [#read]
+        def io
+          adapter.find_by(id: id)
+        end
+
+        def <=>(other)
+          raise ArgumentError unless other.respond_to?(:version_token)
+          version_token <=> other.version_token
+        end
       end
 
       private
@@ -87,6 +138,10 @@ module Wings
 
         Hyrax.config.translate_id_to_uri.call(created_file.id)
       end
+
+      def cast_to_valkyrie_id(id)
+        ::Valkyrie::ID.new(id.to_s.sub(/^.+\/\//, PROTOCOL))
+      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.0.2'
+gem 'hyrax', '3.1.0'
 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.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1722,6 +1722,8 @@ files:
 - app/forms/hyrax/forms/failed_submission_form_wrapper.rb
 - app/forms/hyrax/forms/file_manager_form.rb
 - app/forms/hyrax/forms/file_set_edit_form.rb
+- app/forms/hyrax/forms/file_set_form.rb
+- app/forms/hyrax/forms/permission.rb
 - app/forms/hyrax/forms/permission_template_form.rb
 - app/forms/hyrax/forms/resource_form.rb
 - app/forms/hyrax/forms/widgets/admin_set_embargo_period.rb
@@ -1764,6 +1766,7 @@ files:
 - app/indexers/concerns/hyrax/indexes_basic_metadata.rb
 - app/indexers/concerns/hyrax/indexes_linked_metadata.rb
 - app/indexers/hyrax/admin_set_indexer.rb
+- app/indexers/hyrax/administrative_set_indexer.rb
 - app/indexers/hyrax/basic_metadata_indexer.rb
 - app/indexers/hyrax/collection_indexer.rb
 - app/indexers/hyrax/collection_with_basic_metadata_indexer.rb
@@ -1939,6 +1942,7 @@ files:
 - app/presenters/hyrax/admin/workflow_roles_presenter.rb
 - app/presenters/hyrax/admin_set_options_presenter.rb
 - app/presenters/hyrax/admin_set_presenter.rb
+- app/presenters/hyrax/admin_set_selection_presenter.rb
 - app/presenters/hyrax/admin_stats_presenter.rb
 - app/presenters/hyrax/characterization_behavior.rb
 - app/presenters/hyrax/collapsable_section_presenter.rb
@@ -2052,6 +2056,7 @@ files:
 - app/services/hyrax/collection_thumbnail_path_service.rb
 - app/services/hyrax/collection_types/create_service.rb
 - app/services/hyrax/collection_types/permissions_service.rb
+- app/services/hyrax/collections/collection_member_search_service.rb
 - app/services/hyrax/collections/collection_member_service.rb
 - app/services/hyrax/collections/managed_collections_service.rb
 - app/services/hyrax/collections/migration_service.rb
@@ -2074,6 +2079,7 @@ files:
 - 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/database_migrator.rb
 - app/services/hyrax/default_middleware_stack.rb
 - app/services/hyrax/derivative_path.rb
@@ -2141,6 +2147,7 @@ files:
 - app/services/hyrax/search_service.rb
 - app/services/hyrax/simple_schema_loader.rb
 - app/services/hyrax/solr_query_builder_service.rb
+- app/services/hyrax/solr_query_service.rb
 - app/services/hyrax/solr_service.rb
 - app/services/hyrax/statistics/collections/over_time.rb
 - app/services/hyrax/statistics/depositors/summary.rb
@@ -2172,6 +2179,7 @@ files:
 - app/services/hyrax/work_uploads_handler.rb
 - app/services/hyrax/workflow/abstract_notification.rb
 - app/services/hyrax/workflow/action_taken_service.rb
+- app/services/hyrax/workflow/actionable_objects.rb
 - app/services/hyrax/workflow/activate_object.rb
 - app/services/hyrax/workflow/changes_required_notification.rb
 - app/services/hyrax/workflow/deactivate_object.rb
@@ -2183,6 +2191,7 @@ files:
 - app/services/hyrax/workflow/notification_configuration_parameter.rb
 - app/services/hyrax/workflow/notification_generator.rb
 - app/services/hyrax/workflow/notification_service.rb
+- app/services/hyrax/workflow/object_in_workflow_decorator.rb
 - app/services/hyrax/workflow/pending_review_notification.rb
 - app/services/hyrax/workflow/permission_generator.rb
 - app/services/hyrax/workflow/permission_query.rb
@@ -2799,6 +2808,7 @@ files:
 - lib/generators/hyrax/work_resource/templates/work_spec.rb.erb
 - lib/generators/hyrax/work_resource/work_resource_generator.rb
 - lib/hyrax.rb
+- lib/hyrax/active_fedora_dummy_model.rb
 - lib/hyrax/arkivo.rb
 - lib/hyrax/arkivo/actor.rb
 - lib/hyrax/arkivo/config.rb
@@ -2848,6 +2858,7 @@ files:
 - lib/hyrax/specs/shared_specs/identifiers.rb
 - lib/hyrax/specs/shared_specs/indexers.rb
 - lib/hyrax/specs/shared_specs/metadata.rb
+- lib/hyrax/specs/shared_specs/valkyrie_storage_versions.rb
 - lib/hyrax/specs/shared_specs/workflow_method.rb
 - lib/hyrax/specs/spy_listener.rb
 - lib/hyrax/transactions.rb
@@ -2855,8 +2866,10 @@ files:
 - lib/hyrax/transactions/container.rb
 - lib/hyrax/transactions/create_work.rb
 - lib/hyrax/transactions/destroy_work.rb
+- lib/hyrax/transactions/file_set_destroy.rb
 - lib/hyrax/transactions/steps/add_file_sets.rb
 - lib/hyrax/transactions/steps/add_to_collections.rb
+- lib/hyrax/transactions/steps/add_to_parent.rb
 - lib/hyrax/transactions/steps/apply_collection_permission_template.rb
 - lib/hyrax/transactions/steps/apply_permission_template.rb
 - lib/hyrax/transactions/steps/apply_visibility.rb
@@ -2864,6 +2877,7 @@ files:
 - lib/hyrax/transactions/steps/destroy_work.rb
 - lib/hyrax/transactions/steps/ensure_admin_set.rb
 - lib/hyrax/transactions/steps/ensure_permission_template.rb
+- 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_work.rb
@@ -2890,6 +2904,7 @@ files:
 - lib/tasks/hyrax_user.rake
 - lib/tasks/install.rake
 - lib/tasks/migrate.rake
+- lib/tasks/regenerate_derivatives.rake
 - lib/tasks/reindex.rake
 - lib/tasks/stats_tasks.rake
 - lib/tasks/universal_viewer.rake