hyrax 4.0.0.beta1 → 4.0.0.rc1

data/lib/hyrax/configuration.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'hyrax/role_registry'
-require 'samvera/nesting_indexer'
 
 module Hyrax
   ##
@@ -65,12 +64,24 @@ module Hyrax
       @registered_concerns = []
       @role_registry = Hyrax::RoleRegistry.new
       @default_active_workflow_name = DEFAULT_ACTIVE_WORKFLOW_NAME
-      @nested_relationship_reindexer = default_nested_relationship_reindexer
     end
 
     DEFAULT_ACTIVE_WORKFLOW_NAME = 'default'
     private_constant :DEFAULT_ACTIVE_WORKFLOW_NAME
 
+    # Set the default logger for Hyrax.
+    attr_writer :logger
+
+    ##
+    # @return [Logger]
+    def logger
+      @logger ||= if defined?(Rails)
+                    Rails.logger
+                  else
+                    Valkyrie.logger
+                  end
+    end
+
     # @api public
     # When an admin set is created, we need to activate a workflow.
     # The :default_active_workflow_name is the name of the workflow we will activate.
@@ -643,7 +654,7 @@ module Hyrax
       # overriding the value in0 their config unless it's already
       # flipped to false
       if ENV.fetch('SERVER_SOFTWARE', '').match(/Apache.*Phusion_Passenger/).present?
-        Rails.logger.warn('Cannot enable realtime notifications atop Passenger + Apache. Coercing `Hyrax.config.realtime_notifications` to `false`. Set this value to `false` in config/initializers/hyrax.rb to stop seeing this warning.') unless @realtime_notifications == false
+        Hyrax.logger.warn('Cannot enable realtime notifications atop Passenger + Apache. Coercing `Hyrax.config.realtime_notifications` to `false`. Set this value to `false` in config/initializers/hyrax.rb to stop seeing this warning.') unless @realtime_notifications == false
         @realtime_notifications = false
       end
       return @realtime_notifications unless @realtime_notifications.nil?
@@ -827,18 +838,7 @@ module Hyrax
 
     attr_writer :uploader
     def uploader
-      @uploader ||= if Rails.env.development?
-                      # use sequential uploads in development to avoid database locking problems with sqlite3.
-                      default_uploader_config.merge(limitConcurrentUploads: 1, sequentialUploads: true)
-                    else
-                      default_uploader_config
-                    end
-    end
-
-    attr_accessor :nested_relationship_reindexer
-
-    def default_nested_relationship_reindexer
-      ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
+      @uploader ||= default_uploader_config
     end
 
     attr_writer :solr_select_path
@@ -846,6 +846,11 @@ module Hyrax
       @solr_select_path ||= ActiveFedora.solr_config.fetch(:select_path, 'select')
     end
 
+    attr_writer :solr_default_method
+    def solr_default_method
+      @solr_default_method ||= :post
+    end
+
     attr_writer :identifier_registrars
     def identifier_registrars
       @identifier_registrars ||= {}
@@ -865,6 +870,16 @@ module Hyrax
       @range_for_number_of_results_to_display_per_page ||= [10, 20, 50, 100]
     end
 
+    attr_writer :derivative_services
+    # The registered candidate derivative services.  In the array, the first `valid?` candidate will
+    # handle the derivative generation.
+    #
+    # @return [Array] of objects that conform to Hyrax::DerivativeService interface.
+    # @see Hyrax::DerivativeService
+    def derivative_services
+      @derivative_services ||= [Hyrax::FileSetDerivativesService]
+    end
+
     private
 
     # @param [Symbol, #to_s] model_name - symbol representing the model

data/lib/hyrax/controlled_vocabulary/importer/language.rb

@@ -13,7 +13,7 @@ module Hyrax
           stdout_logger.formatter = proc do |_severity, _datetime, _progname, msg|
             "#{msg}\n"
           end
-          Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
+          Hyrax.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
         end
 
         def import

data/lib/hyrax/engine.rb

@@ -68,7 +68,7 @@ module Hyrax
 
       can_persist = can_connect && begin
         Hyrax.config.persist_registered_roles!
-        Rails.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
+        Hyrax.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
         true
                                    rescue ActiveRecord::StatementInvalid
                                      false
@@ -78,12 +78,15 @@ module Hyrax
         message = "Hyrax::Engine.after_initialize - unable to persist registered roles.\n"
         message += "It is expected during the application installation - during integration tests, rails install.\n"
         message += "It is UNEXPECTED if you are booting up a Hyrax powered application via `rails server'"
-        Rails.logger.info(message)
+        Hyrax.logger.info(message)
       end
+
+      # Force CatalogController to use our SearchState class, which has an important
+      # work-around for some highly suspect SPARQL-gem monkeypatching.
+      CatalogController.search_state_class = Hyrax::SearchState if CatalogController.try(:search_state_class) == Blacklight::SearchState
     end
 
     initializer 'requires' do
