hyrax 3.0.0 → 3.0.1

data/lib/hyrax/configuration.rb

@@ -367,6 +367,14 @@ module Hyrax
       @banner_image ||= 'https://user-images.githubusercontent.com/101482/29949206-ffa60d2c-8e67-11e7-988d-4910b8787d56.jpg'
     end
 
+    ##
+    # @return [Boolean]
+    def disable_wings
+      return @disable_wings unless @disable_wings.nil?
+      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_SKIP_WINGS', false))
+    end
+    attr_writer :disable_wings
+
     attr_writer :display_media_download_link
     # @return [Boolean]
     def display_media_download_link?

data/lib/hyrax/engine.rb

@@ -82,7 +82,7 @@ module Hyrax
 
     initializer 'requires' do
       require 'power_converters'
-      require 'wings'
+      require 'wings' unless Hyrax.config.disable_wings
     end
 
     initializer 'routing' do

data/lib/hyrax/valkyrie_can_can_adapter.rb

@@ -20,6 +20,8 @@ module Hyrax
     # @raise Hyrax::ObjectNotFoundError
     def self.find(_model_class, id)
       Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id)
+    rescue Valkyrie::Persistence::ObjectNotFoundError => err
+      raise Hyrax::ObjectNotFoundError, err.message
     end
   end
 end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/wings/converter_value_mapper.rb

@@ -73,7 +73,7 @@ module Wings
     end
 
     def result
-      collections = value.last.map { |id| ActiveFedora::Base.find(id.id) }
+      collections = value.last.map { |id| ActiveFedora::Base.find(id.to_s) }
       [:member_of_collections, collections]
     end
   end
@@ -86,7 +86,7 @@ module Wings
     end
 
     def result
-      members = value.last.map { |id| ActiveFedora::Base.find(id.id) }
+      members = value.last.map { |id| ActiveFedora::Base.find(id.to_s) }
       [:members, members]
     end
   end

data/lib/wings/valkyrie/persister.rb

@@ -41,9 +41,10 @@ module Wings
       # @param [Valkyrie::Resource] resource
       # @return [Valkyrie::Resource] the persisted/updated resource
       def save_all(resources:)
-        resources.map do |resource|
-          save(resource: resource)
-        end
+        resources.map { |resource| save(resource: resource) }
+      rescue ::Valkyrie::Persistence::StaleObjectError => _err
+        raise(::Valkyrie::Persistence::StaleObjectError,
+              "One or more resources have been updated by another process.")
       end
 
       # Deletes a resource persisted using ActiveFedora
@@ -51,7 +52,7 @@ module Wings
       # @return [Valkyrie::Resource] the deleted resource
       def delete(resource:)
         af_object = ActiveFedora::Base.new
-        af_object.id = resource.alternate_ids.first.to_s
+        af_object.id = resource.id
         af_object.delete
         resource
       end
@@ -84,7 +85,8 @@ module Wings
           etag_lock_token_valid?(af_object: af_object, resource: resource) &&
           last_modified_lock_token_valid?(af_object: af_object, resource: resource)
 
-        raise(::Valkyrie::Persistence::StaleObjectError, resource.id.to_s)
+        raise(::Valkyrie::Persistence::StaleObjectError,
+              "The object #{resource.id} has been updated by another process.")
       end
 
       ##

data/lib/wings/valkyrie/query_service.rb

@@ -2,16 +2,32 @@
 
 module Wings
   module Valkyrie
+    ##
+    # @note does not support duplicates!
     class QueryService
       attr_reader :adapter
       extend Forwardable
       def_delegator :adapter, :resource_factory
 
-      # @param adapter [Wings::Valkyrie::MetadataAdapter] The adapter which holds the resource_factory for this query_service.
+      ##
+      # @param adapter [Wings::Valkyrie::MetadataAdapter] The adapter which
+      #   holds the resource_factory for this query_service.
       def initialize(adapter:)
         @adapter = adapter
       end
 
