iiif_print 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01fd18bb505838305103b589e56d196fbc346eb00390de671c53bb15083a39d6
-  data.tar.gz: c7bf87ae11b5ae00b597076254d897c9519fc2bf9facd777763861dcca511adf
+  metadata.gz: 2ccac310b7d9a84e367cec7ea055b4b2b9af2d9817cbef9ccfaf3c68d467ce40
+  data.tar.gz: 621bb63d8990014bd1a4842ef6897628386515e6a3bcc76f0d212ba59a318f0e
 SHA512:
-  metadata.gz: 3eee1a13ecdf5693e0dd987a9331d527fcf884d0c8dc10ea12b14f7b99165a3f13b712ac5cfddb6d1579fbd33ce6fc0945c1bc2c3195ff1aff7c56637e3aee46
-  data.tar.gz: 1a85675fa01612c0fc9115e2f1cf524fae745d6a2c4b8b897b283c4272bd1583ef3c40e5e9b605591cc36a641a4f8aedb8c5b022a90534bbb31f725aa670e8be
+  metadata.gz: 687953bee3a35e17c5ed41e34e29324c7166736397356131f40f3e56b7f623004f9c07a8ff55019347288811740e8f3064dd5673f71357e4d6f153a79dcf8bb6
+  data.tar.gz: cdb91f7cbe9a6fd603f3ad5e38058dac9e8da93f1d10bd932e0a843deae24cb830f090c533b9e7bfb4dbdd9eb1fcd8509377d5bc34db41df92cd5321e19ee9bc

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: /app/samvera/hyrax-webapp
   specs:
-    iiif_print (3.2.0)
+    iiif_print (3.2.1)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)
       nokogiri (>= 1.13.2)
       rdf-vocab (~> 3.0)
