hyrax 5.2.0 → 5.3.0

data/.koppie/config/initializers/bulkrax.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+Rails.application.reloader.to_prepare do
+  Bulkrax.setup do |config|
+    # Add local parsers
+    # config.parsers += [
+    #   { name: 'MODS - My Local MODS parser', class_name: 'Bulkrax::ModsXmlParser', partial: 'mods_fields' },
+    # ]
+
+    # WorkType to use as the default if none is specified in the import
+    # Default is the first returned by Hyrax.config.curation_concerns, stringified
+    # config.default_work_type = "MyWork"
+
+    # Factory Class to use when generating and saving objects
+    # config.object_factory = Bulkrax::ObjectFactory
+    # Use this for a Postgres-backed Valkyrized Hyrax
+    config.object_factory = Bulkrax::ValkyrieObjectFactory
+
+    config.collection_model_class = Hyrax.config.collection_class
+    config.file_model_class = Hyrax.config.file_set_class
+
+    # Path to store pending imports
+    config.import_path = Hyrax.config.upload_path.call.join('imports').to_s
+
+    # Path to store exports before download
+    config.export_path = Hyrax.config.upload_path.call.join('exports').to_s
+
+    # Server name for oai request header
+    # config.server_name = 'my_server@name.com'
+
+    # NOTE: Creating Collections using the collection_field_mapping will no longer be supported as of Bulkrax version 3.0.
+    #       Please configure Bulkrax to use related_parents_field_mapping and related_children_field_mapping instead.
+    # Field_mapping for establishing a collection relationship (FROM work TO collection)
+    # This value IS NOT used for OAI, so setting the OAI parser here will have no effect
+    # The mapping is supplied per Entry, provide the full class name as a string, eg. 'Bulkrax::CsvEntry'
+    # The default value for CSV is collection
+    # Add/replace parsers, for example:
+    # config.collection_field_mapping['Bulkrax::RdfEntry'] = 'http://opaquenamespace.org/ns/set'
+
+    # Field mappings
+    # Create a completely new set of mappings by replacing the whole set as follows
+    #   config.field_mappings = {
+    #     "Bulkrax::OaiDcParser" => { **individual field mappings go here*** }
+    #   }
+
+    # Add to, or change existing mappings as follows
+    #   e.g. to exclude date
+    #   config.field_mappings["Bulkrax::OaiDcParser"]["date"] = { from: ["date"], excluded: true  }
+    #
+    #   e.g. to import parent-child relationships
+    #   config.field_mappings['Bulkrax::CsvParser']['parents'] = { from: ['parents'], related_parents_field_mapping: true }
+    #   config.field_mappings['Bulkrax::CsvParser']['children'] = { from: ['children'], related_children_field_mapping: true }
+    #   (For more info on importing relationships, see Bulkrax Wiki: https://github.com/samvera-labs/bulkrax/wiki/Configuring-Bulkrax#parent-child-relationship-field-mappings)
+    #
+    # #   e.g. to add the required source_identifier field
+    #   #   config.field_mappings["Bulkrax::CsvParser"]["source_id"] = { from: ["old_source_id"], source_identifier: true, search_field: 'source_id_sim' }
+    # If you want Bulkrax to fill in source_identifiers for you, see below
+
+    # To duplicate a set of mappings from one parser to another
+    #   config.field_mappings["Bulkrax::OaiOmekaParser"] = {}
+    #   config.field_mappings["Bulkrax::OaiDcParser"].each {|key,value| config.field_mappings["Bulkrax::OaiOmekaParser"][key] = value }
+
+    # Should Bulkrax make up source identifiers for you? This allow round tripping
+    # and download errored entries to still work, but does mean if you upload the
+    # same source record in two different files you WILL get duplicates.
+    # It is given two aruguments, self at the time of call and the index of the reocrd
+    #    config.fill_in_blank_source_identifiers = ->(parser, index) { "b-#{parser.importer.id}-#{index}"}
+    # or use a uuid
+    #    config.fill_in_blank_source_identifiers = ->(parser, index) { SecureRandom.uuid }
+
+    # Properties that should not be used in imports/exports. They are reserved for use by Hyrax.
+    # config.reserved_properties += ['my_field']
+
+    # List of Questioning Authority properties that are controlled via YAML files in
+    # the config/authorities/ directory. For example, the :rights_statement property
+    # is controlled by the active terms in config/authorities/rights_statements.yml
+    # Defaults: 'rights_statement' and 'license'
+    # config.qa_controlled_properties += ['my_field']
+
+    # Specify the delimiter regular expression for splitting an attribute's values into a multi-value array.
+    # config.multi_value_element_split_on = /\s*[:;|]\s*/.freeze
+
+    # Specify the delimiter for joining an attribute's multi-value array into a string.  Note: the
+    # specific delimeter should likely be present in the multi_value_element_split_on expression.
+    # config.multi_value_element_join_on = ' | '
+  end
+
+  # Sidebar for hyrax 3+ support
+  # rubocop:disable Style/IfUnlessModifier
+  if Object.const_defined?(:Hyrax) && ::Hyrax::DashboardController&.respond_to?(:sidebar_partials)
+    Hyrax::DashboardController.sidebar_partials[:repository_content] << "hyrax/dashboard/sidebar/bulkrax_sidebar_additions"
+  end
+end

