hyrax 5.2.0 → 5.3.0

data/.dassie/config/initializers/hyrax.rb

@@ -23,7 +23,7 @@ Hyrax.config do |config|
   config.characterization_options = { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
 
   # 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
 
@@ -66,6 +66,7 @@ Hyrax.config do |config|
   # config.collection_model = 'CollectionResource'    # collection with basic metadata
   # config.admin_set_model = 'Hyrax::AdministrativeSet'
 
+  config.work_default_metadata = false
   # dassie needs legacy AF models
   # If using Frayja/Frigg then use the resource they provide
   if Hyrax.config.valkyrie_transition?
@@ -85,3 +86,8 @@ Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
 Qa::Authorities::Local.register_subauthority('subjects', 'Qa::Authorities::Local::TableBasedAuthority')
 Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority')
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
+
+# 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

data/.dassie/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,83 +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
-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
+  # 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 git ref 9a375 or newer
+  # Riiif::Engine.config.use_vips = false
 end

data/.dassie/config/initializers/wings.rb

@@ -52,7 +52,7 @@ if Hyrax.config.valkyrie_transition?
       Hyrax::CustomQueries::FindModelsByAccess,
       Hyrax::CustomQueries::FindCountBy,
       Hyrax::CustomQueries::FindByDateRange,
-      # Hyrax::CustomQueries::FindBySourceIdentifier  # from bulkrax
+      Hyrax::CustomQueries::FindByPropertyValue
     ].each do |handler|
       Hyrax.query_service.services[0].custom_queries.register_query_handler(handler)
     end