iiif_print 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1751ae8fa40b3eea80a42e190c97e2edb777559907b47e1e3b781f82db383137
-  data.tar.gz: 59f9138ca7c4364eaaf886d0856ed8ac00c21a6a58d5ab6193f924681cd85add
+  metadata.gz: cdd66a6eb68613bdd610b0cb87092a6d7a9bee69c2f6f015ddb8035e0c8fa5e0
+  data.tar.gz: 8669cf9f172800e1069f096ff1c98409fd44f4e0607722423dc6fdaf4961a5a8
 SHA512:
-  metadata.gz: '061086f0d3283d48aa2c5b518766cc05d88000174dc555936cccf0a5c345abdc27a648055e1865ccf3acf791789ce767962176e9711d96101f33b4ef02294b53'
-  data.tar.gz: 8c876a9db0b6bd4024aebcec8118f5f101d1208d3a13388d608202ace3183b0e6c2fc7fdaef0870bb95a46623aeee151515cc0f6272f4981d35f2d18c98228af
+  metadata.gz: a4ebe41e069d13a860e0b7b19cda249763d4b31405be767cd41f2b48ec9e34117edd2a4dacd157c93c7b964dc1b1cdc2ea6cfa1a89704cb38399775c185f6eb9
+  data.tar.gz: c2de71552f311ae3961de7cb88bdd890f89bc970a896ee151150d2633f17fab3378513b62b97311989afe8903e5e4d2e8ef9a6ac428efad44abb57f23fe96054

data/CONTRIBUTING.md

@@ -172,6 +172,20 @@ This is your chance for a mentoring moment of another developer. Take time to gi
 - Did the Continuous Integration tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
+### Release a New Gem Version
+
+After all changes are merged: 
+- Pull the newest code to your local repo, and rebuild docker if needed.
+- Run `bundle exec rake` to verify that rubocop and specs pass.
+- Update the tag in the version file, and bundle.
+- Create a PR with the updated version & Gemfile.lock file.
+- Merge into main.
+- Create a new release & tag on github with this new version number.
+- Pull main to your local repo to get the release & tag.
+- Inside your docker container, run `bundle exec rake release`. This will build the gem and push it to rubygems.org.
+
+(Note, you must have configured your rubygems login previously for this to work).
+It may be possible to build the gem outside of docker, but this requires the ability to bundle outside of docker which can be very problematic.
 
 # Additional Resources
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /app/samvera/hyrax-webapp
   specs:
-    iiif_print (3.0.3)
+    iiif_print (3.0.5)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)
@@ -65,7 +65,7 @@ GEM
       activemodel (= 5.2.8.1)
       activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activerecord-import (2.0.0)
+    activerecord-import (2.2.0)
       activerecord (>= 4.2)
     activestorage (5.2.8.1)
       actionpack (= 5.2.8.1)
@@ -86,36 +86,38 @@ GEM
       execjs (~> 2)
     awesome_nested_set (3.8.0)
       activerecord (>= 4.0.0, < 8.1)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1044.0)
