hyrax 5.0.0.rc1 → 5.0.0.rc2

data/lib/hyrax/transactions/file_set_update.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'hyrax/transactions/transaction'
+
+module Hyrax
+  module Transactions
+    ##
+    # Updates a {Hyrax::FileSet} from a ChangeSet
+    #
+    # @since 3.4.0
+    class FileSetUpdate < Transaction
+      DEFAULT_STEPS = ['change_set.apply',
+                       'file_set.save_acl'].freeze
+
+      ##
+      # @see Hyrax::Transactions::Transaction
+      def initialize(container: Container, steps: DEFAULT_STEPS)
+        super
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Hyrax
           return Success(obj) if parent_id.blank?
 
           parent = Hyrax.query_service.find_by(id: parent_id)
-          parent.member_ids << obj.id
+          parent.member_ids += [obj.id]
           Hyrax.persister.save(resource: parent)
 
           user ||= ::User.find_by_user_key(obj.depositor)

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Deletes a resource from the persister, returning a `Dry::Monads::Result`
+      # (`Success`|`Failure`).
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class DeleteAllFileMetadata
+        include Dry::Monads[:result]
+
+        ##
+        # @params [#save] persister
+        def initialize(property: :file_ids, query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
+          @property = property
+          @persister = persister
+          @query_service = query_service
+          @publisher = publisher
+        end
+
+        ##
+        # @param [Valkyrie::Resource] resource
+        # @param [::User] the user resposible for the delete action
+        #
+        # @return [Dry::Monads::Result]
+        def call(resource)
+          return Failure(:resource_not_persisted) unless resource.persisted?
+
+          resource[@property].each do |file_id|
+            return Failure[:failed_to_delete_file_metadata, file_id] unless
+              Hyrax::Transactions::Container['file_metadata.destroy']
+              .call(@query_service.custom_queries.find_file_metadata_by(id: file_id))
+              .success?
+          rescue ::Ldp::Gone
+            nil
+          end
+
+          Success(resource)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Deletes a resource's member FileSets from the persister, returning a `Dry::Monads::Result`
+      # (`Success`|`Failure`).
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class DeleteAllFileSets
+        include Dry::Monads[:result]
+
+        ##
+        # @params [#save] persister
+        def initialize(query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
+          @persister = persister
+          @query_service = query_service
+          @publisher = publisher
+        end
+
+        ##
+        # @param [Valkyrie::Resource] resource
+        # @param [::User] the user resposible for the delete action
+        #
+        # @return [Dry::Monads::Result]
+        def call(resource, user: nil)
+          return Failure(:resource_not_persisted) unless resource.persisted?
+
+          @query_service.custom_queries.find_child_file_sets(resource: resource).each do |file_set|
+            return Failure[:failed_to_delete_file_set, file_set] unless
+              Hyrax::Transactions::Container['file_set.destroy']
+              .with_step_args('file_set.remove_from_work' => { user: user },
+                              'file_set.delete' => { user: user })
+              .call(file_set).success?
+          rescue ::Ldp::Gone
+            nil
+          end
+
+          Success(resource)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Deletes a resource from the persister, returning a `Dry::Monads::Result`
+      # (`Success`|`Failure`).
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class FileMetadataDelete
+        include Dry::Monads[:result]
+
+        ##
+        # @params [#save] persister
+        def initialize(persister: Hyrax.persister, storage_adapter: Hyrax.storage_adapter, publisher: Hyrax.publisher)
+          @persister = persister
+          @publisher = publisher
+          @storage_adapter = storage_adapter
+        end
+
+        ##
+        # @param [Hyrax::FileMetadata] FileMetadata resource
+        # @param [::User] the user resposible for the delete action
+        #
+        # @return [Dry::Monads::Result]
+        def call(resource)
+          return Failure(:resource_not_persisted) unless resource.persisted?
+
+          @persister.delete(resource: resource)
+          @publisher.publish('file.metadata.deleted', metadata: resource)
+          Valkyrie::StorageAdapter.delete(id: resource.file_identifier) if resource.file_identifier.present?
+
+          Success(resource)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Removes a collection from its members, returning a `Dry::Monads::Result`
+      # (`Success`|`Failure`).
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class RemoveFromMembership
+        include Dry::Monads[:result]
+
+        ##
+        # @params [#save] persister
+        def initialize(query_service: Hyrax.custom_queries, persister: Hyrax.persister, publisher: Hyrax.publisher)
+          @persister = persister
+          @query_service = query_service
+          @publisher = publisher
+        end
+
+        ##
+        # @param [Valkyrie::Resource] resource
+        # @param [::User] the user resposible for the delete action
+        #
+        # @return [Dry::Monads::Result]
+        def call(collection, user: nil)
+          return Failure(:resource_not_persisted) unless collection.persisted?
+          return Failure(:user_not_present) if user.blank?
+
+          @query_service.find_members_of(collection: collection).each do |member|
+            member.member_of_collection_ids -= [collection.id]
+            @persister.save(resource: member)
+            @publisher.publish('collection.membership.updated', collection: collection, user: user)
+          rescue StandardError
+            nil
+          end
+
+          Success(collection)
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/work_destroy.rb

@@ -8,8 +8,9 @@ module Hyrax
     #
     # @since 3.0.0
     class WorkDestroy < Transaction
-      DEFAULT_STEPS = ['work_resource.delete',
-                       'work_resource.delete_acl'].freeze
+      DEFAULT_STEPS = ['work_resource.delete_all_file_sets',
+                       'work_resource.delete_acl',
+                       'work_resource.delete'].freeze
 
       ##
       # @see Hyrax::Transactions::Transaction

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.0.rc1'
+  VERSION = '5.0.0.rc2'
 end

data/lib/tasks/collection_type_global_id.rake

@@ -7,13 +7,18 @@ namespace :hyrax do
 
       count = 0
 
-      Collection.all.each do |collection|
-        next if collection.collection_type_gid == collection.collection_type.to_global_id.to_s
+      Hyrax.query_service.find_all_of_model(model: Hyrax::PcdmCollection).each do |collection|
+        type = Hyrax::CollectionType.find_by_gid(collection.collection_type_gid)
+        next if collection.collection_type_gid == type.to_global_id.to_s
 
-        collection.public_send(:collection_type_gid=, collection.collection_type.to_global_id, force: true)
+        # Awful hack to allow converted AF collections to force update collection_type_gid
+        Thread.current[:force_collection_type_gid] = true
+        collection.collection_type_gid = type.to_global_id
 
-        collection.save &&
+        Hyrax.persister.save(resource: collection) &&
           count += 1
+      ensure
+        Thread.current[:force_collection_type_gid] = false
       end
 
       puts "Updated #{count} collections."

data/lib/tasks/embargo_lease.rake

@@ -8,6 +8,7 @@ namespace :hyrax do
 
       Hyrax.query_service.find_many_by_ids(ids: ids).each do |resource|
         Hyrax::EmbargoManager.release_embargo_for(resource: resource) &&
+          Hyrax.persister.save(resource: resource.embargo) &&
           Hyrax::AccessControlList(resource).save
       end
     end

data/lib/valkyrie/indexing/solr/indexing_adapter.rb

@@ -81,6 +81,8 @@ module Valkyrie
           # if any configuration is missing, derive it from Blacklight
           config = blacklight_based_config.with_indifferent_access.merge(config)
 
+          return config['url'] if config['url'].present?
+
           "http://#{config['host']}:#{config['port']}/solr/#{config['core']}"
         end
 

data/lib/wings/active_fedora_converter.rb

@@ -170,6 +170,7 @@ module Wings
 
     # for files, add attributes to metadata_node, plus some other work
     def add_file_attributes(af_object)
+      add_file_uri(af_object)
       converted_attrs = normal_attributes
       pcdm_use = converted_attrs.delete(:pcdm_use)
       af_object.metadata_node.attributes = converted_attrs
@@ -180,6 +181,11 @@ module Wings
       af_object.mime_type = resource.mime_type
     end
 
+    def add_file_uri(af_object)
+      file_uri = Hyrax.storage_adapter.fedora_identifier(id: resource.file_identifier)
+      af_object.uri = file_uri.to_s if af_object.uri.to_s.blank? && file_uri.to_s.present?
+    end
+
     def perform_lease_conversion(af_object:, resource:)
       # TODO(#6134): af_object.lease.class has the same name as resource.lease.class; however, each class has a different object_id
       # so a type mismatch happens. the code below coerces the one object into the other

data/lib/wings/attribute_transformer.rb

@@ -15,29 +15,36 @@ module Wings
       end
     end
 
-    def self.run(obj) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      attrs = obj.reflections.each_with_object({}) do |(key, reflection), mem|
+    def self.run(obj) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      attrs = obj.reflections.each_with_object({}) do |(key, reflection), mem| # rubocop:disable Metrics/BlockLength
         case reflection
-        when ActiveFedora::Reflection::HasManyReflection,
-             ActiveFedora::Reflection::HasAndBelongsToManyReflection,
-             ActiveFedora::Reflection::IndirectlyContainsReflection
-          mem[:"#{key.to_s.singularize}_ids"] =
-            obj.association(key).ids_reader
-        when ActiveFedora::Reflection::DirectlyContainsReflection
-          mem[:"#{key.to_s.singularize}_ids"] =
-            Array(obj.public_send(reflection.name)).map(&:id)
-        when ActiveFedora::Reflection::FilterReflection,
-             ActiveFedora::Reflection::OrdersReflection,
-             ActiveFedora::Reflection::HasSubresourceReflection,
-             ActiveFedora::Reflection::BelongsToReflection,
-             ActiveFedora::Reflection::BasicContainsReflection
+        when ActiveFedora::Reflection::BelongsToReflection, # uses foreign_key SingularRDFPropertyReflection
+             ActiveFedora::Reflection::BasicContainsReflection, # ???
+             ActiveFedora::Reflection::FilterReflection, # rely on :extending_from
+             ActiveFedora::Reflection::HasAndBelongsToManyReflection, # uses foreign_key RDFPropertyReflection
+             ActiveFedora::Reflection::HasManyReflection, # captured by inverse relation
+             ActiveFedora::Reflection::HasSubresourceReflection, # ???
           :noop
+        when ActiveFedora::Reflection::OrdersReflection
+          mem[:"#{reflection.options[:unordered_reflection].name.to_s.singularize}_ids"] ||= []
+          mem[:"#{reflection.options[:unordered_reflection].name.to_s.singularize}_ids"] +=
+            obj.association(reflection.name).target_ids_reader
         when ActiveFedora::Reflection::DirectlyContainsOneReflection
           mem[:"#{key.to_s.singularize}_id"] =
             obj.public_send(reflection.name)&.id
+        when ActiveFedora::Reflection::IndirectlyContainsReflection
+          mem[:"#{key.to_s.singularize}_ids"] ||= []
+          mem[:"#{key.to_s.singularize}_ids"] +=
+            obj.association(key).ids_reader
+        when ActiveFedora::Reflection::DirectlyContainsReflection
+          mem[:"#{key.to_s.singularize}_ids"] ||= []
+          mem[:"#{key.to_s.singularize}_ids"] +=
+            Array(obj.public_send(reflection.name)).map(&:id)
+        when ActiveFedora::Reflection::RDFPropertyReflection
+          mem[reflection.name.to_sym] =
+            obj.public_send(reflection.name.to_sym)
         else
-          mem[reflection.foreign_key.to_sym] =
-            obj.public_send(reflection.foreign_key.to_sym)
+          raise NotImplementedError, "Expected a known ActiveFedora::Reflection, but got #{reflection}"
         end
       end
 

data/lib/wings/model_transformer.rb

@@ -150,17 +150,9 @@ module Wings
       { :id => pcdm_object.id,
         :created_at => pcdm_object.try(:create_date),
         :updated_at => pcdm_object.try(:modified_date),
-        :member_ids => member_ids,
         ::Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK => lock_token }
     end
 
-    # Prefer ordered members, but if ordered members don't exist, use non-ordered members.
-    def member_ids
-      ordered_member_ids = pcdm_object.try(:ordered_member_ids)
-      return ordered_member_ids if ordered_member_ids.present?
-      pcdm_object.try(:member_ids)
-    end
-
     def lock_token
       result = []
       result << ::Valkyrie::Persistence::OptimisticLockToken.new(adapter_id: 'wings-fedora-etag', token: pcdm_object.etag) unless pcdm_object.new_record?

data/lib/wings/orm_converter.rb

@@ -78,29 +78,34 @@ module Wings
         end
 
         # add reflection associations
-        ldp_reflections = (klass.try(:reflections) || []).select do |_key, reflection|
+        (klass.try(:reflections) || []).each do |reflection_key, reflection|
           case reflection
-          when ActiveFedora::Reflection::FilterReflection,
-               ActiveFedora::Reflection::OrdersReflection,
-               ActiveFedora::Reflection::BasicContainsReflection,
-               ActiveFedora::Reflection::HasSubresourceReflection
-            false
-          else
-            true
-          end
-        end
-
-        ldp_reflections.each do |reflection_key, reflection|
-          if reflection.collection?
-            type           = ::Valkyrie::Types::Set.of(::Valkyrie::Types::ID)
+          when ActiveFedora::Reflection::BelongsToReflection, # uses foreign_key SingularRDFPropertyReflection
+               ActiveFedora::Reflection::BasicContainsReflection, # ???
+               ActiveFedora::Reflection::FilterReflection, # rely on :extending_from
+               ActiveFedora::Reflection::HasAndBelongsToManyReflection, # uses foreign_key RDFPropertyReflection
+               ActiveFedora::Reflection::HasManyReflection, # captured by inverse relation
+               ActiveFedora::Reflection::HasSubresourceReflection, # ???
+               ActiveFedora::Reflection::OrdersReflection # map to :unordered_association in Wings::AttributeTransformer (but retain order)
+            next
+          when ActiveFedora::Reflection::DirectlyContainsOneReflection
+            attribute_name = (reflection_key.to_s.singularize + '_id').to_sym
+            type = ::Valkyrie::Types::ID.optional
+          when ActiveFedora::Reflection::DirectlyContainsReflection,
+               ActiveFedora::Reflection::IndirectlyContainsReflection
             attribute_name = (reflection_key.to_s.singularize + '_ids').to_sym
+            type = ::Valkyrie::Types::Set.of(::Valkyrie::Types::ID)
+          when ActiveFedora::Reflection::SingularRDFPropertyReflection
+            attribute_name = reflection.name.to_sym
+            type = ::Valkyrie::Types::ID.optional
+          when ActiveFedora::Reflection::RDFPropertyReflection
+            attribute_name = reflection.name.to_sym
+            type = ::Valkyrie::Types::Set.of(::Valkyrie::Types::ID)
           else
-            type           = ::Valkyrie::Types::ID.optional
-            attribute_name = (reflection_key.to_s.singularize + '_id').to_sym
+            raise NotImplementedError, "Expected a known ActiveFedora::Reflection, but got #{reflection}"
           end
 
-          next if fields.include?(attribute_name)
-          attribute attribute_name, type
+          attribute(attribute_name, type)
         end
 
         def internal_resource

data/lib/wings/setup.rb

@@ -98,12 +98,12 @@ end
 Valkyrie::MetadataAdapter.register(
   Wings::Valkyrie::MetadataAdapter.new, :wings_adapter
 )
-Valkyrie.config.metadata_adapter = :wings_adapter
+Valkyrie.config.metadata_adapter = :wings_adapter unless Hyrax.config.disable_wings
 
 Valkyrie::StorageAdapter.register(
   Wings::Valkyrie::Storage.new, :active_fedora
 )
-Valkyrie.config.storage_adapter = :active_fedora
+Valkyrie.config.storage_adapter = :active_fedora unless Hyrax.config.disable_wings
 
 # TODO: Custom query registration is not Wings specific.  These custom_queries need to be registered for other adapters too.
 #       A refactor is needed to add the default implementations to hyrax.rb and only handle the wings specific overrides here.

data/lib/wings/valkyrie/storage.rb

@@ -19,14 +19,9 @@ module Wings
     # For use with Hyrax, this adapter defaults to Fedora 4.
     class Storage < ::Valkyrie::Storage::Fedora
       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
 
       def initialize(connection: Ldp::Client.new(ActiveFedora.fedora.host), base_path: ActiveFedora.fedora.base_path, fedora_version: 4)
-        @sha1 = fedora_version == 5 ? "sha" : "sha1"
         super
       end
 
@@ -36,84 +31,19 @@ module Wings
         ::Valkyrie::ID.new(id.to_s.sub(/^.+\/\//, PROTOCOL))
       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)
+                 resource_uri_transformer: default_resource_uri_transformer, use: Hydra::PCDM::Vocab::PCDMTerms.File, # rubocop:disable Lint/UnusedMethodArgument
+                 id_hint: 'original', **_extra_arguments)
         id = if resource.try(:file_set?)
                upload_with_works(resource: resource, file: file, use: use)
              else
-               put_file(file: file,
-                        original_filename: original_filename,
-                        resource: resource,
-                        content_type: content_type,
-                        resource_uri_transformer: resource_uri_transformer,
-                        id_hint: id_hint, **extra_arguments)
+               return super(file: file, original_filename: original_filename, resource: resource, content_type: content_type, resource_uri_transformer: resource_uri_transformer_factory(id_hint))
              end
-
         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)
-        query = { predicate: RDF::Vocab::Fcrepo4.hasVersion }
-
-        version_graph.query(query).objects.map do |uri|
-          timestamp =
-            version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
-                         .first_object
-                         .object
-          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: 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("Version", :id, :created, :adapter, keyword_init: true) do
-        include Comparable
-
-        ##
-        # @return [#read]
-        def io
-          adapter.find_by(id: id)
-        end
-
-        def version_token
-          created
-        end
-
-        def <=>(other)
-          raise ArgumentError unless other.respond_to?(:version_token)
-          version_token <=> other.version_token
-        end
-      end
-
       private
 
-      def digest_for(file)
-        "#{sha1}=#{Digest::SHA1.file(file)}"
-      end
-
       def default_resource_uri_transformer
         lambda do |resource, hint|
           id = [CGI.escape(resource.id), FILES_PATH, hint].join('/')
@@ -121,24 +51,12 @@ module Wings
         end
       end
 
-      ##
-      # Create a file with HTTP put; no containers here.
-      # @return [String] the identifier of the created file
-      def put_file(file:, original_filename:, resource:, content_type:, # rubocop:disable Metrics/ParameterLists
-                   resource_uri_transformer:, id_hint:, **_extra_arguments)
-        identifier = resource_uri_transformer.call(resource, id_hint)
-
-        connection.http.put do |request|
-          request.url identifier
-          request.headers['Content-Type'] = content_type
-          request.headers['Content-Length'] = (file.try(:size) || file.try(:length)).to_s
-          request.headers['Content-Disposition'] = "attachment; filename=\"#{original_filename}\""
-          request.headers['digest'] = digest_for(file)
-          request.headers['link'] = LINK_HEADER
-          request.body = Faraday::UploadIO.new(file, content_type, original_filename)
+      # Transforms default_resource_uri_transformer to conform to Valkyrie's
+      # expected interface of passing a resource and base url.
+      def resource_uri_transformer_factory(hint)
+        lambda do |resource, _base_url|
+          default_resource_uri_transformer.call(resource, hint)
         end
-
-        identifier
       end
 
       def upload_with_works(resource:, file:, use:)

data/lib/wings.rb

@@ -15,6 +15,8 @@
 # However, these dependencies should be considered temprorary: this code will
 # be deprecated for removal in a future release.
 #
+# @deprecated Wings will be removed when ActiveFedora is no longer supported by Hyrax.
+#
 # @example casting an ActiveFedora model to Valkyrie
 #   work     = GenericWork.create(title: ['Comet in Moominland'])
 #   resource = work.valkyrie_resource
@@ -56,6 +58,9 @@
 # @see https://wiki.duraspace.org/display/samvera/Hyrax-Valkyrie+Development+Working+Group
 #      for further context regarding the approach
 module Wings
+  Deprecation.warn(self, "ActiveFedora and Wings will be removed from a future major release of Hyrax in favor " \
+    "of Valkyrie resource models. Please migrate your models from ActiveFedora::Base to Hyrax::Resource.")
+
   ##
   # @api public
   #

data/tasks/hyrax_dev.rake

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'English'
 require 'rspec/core/rake_task'
-require 'engine_cart/rake_task'
 require 'rubocop/rake_task'
 
 desc 'Run style checker'
@@ -11,16 +10,6 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Spin up test servers and run specs'
-task :spec_with_app_load do
-  require 'solr_wrapper'   # necessary for rake_support to work
-  require 'fcrepo_wrapper' # necessary for rake_support to work
-  require 'active_fedora/rake_support'
-  with_test_server do
-    Rake::Task['spec'].invoke
-  end
-end
-
 desc "Sort locales keys in alphabetic order."
 task :i18n_sorter do
   require 'i18n_yaml_sorter'
@@ -34,28 +23,8 @@ task :i18n_sorter do
   end
 end
 
-if Gem.loaded_specs.key? 'engine_cart'
-  namespace :engine_cart do
-    # This generate task should only add its action to an existing engine_cart:generate task
-    raise 'engine_cart:generate task should already be defined' unless Rake::Task.task_defined?('engine_cart:generate')
-    task :generate do |_task|
-      puts 'Running post-generation operations...'
-      Rake::Task['engine_cart:after_generate'].invoke
-    end
-
-    desc 'Operations that need to run after the test_app migrations have run'
-    task :after_generate do
-      puts 'Creating default collection type...'
-      EngineCart.within_test_app do
-        raise "EngineCart failed on with: #{$CHILD_STATUS}" unless
-          system('bundle exec rake hyrax:default_collection_types:create')
-      end
-    end
-  end
-end
-
-desc 'Generate the engine_cart and spin up test servers and run specs'
-task ci: ['rubocop', 'engine_cart:generate'] do
+desc 'Run rubocop and then run specs'
+task ci: ['rubocop'] do
   puts 'running continuous integration'
   Rake::Task['spec_with_app_load'].invoke
 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', '5.0.0.rc1'
+gem 'hyrax', '5.0.0.rc2'
 run 'bundle install'
 generate 'hyrax:install', '-f'