iiif_print 3.0.11 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653b6bcf6d9120cbdfa3f0fd05d4034497a9147611d275e5d3111cf75edacc67
-  data.tar.gz: a565d045ce46175b631091b94e99160ccd8b77bccc72faf6d9c298f47dc2d8e5
+  metadata.gz: 4050e3e2e6c79d5d93bc63e2801f75bb13a7a1985dc2729ead3c0a15c4855075
+  data.tar.gz: b0d627fa5b6d190d0fbdae66e2db116e77eb74bf3473630c008a61dd794ed600
 SHA512:
-  metadata.gz: 005d431cee41520be5fd6035d1446e099d05efb5a756a159d941372a911d325e033b2643fe78a0ab7da1d1b8b43b31b5d43cc303b32854191e5c369cf8277635
-  data.tar.gz: 1a3073d0662f1f7c9734cc14a3aa110d26a9ca0dde6a75b84bc953ccaac57ba9773364bcd18e925797c9d6278578812390ecf378b67dd7936b9edcebd7cc7ba3
+  metadata.gz: c9f52bc069331756409eae5f67b878b2801c46d14e44fa36804faed750cfb2c07c5159015e5e236c084b0dcf8e0d2412d2d907905c43a07feba068c475761160
+  data.tar.gz: 7f58c71b8f933df6cec597f766494091a3c33fcd4734a14118ee7213d80262d52ebd3196b452267136913dfcba3a614fbc81dfbf7399edacb44687a6defa7876

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /app/samvera/hyrax-webapp
   specs:
-    iiif_print (3.0.11)
+    iiif_print (3.1.0)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)
@@ -87,8 +87,8 @@ GEM
     awesome_nested_set (3.9.0)
       activerecord (>= 4.0.0, < 8.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1221.0)
-    aws-sdk-core (3.242.0)
+    aws-partitions (1.1222.0)
+    aws-sdk-core (3.243.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -99,8 +99,8 @@ GEM
     aws-sdk-kms (1.122.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.214.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-s3 (1.215.0)
+      aws-sdk-core (~> 3, >= 3.243.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sdk-sqs (1.111.0)
@@ -118,7 +118,7 @@ GEM
       i18n
     bcrypt (3.1.21)
     benchmark (0.3.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.0.1)
     bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
@@ -492,9 +492,9 @@ GEM
     json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
-    json-schema (5.2.2)
+    json-schema (6.2.0)
       addressable (~> 2.8)
-      bigdecimal (~> 3.1)
+      bigdecimal (>= 3.1, < 5)
     jwt (2.10.2)
       base64
     kaminari (1.2.2)

data/README.md

@@ -121,7 +121,17 @@ We created IiifPrint with an assumption of ActiveFedora.  However, as Hyrax now
 
 ### IIIF URL configuration
 
-If you set EXTERNAL_IIIF_URL in your environment, then IiifPrint will use that URL as the root for your IIIF URLs. It will also switch from using the file set ID to using the SHA1 of the file as the identifier. This enables using serverless_iiif or Cantaloupe (refered to as the service) by pointing the service to the same S3 bucket that FCREPO writes the uploaded files to. By setting it up that way you do not need the service to connect to FCREPO or Hyrax at all, both natively support connecting to an S3 bucket to get their data.
+If you set `EXTERNAL_IIIF_URL` in your environment, IiifPrint will use that URL as the root for your IIIF URLs. It will also switch from using the file set ID to using the file's checksum hex digest as the identifier. In Wings/Fedora mode the digest is stored as a `urn:sha1:HEX` string; in Valkyrie mode it is stored as a plain hex string — IiifPrint handles both automatically.
+
+This enables using serverless_iiif or Cantaloupe (referred to as the service) by pointing the service to the same S3 bucket that the repository writes uploaded files to. By setting it up that way you do not need the service to connect to Fedora or Hyrax at all — both natively support connecting to an S3 bucket to retrieve file content.
+
+If your S3 bucket organises files under a folder prefix (e.g. a `staging/` or `production/` subfolder), set `IIIF_S3_FOLDER_PREFIX` to that prefix. IiifPrint will prepend it to the digest identifier and percent-encode the separator so the combined value is a single IIIF path segment:
+
+```
+EXTERNAL_IIIF_URL=https://iiif.example.org
+IIIF_S3_FOLDER_PREFIX=staging
+# → identifier used: staging%2F<hex-digest>
+```
 
 ### Model level configurations
 

data/app/models/concerns/iiif_print/solr_document_decorator.rb

@@ -2,8 +2,17 @@
 
 module IiifPrint
   module SolrDocumentDecorator
+    def digest_hex
+      raw = digest
+      return nil if raw.blank?
+      # Wings/Fedora stores "urn:sha1:HEX" or "urn:md5:HEX"; Valkyrie stores a plain hex string.
+      raw[/\Aurn:[^:]+:([\w]+)\z/, 1] || raw
+    end
+
     def digest_sha1
-      digest[/urn:sha1:([\w]+)/, 1]
+      Deprecation.warn(self, "#digest_sha1 is deprecated; use #digest_hex instead. " \
+                             "#digest_sha1 will be removed in the next major version.")
+      digest_hex
     end
 
     def method_missing(method_name, *args, &block)

data/app/presenters/iiif_print/iiif_manifest_presenter/display_image_presenter_decorator.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 # mixin to provide URL for IIIF Content Search service
 module IiifPrint
   module IiifManifestPresenter
@@ -82,7 +84,13 @@ module IiifPrint
       end
 
       def external_latest_file_id
-        @latest_file_id ||= digest_sha1
+        hex = digest_hex
+        return nil if hex.blank?
+
+        prefix = ENV['IIIF_S3_FOLDER_PREFIX'].presence
+        return hex unless prefix
+
+        CGI.escape("#{prefix}/#{hex}")
       end
 
       def iiif_image_url_builder(url_builder:)

data/app/transactions/hyrax/transactions/iiif_print_container_decorator.rb

@@ -1,5 +1,15 @@
 # frozen_string_literal: true
 
+begin
+  require 'dry/container'
+rescue LoadError
+  nil
+end
+
+# dry-transaction >= 0.15 dropped dry-container, so Dry::Container::Mixin is unavailable in those
+# environments. Guard the entire decorator so iiif_print still boots in Hyrax 2.x / newer dry-rb.
+return unless defined?(Dry::Container)
+
 module Hyrax
   module Transactions
     ##

data/lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -34,9 +34,14 @@ module IiifPrint
       # @param work_type [Class<ActiveFedora::Base>]
       # @return form for the given :work_type
       def self.decorate_form_with_adapter_logic(work_type:)
+        # In Hyrax flexible metadata mode, `Hyrax::FormFields(:child_works_from_pdf_splitting)`
+        # is a no-op but calling `"#{work_type}Form".constantize` unconditionally causes a
+        # circular autoload error when a model is loaded before its form.
+        return if Hyrax.config.try(:flexible?)
+
         form = "#{work_type}Form".constantize
         form.send(:include, Hyrax::FormFields(:child_works_from_pdf_splitting)) if
-          Hyrax.config.try(:work_include_metadata?) && !Hyrax.config.try(:flexible?) && !form.included_modules.include?(Hyrax::FormFields(:child_works_from_pdf_splitting))
+          Hyrax.config.try(:work_include_metadata?) && !form.included_modules.include?(Hyrax::FormFields(:child_works_from_pdf_splitting))
         form
       end
 

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '3.0.11'.freeze
+  VERSION = '3.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.1.0
 platform: ruby
 authors:
 - Sean Upton
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-05 00:00:00.000000000 Z
+date: 2026-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search