hyrax 4.0.0 → 5.0.0.rc2

data/lib/wings/active_fedora_converter.rb

@@ -18,7 +18,7 @@ module Wings
   #
   # @note the `Valkyrie::Resource` object passed to this class **must** have an
   #   `#internal_resource` mapping it to an `ActiveFedora::Base` class.
-  class ActiveFedoraConverter
+  class ActiveFedoraConverter # rubocop:disable Metrics/ClassLength
     ##
     # Accesses the Class implemented for handling resource attributes
     # @return [Class]
@@ -93,7 +93,7 @@ module Wings
     # then the id hasn't been minted and shouldn't yet be set.
     # @return [String]
     def id
-      return resource[:id].to_s if resource[:id]&.is_a?(::Valkyrie::ID) && resource[:id].present?
+      return resource[:id].to_s if resource[:id].present? && resource[:id]&.is_a?(::Valkyrie::ID)
       return "" unless resource.respond_to?(:alternate_ids)
 
       resource.alternate_ids.first.to_s
@@ -130,6 +130,7 @@ module Wings
 
     ##
     # apply attributes to the ActiveFedora model
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
     def apply_attributes_to_model(af_object)
       case af_object
       when Hydra::AccessControl
@@ -137,15 +138,29 @@ module Wings
       when ActiveFedora::File
         add_file_attributes(af_object)
       else
-        converted_attrs = normal_attributes
-        members = Array.wrap(converted_attrs.delete(:members))
-        files = converted_attrs.delete(:files)
-        af_object.attributes = converted_attrs
-        members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
-        af_object.try(:members)&.replace(members)
-        af_object.files.build_or_set(files) if files
+        parse_attributes(af_object)
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+
+    def parse_attributes(af_object)
+      converted_attrs = normal_attributes
+      members = Array.wrap(converted_attrs.delete(:members))
+      files = converted_attrs.delete(:files)
+      af_object.attributes = converted_attrs
+      af_object.extracted_text = create_extrated_text(af_object) if resource.attributes[:extracted_text_id].present?
+      perform_lease_conversion(af_object: af_object, resource: resource)
+      perform_embargo_conversion(af_object: af_object, resource: resource)
+      members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
+      af_object.try(:members)&.replace(members)
+      af_object.files.build_or_set(files) if files
+    end
+
+    def create_extrated_text(af_object)
+      pcdm_et_file = af_object.extracted_text.presence || af_object.create_extracted_text
+      pcdm_et_file.content = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: resource, use: Hyrax::FileMetadata::Use::EXTRACTED_TEXT).first&.content
+      pcdm_et_file
+    end
 
     # Add attributes from resource which aren't AF properties into af_object
     def add_access_control_attributes(af_object)
@@ -155,11 +170,38 @@ module Wings
 
     # for files, add attributes to metadata_node, plus some other work
     def add_file_attributes(af_object)
-      af_object.metadata_node.attributes = normal_attributes
+      add_file_uri(af_object)
+      converted_attrs = normal_attributes
+      pcdm_use = converted_attrs.delete(:pcdm_use)
+      af_object.metadata_node.attributes = converted_attrs
+      af_object.pcdm_use = pcdm_use.first if pcdm_use.present? && pcdm_use.first.present?
       af_object.original_name = resource.original_filename
-      new_type = (resource.type - af_object.metadata_node.type.to_a).first
+      new_type = (resource.pcdm_use - af_object.metadata_node.type.to_a).first
       af_object.metadata_node.type = new_type if new_type
       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
+      return if !resource.try(:lease) || !af_object.reflections.include?(:lease) || af_object.lease&.id
+
+      resource_lease_dup = af_object.reflections.fetch(:lease).klass.new(resource.lease.attributes.except(:id, :internal_resource, :created_at, :updated_at, :new_record))
+      af_object.lease = resource_lease_dup
+    end
+
+    def perform_embargo_conversion(af_object:, resource:)
+      # TODO(#6134): af_object.embargo.class has the same name as resource.embargo.class; however, each class has a different object_id
+      # so a type mismatch happens. the code below coerces the one object into the other
+      return if !resource.try(:embargo) || !af_object.reflections.include?(:embargo) || af_object.embargo&.id
+
+      resource_embargo_dup = af_object.reflections.fetch(:embargo).klass.new(resource.embargo.attributes.except(:id, :internal_resource, :created_at, :updated_at, :new_record))
+      af_object.embargo = resource_embargo_dup
+    end
   end
 end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module Wings
   ##
   # Transforms ActiveFedora models or objects into Valkyrie::Resource models or
@@ -34,7 +35,7 @@ module Wings
     #
     # @param pcdm_object [ActiveFedora::Base]
     #
-    # @return [::Valkyrie::Resource] a resource mirroiring `pcdm_object`
+    # @return [::Valkyrie::Resource] a resource mirroring `pcdm_object`
     def self.for(pcdm_object)
       new(pcdm_object: pcdm_object).build
     end
@@ -43,6 +44,7 @@ module Wings
     # Builds a `Valkyrie::Resource` equivalent to the `pcdm_object`
     #
     # @return [::Valkyrie::Resource] a resource mirroring `pcdm_object`
+    # rubocop:disable Metrics/AbcSize
     def build
       klass = cache.fetch(pcdm_object.class) do
         OrmConverter.to_valkyrie_resource_class(klass: pcdm_object.class)
@@ -53,7 +55,25 @@ module Wings
       attrs = attributes.tap { |hash| hash[:new_record] = pcdm_object.new_record? }
       attrs[:alternate_ids] = [::Valkyrie::ID.new(pcdm_object.id)] if pcdm_object.id
 