+      ##
+      # @param :model [Class]
+      #
+      # @return [Integer]
+      def count_all_of_model(model:)
+        ActiveFedora::Base
+          .where(has_model_ssim: [model_class_for(model).to_rdf_representation,
+                                  model.new.internal_resource.to_s])
+          .count
+      end
+
+      ##
       # WARNING: In general, prefer find_by_alternate_identifier over this
       # method.
       #
@@ -23,14 +39,17 @@ module Wings
       # start getting ObjectNotFoundErrors instead of the objects you wanted
       #
       # Find a record using a Valkyrie ID, and map it to a Valkyrie Resource
+      #
       # @param [Valkyrie::ID, String] id
       # @return [Valkyrie::Resource]
-      # @raise [Hyrax::ObjectNotFoundError]
+      # @raise [Valkyrie::Persistence::ObjectNotFoundError]
       def find_by(id:)
         find_by_alternate_identifier(alternate_identifier: id)
       end
 
+      ##
       # Find all work/collection records, and map to Valkyrie Resources
+      #
       # @return [Array<Valkyrie::Resource>]
       def find_all
         ::ActiveFedora::Base.all.map do |obj|
@@ -38,7 +57,10 @@ module Wings
         end
       end
 
-      # Find all work/collection records of a given model, and map to Valkyrie Resources
+      ##
+      # Find all work/collection records of a given model, and map to Valkyrie
+      # Resources
+      #
       # @param model [Class]
       # @return [Array<Valkyrie::Resource>]
       def find_all_of_model(model:)
@@ -73,11 +95,14 @@ module Wings
         end
       end
 
+      ##
       # Find a record using an alternate ID, and map it to a Valkyrie Resource
+      #
       # @param [Valkyrie::ID, String] id
       # @param [boolean] optionally return ActiveFedora object/errors
+      #
       # @return [Valkyrie::Resource]
-      # @raise [Hyrax::ObjectNotFoundError]
+      # @raise [Valkyrie::Persistence::ObjectNotFoundError]
       def find_by_alternate_identifier(alternate_identifier:, use_valkyrie: true)
         raise(ArgumentError, 'id must be a Valkyrie::ID') unless
           alternate_identifier.respond_to?(:to_str)
@@ -87,12 +112,15 @@ module Wings
         use_valkyrie ? resource_factory.to_resource(object: af_object) : af_object
       rescue ActiveFedora::ObjectNotFoundError, Ldp::Gone => err
         raise err unless use_valkyrie
-        raise Hyrax::ObjectNotFoundError
+        raise ::Valkyrie::Persistence::ObjectNotFoundError
       end
 
+      ##
       # Find all members of a given resource, and map to Valkyrie Resources
+      #
       # @param resource [Valkyrie::Resource]
       # @param model [Class]
+      #
       # @return [Array<Valkyrie::Resource>]
       def find_members(resource:, model: nil)
         return [] if resource.try(:member_ids).blank?
@@ -103,21 +131,27 @@ module Wings
           .select { |member_resource| model_class_for(member_resource.class) == find_model }
       end
 
+      ##
       # Find the Valkyrie Resources referenced by another Valkyrie Resource
+      #
       # @param resource [<Valkyrie::Resource>]
       # @param property [Symbol] the property holding the references to another resource
       # @return [Array<Valkyrie::Resource>]
-      def find_references_by(resource:, property:)
-        object = resource_factory.from_resource(resource: resource)
-        object.send(property).map do |reference|
-          af_id = find_id_for(reference)
-          resource_factory.to_resource(object: ::ActiveFedora::Base.find(af_id))
+      def find_references_by(resource:, property:, model: nil)
+        return find_many_by_ids(ids: Array(resource.send(property))) unless model
+
+        results = resource.public_send(property).map do |reference|
+          resource_factory.to_resource(object: ::ActiveFedora::Base.find(reference))
         end
+
+        results.select { |r| r.class.name == model.name }
       rescue ActiveFedora::ObjectNotFoundError
         []
       end
 
+      ##
       # Get all resources which link to a resource or id with a given property.