-      request_store (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -66,7 +65,7 @@ GEM
       activemodel (= 5.2.8.1)
       activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activerecord-import (2.2.0)
+    activerecord-import (2.3.0)
       activerecord (>= 4.2)
     activestorage (5.2.8.1)
       actionpack (= 5.2.8.1)
@@ -81,19 +80,19 @@ GEM
       public_suffix (>= 2.0.2, < 8.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
-    anonymous_loader (0.1.2)
-      version_gem (~> 1.1, >= 1.1.13)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
     arel (9.0.0)
     ast (2.4.2)
-    auth-sanitizer (0.2.2)
-      version_gem (~> 1.1, >= 1.1.10)
+    auth-sanitizer (0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     awesome_nested_set (3.9.0)
       activerecord (>= 4.0.0, < 8.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1262.0)
-    aws-sdk-core (3.252.0)
+    aws-partitions (1.1293.0)
+    aws-sdk-core (3.254.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -101,15 +100,15 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.129.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-kms (1.130.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.226.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-s3 (1.230.0)
+      aws-sdk-core (~> 3, >= 3.254.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sqs (1.116.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-sqs (1.117.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -123,7 +122,7 @@ GEM
       i18n
     bcrypt (3.1.21)
     benchmark (0.3.0)
-    bigdecimal (4.1.2)
+    bigdecimal (4.1.3)
     bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
@@ -193,7 +192,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    csv (3.3.5)
+    csv (3.3.6)
     database_cleaner (1.99.0)
     date (3.3.4)
     declarative (0.0.20)
@@ -354,8 +353,8 @@ GEM
       logger
     hiredis (0.6.3)
     htmlentities (4.4.2)
-    http_logger (1.0.2)
-    httparty (0.24.2)
+    http_logger (1.0.3)
+    httparty (0.24.3)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -468,7 +467,7 @@ GEM
       activesupport (>= 3.2.18)
       faraday (>= 0.9)
       json
-    iiif_manifest (1.6.0)
+    iiif_manifest (1.7.0)
       activesupport (>= 4)
     jaro_winkler (1.5.6)
     jbuilder (2.12.0)
@@ -498,7 +497,7 @@ GEM
     json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
-    json-schema (6.2.0)
+    json-schema (6.2.1)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
     jwt (2.10.3)
@@ -590,7 +589,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2026.0414)
+    mime-types-data (3.2026.1006)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -622,16 +621,17 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oauth (1.1.7)
-      auth-sanitizer (~> 0.2, >= 0.2.1)
+    oauth (1.1.8)
+      anonymous_loader (~> 0.1, >= 0.1.3)
+      auth-sanitizer (~> 0.2, >= 0.2.3)
       base64 (~> 0.1)
-      oauth-tty (~> 1.0, >= 1.0.10)
-      snaky_hash (~> 2.0, >= 2.0.5)
-      version_gem (~> 1.1, >= 1.1.12)
-    oauth-tty (1.0.12)
-      anonymous_loader (~> 0.1, >= 0.1.1)
-      auth-sanitizer (~> 0.2, >= 0.2.2)
-      version_gem (~> 1.1, >= 1.1.12)
+      oauth-tty (~> 1.0, >= 1.0.13)
+      snaky_hash (~> 2.0, >= 2.0.7)
+      version_gem (~> 1.1, >= 1.1.14)
+    oauth-tty (1.0.13)
+      anonymous_loader (~> 0.1, >= 0.1.3)
+      auth-sanitizer (~> 0.2, >= 0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -891,9 +891,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (4.10.1)
-    snaky_hash (2.0.6)
+    snaky_hash (2.0.7)
       hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
+      version_gem (~> 1.1, >= 1.1.14)
     solargraph (0.48.0)
       backport (~> 1.2)
       benchmark
@@ -944,7 +944,7 @@ GEM
       matrix (~> 0.4)
       rdf (~> 3.2)
     sync (0.5.0)
-    temple (0.10.4)
+    temple (0.10.7)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terminal-table (4.0.0)
@@ -972,7 +972,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
-    unicode-types (1.11.0)
+    unicode-types (1.12.0)
     valkyrie (2.2.0)
       activemodel
       activesupport
@@ -988,7 +988,7 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.13)
+    version_gem (1.1.15)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (3.7.0)

data/app/presenters/iiif_print/work_show_presenter_decorator.rb

@@ -1,7 +1,20 @@
 # frozen_string_literal: true
 
 module IiifPrint
+  # @deprecated IiifPrint has not applied this since 3.0; Hyrax::WorkShowPresenter#iiif_viewer? now counts
+  #   images on child works. Removed in IiifPrint 4.0.
   module WorkShowPresenterDecorator
+    DEPRECATION_MESSAGE = "IiifPrint::WorkShowPresenterDecorator is deprecated and will be removed in IiifPrint 4.0; " \
+                          "Hyrax::WorkShowPresenter#iiif_viewer? now counts images on child works."
+
+    def self.prepended(_base)
+      Deprecation.warn(self, DEPRECATION_MESSAGE)
+    end
+
+    def self.included(_base)
+      Deprecation.warn(self, DEPRECATION_MESSAGE)
+    end
+
     delegate :member_ids, to: :solr_document
     alias file_set_ids member_ids
 

data/app/services/iiif_print/manifest_builder_service_decorator.rb

@@ -65,14 +65,19 @@ module IiifPrint
     end
 
     def sanitize_v3(hash:, presenter:, solr_doc_hits:)
-      hash['label']['none'].map! { |text| CGI.unescapeHTML(sanitize_value(text)) } if hash.key('label')
+      sanitize_v3_label(hash)
       hash['items'].each do |canvas|
-        canvas['label']['none'].map! { |text| CGI.unescapeHTML(sanitize_value(text)) }
+        sanitize_v3_label(canvas)
         apply_metadata_to_canvas(canvas: canvas, presenter: presenter, solr_doc_hits: solr_doc_hits)
       end
       hash
     end
 
+    # A v3 label is a language map: { 'none' => [...] }, { 'en' => [...] }, ...
+    def sanitize_v3_label(node)
+      node['label']&.each_value { |texts| texts.map! { |text| CGI.unescapeHTML(sanitize_value(text)) } }
+    end
+
     def apply_metadata_to_canvas(canvas:, presenter:, solr_doc_hits:)
       return if @child_works.empty?
 
@@ -152,6 +157,6 @@ module IiifPrint
       results
     end
   end
-  # rubocop:enable Metrics/ClassLength
+  # rubocop:enable Metrics/ModuleLength
 end
 Hyrax::ManifestBuilderService.prepend(IiifPrint::ManifestBuilderServiceDecorator)

data/app/transactions/hyrax/transactions/steps/delete_all_file_sets_decorator.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 5.0.0rc2 to add file_set.iiif_print_conditionally_destroy_spawned_children with user args
+# OVERRIDE Hyrax 5.3.1
+#   - add file_set.iiif_print_conditionally_destroy_spawned_children with user args
+#   - skip file_set.remove_from_work when WorkDestroy can repair the work itself (samvera/hyrax#7682)
+#   - fail without a user, as Hyrax does from samvera/hyrax#7682
 
 module Hyrax
   module Transactions
@@ -16,19 +19,39 @@ module Hyrax
         def call(resource, user: nil)
           return Failure(:resource_not_persisted) unless resource.persisted?
 
+          # OVERRIDE: iiif_print step args, and remove_from_work only when needed
+          destroy = iiif_print_file_set_destroy(user: user)
           @query_service.custom_queries.find_child_file_sets(resource: resource).each do |file_set|
-            return Failure[:failed_to_delete_file_set, file_set] unless
-              Hyrax::Transactions::Container['file_set.destroy']
-              .with_step_args('file_set.remove_from_work' => { user: user },
-                              'file_set.delete' => { user: user },
-                              'file_set.iiif_print_conditionally_destroy_spawned_children' => { user: user })
-              .call(file_set).success?
+            # OVERRIDE: require a user
+            return Failure[:failed_to_delete_file_set, file_set] unless user && destroy.call(file_set).success?
           rescue ::Ldp::Gone
             nil
           end
 
           Success(resource)
         end
+
+        private
+
+        def iiif_print_file_set_destroy(user:)
+          transaction = Hyrax::Transactions::Container['file_set.destroy'].dup
+          step_args = { 'file_set.delete' => { user: user },
+                        'file_set.iiif_print_conditionally_destroy_spawned_children' => { user: user } }
+          if work_destroy_repairs_members?
+            # The work is about to be deleted; removing each file set from it would only re-save
+            # and re-index it, and queue update events for an object that will be gone.
+            transaction.steps -= ['file_set.remove_from_work']
+          else
+            step_args['file_set.remove_from_work'] = { user: user }
+          end
+          transaction.with_step_args(**step_args)
+        end
+
+        # Without this repair, a failed later step would leave the surviving work listing
+        # file sets that no longer exist, so they must be removed from it as they go.
+        def work_destroy_repairs_members?
+          Hyrax::Transactions::WorkDestroy.private_method_defined?(:remove_missing_members)
+        end
       end
     end
   end

data/iiif_print.gemspec

@@ -25,7 +25,6 @@ SUMMARY
   spec.add_dependency 'hyrax', '>= 2.5', '< 6'
   spec.add_dependency 'nokogiri', '>=1.13.2'
   spec.add_dependency 'rdf-vocab', '~> 3.0'
-  spec.add_dependency 'request_store', '>= 1.0'
 
   spec.add_development_dependency 'bixby'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'

data/lib/iiif_print/catalog_search_builder.rb

@@ -24,12 +24,10 @@ module IiifPrint
 
     # rubocop:enable Naming/PredicateName
     def show_parents_only(solr_parameters)
-      query = if blacklight_params["include_child_works"] == 'true'
-                IiifPrint.solr_construct_query(is_child_bsi: 'true')
-              else
-                IiifPrint.solr_construct_query(is_child_bsi: nil)
-              end
-      solr_parameters[:fq] += [query]
+      return if blacklight_params["include_child_works"] == 'true'
+
+      # Only child works are left out; a work indexed with is_child_bsi false is not a child.
+      solr_parameters[:fq] += ['-is_child_bsi:true']
     end
   end
 end

data/lib/iiif_print/current.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module IiifPrint
+  ##
+  # Per-request state.  Rails resets it around every request and job, where RequestStore was only cleared by its
+  # Rack middleware and so lived as long as a job's thread.
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :anonymous_ability, :presenters, :view_definitions
+  end
+end

data/lib/iiif_print/engine.rb

@@ -2,7 +2,6 @@ require 'active_fedora'
 require 'hyrax'
 require 'blacklight_iiif_search'
 require 'derivative_rodeo'
-require 'request_store'
 
 module IiifPrint
   # module constants:
@@ -43,11 +42,10 @@ module IiifPrint
       #   To configure specific services, inject each service, in desired order
       #   to IiifPrint::PluggableDerivativeService.plugins array.
 
-      Hyrax::DerivativeService.services.unshift(
-        IiifPrint::PluggableDerivativeService
-      )
+      derivative_services = Hyrax::DerivativeService.services
+      derivative_services.unshift(IiifPrint::PluggableDerivativeService) unless derivative_services.include?(IiifPrint::PluggableDerivativeService)
 
-      Hyrax.publisher.subscribe(IiifPrint::Listener.new) if Hyrax.respond_to?(:publisher)
+      IiifPrint.subscribe_listener if Hyrax.respond_to?(:publisher)
 
       # Load locales early so decorators can use them during initialization
       I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.yml'),

data/lib/iiif_print/flexibility/compound_values.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module IiifPrint
+  module Flexibility
+    ##
+    # A compound field's entries, one paragraph each, rendered the way its show page renders them.
+    class CompoundValues
+      # @return [Boolean] whether the entry has no value to show
+      def self.blank_entry?(entry)
+        Array(entry.try(:values) || entry).none?(&:present?)
+      end
+
+      # @param field_name [Symbol]
+      # @param presenter [#solr_document] the record's show presenter
+      # @param sanitize [#call] makes rendered html IIIF-safe
+      def initialize(field_name, presenter:, sanitize:)
+        @field_name = field_name
+        @presenter = presenter
+        @sanitize = sanitize
+      end
+
+      # @param entries [Array<Hash>]
+      # @return [String] html
+      def to_html(entries)
+        subproperties = compound_subproperties
+        entries.reject { |entry| self.class.blank_entry?(entry) }
+               .map { |entry| "<p>#{entry_html(entry, subproperties)}</p>" }.join
+      end
+
+      private
+
+      # As Hyrax's compound renderer, and any decorator the app gives it, renders the entry, with a line break where
+      # each innermost block ended, since IIIF allows no blocks.
+      def entry_html(entry, subproperties)
+        return plain_html(entry) unless defined?(Hyrax::Renderers::CompoundAttributeRenderer)
+
+        renderer = Hyrax::Renderers::CompoundAttributeRenderer.new(@field_name, [entry], subproperties: subproperties)
+        fragment = Nokogiri::HTML.fragment(renderer.render_value)
+        fragment.css('div').each { |div| div.add_next_sibling('<br>') unless div.at_css('div') }
+        @sanitize.call(fragment.to_html).gsub(/\s*<br>\s*/, '<br>').sub(/(<br>)+\z/, '')
+      end
+
+      def plain_html(entry)
+        Array(entry.try(:values) || entry).reject(&:blank?).map { |value| ERB::Util.h(value) }.join('<br>')
+      end
+
+      # The lookup Hyrax's PresentsAttributes#compound_subproperties_for makes, which is private.
+      def compound_subproperties
+        return unless defined?(Hyrax::CompoundSchema) && @presenter.respond_to?(:solr_document)
+
+        Hyrax::CompoundSchema.for_solr_document(@presenter.solr_document).definition_for(@field_name)&.fetch(:subproperties, nil)
+      rescue StandardError => e
+        Rails.logger.debug("IiifPrint could not read #{@field_name}'s compound sub-properties: #{e.message}")
+        nil
+      end
+    end
+  end
+end

data/lib/iiif_print/flexibility/fields.rb

@@ -52,6 +52,7 @@ module IiifPrint
         !(options[:admin_only] || options[:editor_only] || options[:show_page] == false)
       end
 
+      # Mirrors Hyrax's AttributesHelper#conform_options, so a field is labeled as its show page labels it.
       def label(name, options)
         labels = options[:display_label] || {}
         label = (labels[I18n.locale.to_s] || labels['default'] || name).to_s

data/lib/iiif_print/flexibility/values.rb

@@ -22,16 +22,16 @@ module IiifPrint
         @autolink = autolink
       end
 
-      # @return [Array] the field's values as stored, blanks dropped
+      # @return [Array] the field's values as stored, blanks and all-blank compound entries dropped
       def raw(field_name)
-        Array(@presenter.try(field_name)).reject(&:blank?)
+        Array(@presenter.try(field_name)).reject { |value| CompoundValues.blank_entry?(value) }
       end
 
       # @return [Array<String>] the field's values as html
       def rendered(field_name, options)
         options ||= {}
         values = Array(@presenter.try(field_name)).reject(&:blank?)
-        return [values.map { |entry| "<p>#{compound_value(field_name, entry)}</p>" }.join] if options[:render_as].to_s == 'compound'
+        return [compound_values(field_name, values)] if options[:render_as].to_s == 'compound'
 
         labels = labels_for(field_name, values)
         values.map { |value| value(field_name, value.to_s, labels[value.to_s], options) }
@@ -127,17 +127,8 @@ module IiifPrint
         url
       end
 
-      # One entry as Hyrax's compound renderer, and any decorator the app gives it, renders it on the show page, with
-      # a line break where each innermost block ended, since IIIF allows no blocks.
-      def compound_value(field_name, entry)
-        renderer = Hyrax::Renderers::CompoundAttributeRenderer.new(field_name, [entry], subproperties: compound_subproperties(field_name))
-        fragment = Nokogiri::HTML.fragment(renderer.render_value)
-        fragment.css('div').each { |div| div.add_next_sibling('<br>') unless div.at_css('div') }
-        sanitize_html(fragment.to_html).gsub(/\s*<br>\s*/, '<br>').sub(/(<br>)+\z/, '')
-      end
-
-      def compound_subproperties(field_name)
-        @presenter.send(:compound_subproperties_for, field_name) if @presenter.respond_to?(:compound_subproperties_for, true)
+      def compound_values(field_name, entries)
+        CompoundValues.new(field_name, presenter: @presenter, sanitize: method(:sanitize_html)).to_html(entries)
       end
 
       def link(href, text)

data/lib/iiif_print/flexibility.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "iiif_print/flexibility/fields"
+require "iiif_print/flexibility/compound_values"
 require "iiif_print/flexibility/values"
 
 module IiifPrint
@@ -15,40 +16,57 @@ module IiifPrint
         Hyrax.config.try(:flexible?) && document.try(:flexible?)
       end
 
+      ##
+      # One per request for each record and ability, since both the fields and their values read from it.
       def presenter_for(document, ability)
-        return Hyrax::FileSetPresenter.new(document, ability) if document.file_set?
-
-        controller = "Hyrax::#{document.hydra_model.model_name.collection.camelize}Controller".safe_constantize
-        (controller&.show_presenter || Hyrax::WorkShowPresenter).new(document, ability)
+        presenters = Current.presenters ||= {}
+        presenters[[document.id, ability]] ||= build_presenter(document, ability)
       end
 
       ##
       # The profile's view definitions for the record, plus its title, description and abstract when the profile
-      # gives them no view block, since the show page shows those outside its field list.  Read once per request
+      # gives them no view block and allows them in the record's contexts, since the show page shows those outside
+      # its field list.  Read once per request
       # for each tenant, schema, version and context; each tenant numbers its own profile versions.
       def view_definitions_for(document)
-        cache = RequestStore.store[:iiif_print_view_definitions] ||= {}
+        cache = Current.view_definitions ||= {}
         version = document.try(:schema_version)
         contexts = document.try(:contexts)
         tenant = Apartment::Tenant.current if defined?(Apartment::Tenant)
         cache[[tenant, schema_name(document), version, contexts]] ||= begin
           definitions = Hyrax::Schema.m3_schema_loader.view_definitions_for(schema: schema_name(document), version: version, contexts: contexts)
-          lead_definitions(document, definitions).merge(definitions.to_h.symbolize_keys)
+          lead_definitions(document, definitions, contexts).merge(definitions.to_h.symbolize_keys)
         end
       end
 
       private
 
+      def build_presenter(document, ability)
+        return Hyrax::FileSetPresenter.new(document, ability) if document.file_set?
+
+        controller = "Hyrax::#{document.hydra_model.model_name.collection.camelize}Controller".safe_constantize
+        (controller&.show_presenter || Hyrax::WorkShowPresenter).new(document, ability)
+      end
+
       LEAD_FIELDS = %i[title description abstract].freeze
 
-      def lead_definitions(document, definitions)
+      def lead_definitions(document, definitions, contexts)
         attributes = profile_attributes(document)
         (LEAD_FIELDS - definitions.to_h.keys.map(&:to_sym)).each_with_object({}) do |name, lead|
           config = attributes[name.to_s]
-          lead[name] = Hyrax::SchemaLoader::AttributeDefinition.new(name.to_s, config).view_options if config
+          next unless config && in_context?(config, contexts)
+
+          lead[name] = Hyrax::SchemaLoader::AttributeDefinition.new(name.to_s, config).view_options
         end
       end
 
+      # The filter Hyrax's M3SchemaLoader applies to every field the profile gives a view block.
+      def in_context?(config, contexts)
+        return true if config['context'].blank?
+
+        (Array(contexts) & Array(config['context'])).any?
+      end
+
       def profile_attributes(document)
         schema = Hyrax::FlexibleSchema.find_by(id: document.try(:schema_version)) || Hyrax::FlexibleSchema.order(:created_at).last
         schema.try(:attributes_for, schema_name(document)) || {}

data/lib/iiif_print/homepage_search_builder.rb

@@ -6,12 +6,10 @@ module IiifPrint
     self.default_processor_chain += [:show_parents_only]
 
     def show_parents_only(solr_parameters)
-      query = if blacklight_params["include_child_works"] == 'true'
-                IiifPrint.solr_construct_query(is_child_bsi: 'true')
-              else
-                IiifPrint.solr_construct_query(is_child_bsi: nil)
-              end
-      solr_parameters[:fq] += [query]
+      return if blacklight_params["include_child_works"] == 'true'
+
+      # Only child works are left out; a work indexed with is_child_bsi false is not a child.
+      solr_parameters[:fq] += ['-is_child_bsi:true']
     end
   end
 end

data/lib/iiif_print/persistence_layer/active_fedora_adapter.rb

@@ -60,7 +60,12 @@ module IiifPrint
           parent_of_file_set&.member_of&.find(&:work?)
       end
 
+      # @deprecated Use Hyrax::SolrQueryBuilderService.construct_query, or ActiveFedora::SolrQueryBuilder.construct_query
+      #   on a Hyrax without it; removed in IiifPrint 4.0.
       def self.solr_construct_query(*args)
+        Deprecation.warn(self, "solr_construct_query is deprecated and will be removed in IiifPrint 4.0; " \
+                               "use Hyrax::SolrQueryBuilderService.construct_query instead, or " \
+                               "ActiveFedora::SolrQueryBuilder.construct_query on a Hyrax without it.")
         if defined?(Hyrax::SolrQueryBuilderService)
           Hyrax::SolrQueryBuilderService.construct_query(*args)
         else

data/lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -68,7 +68,10 @@ module IiifPrint
         Hyrax.query_service.find_parents(resource: parent).first
       end
 
+      # @deprecated Use Hyrax::SolrQueryBuilderService.construct_query; removed in IiifPrint 4.0.
       def self.solr_construct_query(*args)
+        Deprecation.warn(self, "solr_construct_query is deprecated and will be removed in IiifPrint 4.0; " \
+                               "use Hyrax::SolrQueryBuilderService.construct_query instead.")
         Hyrax::SolrQueryBuilderService.construct_query(*args)
       end
 
@@ -94,7 +97,7 @@ module IiifPrint
       #  Building a custom query to find these child works directly via the attribute would be more efficient.
       #    However, it would require more effort for a lesser-used feature, and would not allow for the fallback
       #    of finding child works by title.
-      # rubocop:disable Lint/UnusedMethodArgument, Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Lint/UnusedMethodArgument
       def self.destroy_children_split_from(file_set:, work:, model:, user:)
         all_child_works = Hyrax.custom_queries.find_child_works(resource: work).to_a
         return if all_child_works.blank?
@@ -114,14 +117,20 @@ module IiifPrint
         Hyrax.index_adapter.save(resource: work)
         Hyrax.publisher.publish('object.membership.updated', object: work, user: user)
 
-        children.each do |rcd|
-          Hyrax.persister.delete(resource: rcd)
-          Hyrax.index_adapter.delete(resource: rcd)
-          Hyrax.publisher.publish('object.deleted', object: rcd, user: user)
-        end
+        children.each { |child| destroy_child_work(child, user: user || ::User.system_user) }
         true
       end
-      # rubocop:enable Lint/UnusedMethodArgument, Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Lint/UnusedMethodArgument
+
+      # Not persister.delete: the work transaction also deletes the child's own file sets.
+      def self.destroy_child_work(child, user:)
+        result = Hyrax::Transactions::Container['work_resource.destroy']
+                 .with_step_args('work_resource.delete_all_file_sets' => { user: user },
+                                 'work_resource.delete' => { user: user })
+                 .call(child)
+        Rails.logger.error("IiifPrint could not destroy split child work #{child.id}: #{result.failure.inspect}") if result.failure?
+        result
+      end
 
       def self.pdf?(file_set)
         file_set.original_file&.pdf?

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '3.2.0'.freeze
+  VERSION = '3.2.1'.freeze
 end

data/lib/iiif_print.rb

@@ -13,6 +13,8 @@ require "iiif_print/text_formats_from_alto_service"
 require "iiif_print/tiff_derivative_service"
 require "iiif_print/lineage_service"
 require "iiif_print/metadata"
+# ActiveSupport::CurrentAttributes arrived in Rails 5.2; only the flexible metadata path, which needs a newer Hyrax, uses it.
+require "iiif_print/current" if defined?(ActiveSupport::CurrentAttributes)
 require "iiif_print/flexibility"
 require "iiif_print/split_pdfs/base_splitter"
 require "iiif_print/split_pdfs/child_work_creation_from_pdf_service"
@@ -42,6 +44,16 @@ module IiifPrint
     @config
   end
 
+  ##
+  # Subscribes a new IiifPrint::Listener in place of the one an earlier prepare subscribed.
+  # Dry::Events neither deduplicates subscriptions nor unsubscribes by class, and after a code
+  # reload the earlier listener's class is the unloaded one, so it is tracked here.
+  def self.subscribe_listener(publisher: Hyrax.publisher)
+    publisher.unsubscribe(@listener) if @listener
+    @listener = IiifPrint::Listener.new
+    publisher.subscribe(@listener)
+  end
+
   class << self
     delegate(
       :persistence_adapter,
@@ -221,7 +233,7 @@ module IiifPrint
 
   # One per request: an Ability is costly to build, and a manifest can ask once for every page.
   def self.anonymous_ability
-    RequestStore.store[:iiif_print_anonymous_ability] ||= ::Ability.new(nil)
+    Current.anonymous_ability ||= ::Ability.new(nil)
   end
   private_class_method :flexible_manifest_metadata_for, :anonymous_ability
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Sean Upton
@@ -11,9 +11,10 @@ authors:
 - Kirk Wang
 - LaRita Robinson
 - Jeremy Friesen
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search
@@ -97,20 +98,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bixby
   requirement: !ruby/object:Gem::Requirement
@@ -462,6 +449,7 @@ files:
 - lib/iiif_print/blacklight_iiif_search/annotation_decorator.rb
 - lib/iiif_print/catalog_search_builder.rb
 - lib/iiif_print/configuration.rb
+- lib/iiif_print/current.rb
 - lib/iiif_print/data.rb
 - lib/iiif_print/data/fileset_helper.rb
 - lib/iiif_print/data/path_helper.rb
@@ -471,6 +459,7 @@ files:
 - lib/iiif_print/engine.rb
 - lib/iiif_print/errors.rb
 - lib/iiif_print/flexibility.rb
+- lib/iiif_print/flexibility/compound_values.rb
 - lib/iiif_print/flexibility/fields.rb
 - lib/iiif_print/flexibility/values.rb
 - lib/iiif_print/homepage_search_builder.rb
@@ -513,6 +502,7 @@ homepage: https://github.com/notch8/iiif_print/
 licenses:
 - Apache-2.0
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -527,7 +517,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.3.20
+signing_key:
 specification_version: 4
 summary: IiifPrint is a gem (Rails "engine") for Hyrax-based digital repository applications
   to support displaying parent/child works in the same viewer (Universal Viewer) and