-      require 'power_converters'
       require 'wings' unless Hyrax.config.disable_wings
     end
 

data/lib/hyrax/errors.rb

@@ -15,4 +15,6 @@ module Hyrax
   class SingleMembershipError < HyraxError; end
 
   class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError; end
+
+  class ModelMismatchError < HyraxError; end
 end

data/lib/hyrax/publisher.rb

@@ -119,6 +119,10 @@ module Hyrax
     #     unique id), AND a `:user` (the ::User responsible for the update).
     register_event('collection.membership.updated')
 
+    # @since 3.5.0
+    # @macro a_registered_event
+    register_event('file.characterized')
+
     # @since 3.3.0
     # @macro a_registered_event
     register_event('file.downloaded')

data/lib/hyrax/search_state.rb

@@ -9,5 +9,14 @@ module Hyrax
       return [hyrax, doc] if doc.collection?
       [main_app, doc]
     end
+
+    # The SPARQL gem stomps on the Rails definition of deep_dup and gives us a Hash instead of
+    # a HashWithIndifferentAccess. This is an ugly workaround to get the right contract with
+    # the upstream class.
+    # https://github.com/ruby-rdf/sparql/blob/develop/lib/sparql/algebra/extensions.rb#L238-L244
+    def to_hash
+      super.with_indifferent_access
+    end
+    alias to_h to_hash
   end
 end

data/lib/hyrax/specs/capybara.rb

@@ -23,12 +23,12 @@ if ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
   args = %w[disable-gpu no-sandbox whitelisted-ips window-size=1400,1400]
   args.push('headless') if ActiveModel::Type::Boolean.new.cast(ENV['CHROME_HEADLESS_MODE'])
 
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome("goog:chromeOptions" => { args: args })
+  options = Selenium::WebDriver::Options.chrome("goog:chromeOptions" => { args: args })
 
   Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
     driver = Capybara::Selenium::Driver.new(app,
                                        browser: :remote,
-                                       desired_capabilities: capabilities,
+                                       capabilities: options,
                                        url: ENV['HUB_URL'])
 
     # Fix for capybara vs remote files. Selenium handles this for us

data/lib/hyrax/specs/shared_specs/factories/strategies/json_strategy.rb

@@ -10,4 +10,8 @@ class JsonStrategy
   def result(evaluation)
     @strategy.result(evaluation).to_json
   end
+
+  def to_sym
+    :json
+  end
 end

data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb

@@ -3,6 +3,12 @@
 # @example
 #   let(:resource) { FactoryBot.valkyrie_create(:hyrax_work) }
 class ValkyrieCreateStrategy
+  def initialize
+    @strategy = FactoryBot.strategy_by_name(:create).new
+  end
+
+  delegate :association, to: :@strategy
+
   def result(evaluation)
     evaluation.notify(:after_build, evaluation.object)
     evaluation.notify(:before_create, evaluation.object)
@@ -13,6 +19,10 @@ class ValkyrieCreateStrategy
     result
   end
 
+  def to_sym
+    :valkyrie_create
+  end
+
   private
 
   def persister

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -266,6 +266,11 @@ RSpec.shared_examples 'a Collection indexer' do
         .to include(generic_type_sim: a_collection_containing_exactly('Collection'))
     end
 