-    aws-sdk-core (3.217.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1112.0)
+    aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.97.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      logger
+    aws-sdk-kms (1.103.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.179.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.189.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sqs (1.91.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-sqs (1.96.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     backport (1.2.0)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcp47 (0.3.3)
       i18n
     bcrypt (3.1.20)
     benchmark (0.3.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
@@ -177,7 +179,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
-    connection_pool (2.5.0)
+    connection_pool (2.5.3)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -185,7 +187,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    csv (3.3.2)
+    csv (3.3.5)
     database_cleaner (1.99.0)
     date (3.3.4)
     declarative (0.0.20)
@@ -344,12 +346,13 @@ GEM
     hashie (5.0.0)
     hiredis (0.6.3)
     htmlentities (4.3.4)
-    http_logger (0.7.0)
-    httparty (0.22.0)
+    http_logger (1.0.1)
+    httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     hydra-access-controls (11.0.7)
       active-fedora (>= 10.0.0)
       activesupport (>= 4, < 6)
@@ -561,7 +564,7 @@ GEM
       shex (~> 0.6, >= 0.6.4)
       sparql (~> 3.1, >= 3.1.8)
       sparql-client (~> 3.1, >= 3.1.2)
-    logger (1.6.5)
+    logger (1.7.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -576,10 +579,10 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.6.0)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0107)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0603)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -587,10 +590,11 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
+    mutex_m (0.3.0)
     nest (3.2.0)
       redic
-    net-http-persistent (4.0.5)
-      connection_pool (~> 2.2)
+    net-http-persistent (4.0.6)
+      connection_pool (~> 2.2, >= 2.2.4)
     net-imap (0.4.6)
       date
       net-protocol
@@ -636,7 +640,7 @@ GEM
     psych (3.3.4)
     public_suffix (5.1.1)
     puma (3.12.6)
-    qa (5.14.0)
+    qa (5.15.0)
       activerecord-import
       deprecation
       faraday (< 3.0, != 2.0.0)
@@ -875,9 +879,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (4.10.1)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
     solargraph (0.48.0)
       backport (~> 1.2)
       benchmark
@@ -972,7 +976,7 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.4)
+    version_gem (1.1.8)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (3.7.0)

data/app/jobs/iiif_print/jobs/child_works_from_pdf_job.rb

@@ -62,7 +62,8 @@ module IiifPrint
       # rubocop:disable Metrics/MethodLength
       def split_pdf(original_pdf_path, user, child_model, pdf_file_set)
         user = User.find_by_user_key(user) unless user.is_a?(User)
-        image_files = @parent_work.iiif_print_config.pdf_splitter_service.call(original_pdf_path)
+        # split the pdf into individual pages; pdf_file_set needed for derivative rodeo splitter
+        image_files = @parent_work.iiif_print_config.pdf_splitter_service.call(original_pdf_path, file_set: pdf_file_set)
 
         # give as much info as possible if we don't have image files to work with.
         if image_files.blank?

data/lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -21,10 +21,12 @@ module IiifPrint
       # @param work_type [Class<Valkyrie::Resource>]
       # @return the indexer for the given :work_type
       def self.decorate_with_adapter_logic(work_type:)
-        work_type.send(:include, Hyrax::Schema(:child_works_from_pdf_splitting)) unless work_type.included_modules.include?(Hyrax::Schema(:child_works_from_pdf_splitting))
+        work_type.send(:include, Hyrax::Schema(:child_works_from_pdf_splitting)) unless
+          Hyrax.config.try(:flexible?) || work_type.included_modules.include?(Hyrax::Schema(:child_works_from_pdf_splitting))
         # TODO: Use `Hyrax::ValkyrieIndexer.indexer_class_for` once changes are merged.
         indexer = "#{work_type}Indexer".constantize
-        indexer.send(:include, Hyrax::Indexer(:child_works_from_pdf_splitting)) unless indexer.included_modules.include?(Hyrax::Indexer(:child_works_from_pdf_splitting))
+        indexer.send(:include, Hyrax::Indexer(:child_works_from_pdf_splitting)) unless
+          Hyrax.config.try(:flexible?) || indexer.included_modules.include?(Hyrax::Indexer(:child_works_from_pdf_splitting))
         indexer
       end
 
@@ -33,7 +35,8 @@ module IiifPrint
       # @return form for the given :work_type
       def self.decorate_form_with_adapter_logic(work_type:)
         form = "#{work_type}Form".constantize
-        form.send(:include, Hyrax::FormFields(:child_works_from_pdf_splitting)) unless form.included_modules.include?(Hyrax::FormFields(:child_works_from_pdf_splitting))
+        form.send(:include, Hyrax::FormFields(:child_works_from_pdf_splitting)) unless
+          Hyrax.config.try(:flexible?) || form.included_modules.include?(Hyrax::FormFields(:child_works_from_pdf_splitting))
         form
       end
 
@@ -86,7 +89,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
+      # rubocop:disable Lint/UnusedMethodArgument, Metrics/AbcSize, Metrics/MethodLength
       def self.destroy_children_split_from(file_set:, work:, model:, user:)
         all_child_works = Hyrax.custom_queries.find_child_works(resource: work)
         return if all_child_works.blank?
@@ -97,6 +100,15 @@ module IiifPrint
           children = all_child_works.select { |m| m.title.include?(file_set.label) && m.title.include?(work.to_param) }
         end
         return if children.blank?
+        # we have to update the work's members first, then delete the children
+        # otherwise Hyrax tries to save the parent as each child is deleted, resulting
+        # in failing jobs
+        remaining_members = work.member_ids - children.map(&:id)
+        work.member_ids = remaining_members
+        Hyrax.persister.save(resource: work)
+        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)
@@ -104,7 +116,7 @@ module IiifPrint
         end
         true
       end
-      # rubocop:enable Lint/UnusedMethodArgument
+      # rubocop:enable Lint/UnusedMethodArgument, Metrics/AbcSize, Metrics/MethodLength
 
       def self.pdf?(file_set)
         file_set.original_file&.pdf?

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Sean Upton
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search