data/.koppie/config/initializers/clamav.rb

@@ -1,2 +1,4 @@
 # frozen_string_literal: true
 ClamAV.instance.loaddb if defined? ClamAV
+
+Clamby.configure(daemonize: true, fdpass: true) if defined? Clamby

data/.koppie/config/initializers/hyrax.rb

@@ -139,7 +139,7 @@ Hyrax.config do |config|
   config.iiif_image_server = true
 
   # Returns a URL that resolves to an image provided by a IIIF image server
-  config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
+  config.iiif_image_url_builder = lambda do |file_id, base_url, size, _format|
     Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
   end
   # config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
@@ -258,6 +258,9 @@ Hyrax.config do |config|
   # config.admin_set_model = 'AdminSet'
   config.admin_set_model = 'Hyrax::AdministrativeSet'
 
+  config.file_set_model = 'FileSet'
+
+  config.work_default_metadata = false
   # When your application is ready to use the valkyrie index instead of the one
   # maintained by active fedora, you will need to set this to true. You will
   # also need to update your Blacklight configuration.
@@ -318,6 +321,11 @@ Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Loca
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
 
 Rails.application.reloader.to_prepare do
+  # set bulkrax default work type to first curation_concern if it isn't already set
+  if Bulkrax.default_work_type.blank?
+    Bulkrax.default_work_type = Hyrax.config.curation_concerns.first.to_s
+  end
+
   custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
                     Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
                     Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
@@ -332,11 +340,11 @@ Rails.application.reloader.to_prepare do
                     Hyrax::CustomQueries::FindManyByAlternateIds,
                     Hyrax::CustomQueries::FindModelsByAccess,
                     Hyrax::CustomQueries::FindCountBy,
-                    Hyrax::CustomQueries::FindByDateRange]
+                    Hyrax::CustomQueries::FindByDateRange,
+                    Hyrax::CustomQueries::FindByPropertyValue]
   custom_queries.each do |handler|
     Hyrax.query_service.custom_queries.register_query_handler(handler)
   end
 end
 
-
 ActiveFedora.init(solr_config_path: Rails.root.join('config', 'solr.yml'))

data/.koppie/config/initializers/riiif.rb

@@ -13,7 +13,7 @@ Rails.application.reloader.to_prepare do
   end
 
   if Hyrax.config.use_valkyrie?
-    Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
+    Riiif::Image.file_resolver = Hyrax::Riiif::FileResolver.new
   else
     Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
 
@@ -30,85 +30,7 @@ Rails.application.reloader.to_prepare do
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
   Riiif::Engine.config.cache_duration = 1.day
+  # Defaults to using Imagemagick - Set use_vips to true in order to use vips. lib-vips is already installed as part of hyrax-base
+  # Must be using riiif 2.8 or newer
+  Riiif::Engine.config.use_vips = true
 end
-
-module Hyrax
-  # Adds file locking to Riiif::File
-  # @see RiiifFileResolver
-  Rails.application.reloader.to_prepare do
-    class RiiifFile < Riiif::File
-      include ActiveSupport::Benchmarkable
-
-      attr_reader :id
-      def initialize(input_path, tempfile = nil, id:)
-        super(input_path, tempfile)
-        raise(ArgumentError, "must specify id") if id.blank?
-        @id = id
-      end
-
-      # Wrap extract in a read lock and benchmark it
-      def extract(transformation, image_info = nil)
-        Riiif::Image.file_resolver.file_locks[id].with_read_lock do
-          benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
-            super
-          end
-        end
-      end
-
-      private
-
-      def logger
-        Hyrax.logger
-      end
-    end
-  end
-
-
-  class RiiifFileResolver
-    include ActiveSupport::Benchmarkable
-
-    # @param [String] id from iiif manifest
-    # @return [Riiif::File]
-    def find(id)
-      path = nil
-      file_locks[id].with_write_lock do
-        path = build_path(id)
-        path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
-      end
-      RiiifFile.new(path, id: id)
-    end
-
-    # tracks individual file locks
-    # @see RiiifFile
-    # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
-    def file_locks
-      @file_locks ||= Concurrent::Map.new do |k, v|
-        k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
-      end
-    end
-
-    private
-
-    def build_path(id, force: false)
-      Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
-                               expires_in: Riiif::Image.expires_in,
-                               force: force) do
-        load_file(id)
-      end
-    end
-
-    def load_file(id)
-      benchmark "RiiifFileResolver loaded #{id}", level: :debug do
-        fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
-        file_set = Hyrax.query_service.find_by(id: fs_id)
-        file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
-        file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
-      end
-    end
-
-    def logger
-      Hyrax.logger
-    end
-  end
-end
-