-      klass.new(**attrs).tap { |resource| ensure_current_permissions(resource) }
+      klass.new(**attrs).tap do |resource|
+        resource.lease = pcdm_object.lease&.valkyrie_resource if pcdm_object.respond_to?(:lease) && pcdm_object.lease
+        resource.embargo = pcdm_object.embargo&.valkyrie_resource if pcdm_object.respond_to?(:embargo) && pcdm_object.embargo
+        check_size(resource)
+        check_pcdm_use(resource)
+        ensure_current_permissions(resource)
+      end
+    end
+
+    def check_size(resource)
+      return unless resource.respond_to?(:recorded_size) && pcdm_object.respond_to?(:size)
+      resource.recorded_size = [pcdm_object.size.to_i]
+    end
+
+    def check_pcdm_use(resource)
+      return unless resource.respond_to?(:pcdm_use) &&
+                    pcdm_object.respond_to?(:metadata_node) &&
+                    pcdm_object&.metadata_node&.respond_to?(:type)
+      resource.pcdm_use = pcdm_object.metadata_node.type.to_a
     end
 
     def ensure_current_permissions(resource)
@@ -130,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?
@@ -155,7 +167,6 @@ module Wings
     def append_embargo(attrs)
       return unless pcdm_object.try(:embargo)
       embargo_attrs = pcdm_object.embargo.attributes.symbolize_keys
-      embargo_attrs[:embargo_history] = embargo_attrs[:embargo_history].to_a
       embargo_attrs[:id] = ::Valkyrie::ID.new(embargo_attrs[:id]) if embargo_attrs[:id]
 
       attrs[:embargo] = Hyrax::Embargo.new(**embargo_attrs)
@@ -164,7 +175,6 @@ module Wings
     def append_lease(attrs)
       return unless pcdm_object.try(:lease)
       lease_attrs = pcdm_object.lease.attributes.symbolize_keys
-      lease_attrs[:lease_history] = lease_attrs[:embargo_history].to_a
       lease_attrs[:id] = ::Valkyrie::ID.new(lease_attrs[:id]) if lease_attrs[:id]
 
       attrs[:lease] = Hyrax::Lease.new(**lease_attrs)
@@ -186,3 +196,4 @@ module Wings
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

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

@@ -36,6 +36,7 @@ module ActiveFedora
     alias eql? ==
 
     def self.supports_property?(property)
+      return true if ['pcdm_use'].include?(property.to_s)
       properties.key?(property.to_s)
     end
 
@@ -46,6 +47,14 @@ module ActiveFedora
     def self.default_sort_params
       ["system_create_dtsi asc"]
     end
+
+    def pcdm_use
+      metadata.type
+    end
+
+    def pcdm_use=(value)
+      metadata.type = value
+    end
   end
 
   module WithMetadata
@@ -56,6 +65,14 @@ module ActiveFedora
       def changed_attributes
         super.except(:file_hash)
       end
+
+      def pcdm_use
+        type
+      end
+
+      def pcdm_use=(value)
+        self.type = value
+      end
     end
   end
 
@@ -81,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.
@@ -102,7 +119,10 @@ custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
                   Wings::CustomQueries::FindCollectionsByType,
                   Wings::CustomQueries::FindFileMetadata, # override Hyrax::CustomQueries::FindFileMetadata
                   Wings::CustomQueries::FindIdsByModel,
-                  Wings::CustomQueries::FindManyByAlternateIds] # override Hyrax::CustomQueries::FindManyByAlternateIds
+                  Wings::CustomQueries::FindManyByAlternateIds,
+                  Hyrax::CustomQueries::FindModelsByAccess,
+                  Hyrax::CustomQueries::FindCountBy,
+                  Hyrax::CustomQueries::FindByDateRange] # override Hyrax::CustomQueries::FindManyByAlternateIds
 custom_queries.each do |query_handler|
   Valkyrie.config.metadata_adapter.query_service.custom_queries.register_query_handler(query_handler)
 end

data/lib/wings/valkyrie/persister.rb

@@ -22,8 +22,9 @@ module Wings
 
       # Persists a resource using ActiveFedora
       # @param [Valkyrie::Resource] resource
+      # @param [Boolean] perform_af_validation
       # @return [Valkyrie::Resource] the persisted/updated resource
-      def save(resource:)
+      def save(resource:, perform_af_validation: false)
         af_object = resource_factory.from_resource(resource: resource)
 
         check_lock_tokens(af_object: af_object, resource: resource)
@@ -31,7 +32,8 @@ module Wings
         # the #save! api differs between ActiveFedora::Base and ActiveFedora::File objects,
         # if we get a falsey response, we expect we have a File that has failed to save due
         # to empty content
-        af_object.save! ||
+        # we disable validation on the Active Fedora object, only if validations have already been run and passed
+        af_object.save!(validate: perform_af_validation) ||
           raise(FailedSaveError.new("#{af_object.class}#save! returned non-true. It might be missing required content.", obj: af_object))
 
         resource_factory.to_resource(object: af_object)

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/package.json

@@ -6,6 +6,8 @@
     "karma-chrome-launcher": "^3.1.1",
     "karma-coffee-preprocessor": "^1.0.1",
     "karma-jasmine": "^4.0.2",
-    "karma-spec-reporter": "^0.0.34"
+    "karma-selenium-grid-launcher": "^0.3.0",
+    "karma-spec-reporter": "^0.0.34",
+    "selenium-webdriver": "^4.10.0"
   }
 }

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', '4.0.0'
+gem 'hyrax', '5.0.0.rc2'
 run 'bundle install'
 generate 'hyrax:install', '-f'