+    it 'indexes member_of_collection_ids' do
+      expect(indexer.to_solr)
+        .to include(member_of_collection_ids_ssim: resource.member_of_collection_ids)
+    end
+
     it 'indexes depositor' do
       expect(indexer.to_solr)
         .to include(depositor_ssim: [resource.depositor],

data/lib/hyrax/transactions/container.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require "dry/transaction"
-require "dry/transaction/operation"
 
 module Hyrax
   module Transactions

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

@@ -32,15 +32,41 @@ module Hyrax
         # @return [Dry::Monads::Result]
         def call(file_set, user: nil)
           return Failure('No user provided.') if user.nil?
-
-          @query_service.find_parents(resource: file_set).each do |parent|
+          find_parents(resource: file_set).each do |parent|
             parent.member_ids -= [file_set.id]
+            unlink_file_set(parent: parent, file_set: file_set)
             saved = @persister.save(resource: parent)
             Hyrax.publisher.publish('object.metadata.updated', object: saved, user: user)
           end
-
           Success(file_set)
         end
+
+        private
+
+        def find_parents(resource:)
+          @query_service.find_parents(resource: resource)
+        end
+
+        def unlink_file_set(parent:, file_set:)
+          fid = file_set.id
+          unlink_thumbnail_id(fid: fid, parent: parent)
+          unlink_representative_id(fid: fid, parent: parent)
+          unlink_rendering_ids(fid: fid, parent: parent)
+        end
+
+        def unlink_rendering_ids(fid:, parent:)
+          parent.rendering_ids -= [fid] if parent.respond_to?(:rendering_ids) && parent.rendering_ids.present?
+        end
+
+        def unlink_representative_id(fid:, parent:)
+          parent.representative_id = nil if parent.representative_id == fid
+        end
+
+        def unlink_thumbnail_id(fid:, parent:)
+          return unless parent.thumbnail_id == fid
+          parent.thumbnail = nil if parent.respond_to? :thumbnail
+          parent.thumbnail_id = nil
+        end
       end
     end
   end

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

@@ -16,13 +16,29 @@ module Hyrax
         # @param [Valkyrie::Resource] obj
         #
         # @return [Dry::Monads::Result]
-        def call(obj)
+        def call(obj, permissions_params: [])
           return Success(obj) unless obj.respond_to?(:permission_manager)
+
           acl = obj.permission_manager&.acl
+          # Translate step args into Hyrax::Permission objects before saving
+          Array(permissions_params).each do |param|
+            permission = param_to_permission(obj, param)
+            acl << permission if permission
+          end
+
           acl&.save || (return Failure[:failed_to_save_acl, acl])
 
           Success(obj)
         end
+
+        private
+
+        def param_to_permission(obj, param)
+          return nil unless param["access"] && param["type"] && param["name"]
+          mode = param["access"].to_sym
+          agent = param["type"] == "group" ? "group/#{param['name']}" : param["name"]
+          Hyrax::Permission.new(access_to: obj.id, mode: mode, agent: agent)
+        end
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Hyrax
       # to be used as a the banner for the collection.
       #
       class SaveCollectionBanner
-        include Dry::Transaction::Operation
+        include Dry::Monads[:result]
 
         ##
         # @param [Hyrax::ChangeSet] change_set

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

@@ -9,7 +9,7 @@ module Hyrax
       # to be used as logo(s) for the collection.
       #
       class SaveCollectionLogo
-        include Dry::Transaction::Operation
+        include Dry::Monads[:result]
 
         ##
         # @param [Hyrax::ChangeSet] change_set

data/lib/hyrax/version.rb

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

data/lib/hyrax.rb

@@ -80,7 +80,7 @@ module Hyrax
   ##
   # @return [Logger]
   def self.logger
-    @logger ||= Valkyrie.logger
+    config.logger
   end
 
   def self.primary_work_type

data/lib/tasks/migrate.rake

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 namespace :hyrax do
   namespace :migrate do
+    desc 'Move all works to default AdminSet'
     task move_all_works_to_admin_set: :environment do
       require 'hyrax/move_all_works_to_admin_set'
       MoveAllWorksToAdminSet.run(AdminSet.find(AdminSet::DEFAULT_ID))
     end
 
+    desc 'Add the MANAGING role to legacy works'
     task add_admin_group_to_admin_sets: :environment do
       # Force creation of registered MANAGING role if it doesn't exist
       # This code must be invoked before calling `Sipity::Role.all` or the managing role won't be there
@@ -28,6 +30,7 @@ namespace :hyrax do
       end
     end
 
+    desc 'Set collection type and permissions for legacy (<2.1.0) Hyrax collections'
     task add_collection_type_and_permissions_to_collections: :environment do
       # Run collection migration which sets the collection_type of legacy collections to User Collection and adds
       # a permission template assigning users/groups with edit_access to the Manager role and users/groups with
@@ -37,7 +40,8 @@ namespace :hyrax do
     end
 
     # Migrate any orphan fedora data from the first to the second predicate
-    task migrate_keyword_predicate: :environment do
+    desc 'Migrate keywords and license predicates for Hyrax 2.x --> 3.x'
+    task migrate_keyword_and_license_predicate: :environment do
       Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC11.relation, ::RDF::Vocab::SCHEMA.keywords)
       Hyrax::Works::MigrationService.migrate_predicate(::RDF::Vocab::DC.rights, ::RDF::Vocab::DC.license)
     end

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

@@ -62,7 +62,7 @@ module Valkyrie
             # generator now (if not, the application has bigger problems
             # than this missing configuration)
             bl_index = Blacklight.default_index.connection.uri
-          rescue RuntimeError
+          rescue StandardError
             return {}
           end
 

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -9,7 +9,7 @@ module Wings
         # skip reserved attributes, we assume we don't need to translate valkyrie internals
         schema = resource_class.schema.reject do |key|
           resource_class.reserved_attributes.include?(key.name) ||
-            key.name == :size
+            key.name == :size || key.name == :has_model
         end
 
         Wings::ActiveFedoraConverter.apply_properties(self, schema)

data/lib/wings/valkyrie/storage.rb

@@ -73,7 +73,7 @@ module Wings
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object
                          .object
-          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
+          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
         end.sort
       end
 
@@ -86,7 +86,7 @@ module Wings
       # 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
+      Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
         include Comparable
 
         ##
@@ -95,6 +95,10 @@ module Wings
           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