+      #
       # @param resource [Valkyrie::Resource] The resource which is being referenced by
       #   other resources.
       # @param resource [Valkyrie::ID] The id of the resource which is being referenced by
@@ -129,30 +163,37 @@ module Wings
       # @return [Array<Valkyrie::Resource>] All resources in the persistence backend
       #   which have the ID of the given `resource` in their `property` property. Not
       #   in order.
-      def find_inverse_references_by(resource: nil, id: nil, property:)
+      def find_inverse_references_by(resource: nil, id: nil, model: nil, property:)
         raise ArgumentError, "Provide resource or id" unless resource || id
-        id ||= resource.alternate_ids.first
+        id ||= resource.id
         raise ArgumentError, "Resource has no id; is it persisted?" unless id
-        uri = Hyrax::Base.id_to_uri(id.to_s)
-        ActiveFedora::Base.where("+(#{property}_ssim: \"#{uri}\" OR #{property}_ssim: \"#{id}\")").map do |obj|
+
+        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
       end
 
+      ##
       # Find all parents of a given resource.
+      #
       # @param resource [Valkyrie::Resource] The resource whose parents are being searched
       #   for.
       # @return [Array<Valkyrie::Resource>] All resources which are parents of the given
       #   `resource`. This means the resource's `id` appears in their `member_ids`
       #   array.
       def find_parents(resource:)
-        id = resource.alternate_ids.first
-        ActiveFedora::Base.where("member_ids_ssim: \"#{id}\"").map do |obj|
+        ActiveFedora::Base.where("member_ids_ssim: \"#{resource.id}\"").map do |obj|
           resource_factory.to_resource(object: obj)
         end
       end
 
-      # Constructs a Valkyrie::Persistence::CustomQueryContainer using this query service
+      ##
+      # Constructs a Valkyrie::Persistence::CustomQueryContainer using this
+      # query service
+      #
       # @return [Valkyrie::Persistence::CustomQueryContainer]
       def custom_queries
         @custom_queries ||= ::Valkyrie::Persistence::CustomQueryContainer.new(query_service: self)
@@ -160,7 +201,9 @@ module Wings
 
       private
 
+      ##
       # Determines whether or not an Object is a Valkyrie ID
+      #
       # @param [Object] id
       # @raise [ArgumentError]
       def validate_id(id)

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.0'
+gem 'hyrax', '3.0.1'
 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.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2108,9 +2108,11 @@ files:
 - app/services/hyrax/listeners/batch_notification_listener.rb
 - app/services/hyrax/listeners/file_set_lifecycle_listener.rb
 - app/services/hyrax/listeners/file_set_lifecycle_notification_listener.rb
+- app/services/hyrax/listeners/member_cleanup_listener.rb
 - app/services/hyrax/listeners/metadata_index_listener.rb
 - app/services/hyrax/listeners/object_lifecycle_listener.rb
 - app/services/hyrax/listeners/proxy_deposit_listener.rb
+- 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/lock_manager.rb
@@ -2608,16 +2610,20 @@ files:
 - chart/hyrax/README.md
 - chart/hyrax/templates/NOTES.txt
 - chart/hyrax/templates/_helpers.tpl
+- chart/hyrax/templates/branding-pvc.yaml
 - chart/hyrax/templates/configmap-env.yaml
 - chart/hyrax/templates/cron-embargo.yaml
 - chart/hyrax/templates/cron-lease.yaml
+- chart/hyrax/templates/deployment-worker.yaml
 - chart/hyrax/templates/deployment.yaml
+- chart/hyrax/templates/derivatives-pvc.yaml
 - chart/hyrax/templates/hpa.yaml
 - chart/hyrax/templates/ingress.yaml
 - chart/hyrax/templates/secrets.yaml
 - chart/hyrax/templates/service.yaml
 - chart/hyrax/templates/serviceaccount.yaml
 - chart/hyrax/templates/tests/test-connection.yaml
+- chart/hyrax/templates/uploads-pvc.yaml
 - chart/hyrax/values.yaml
 - config/brakeman.ignore
 - config/features.rb