iiif_print 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1fb1a28565daaa498895ea28019b1a5d9cb16e01558872b4840e19ab002fb07
-  data.tar.gz: 76a5d7afeda6cb264d2a77e31ff0e60be1c8d2a416917907a4d848e3b8975e63
+  metadata.gz: 512bd4a70c6b11e94a4d82fb786264bb124c4ca38ca33549d34e3bcb6d0e37bc
+  data.tar.gz: 0b363334d97c0a97bc5b4ed8685c9be41f9ab7124e027af6a1334f2f53f6e86c
 SHA512:
-  metadata.gz: '08d25b39fccf79fe3b147b35dd8eb7fff99ac9d66bb91426ea4c1b98a16009b539f48283850225725f8ebd1d62876f3d30ff61508722f09def19eb02b67f4b63'
-  data.tar.gz: ef3c25dca1cdc1ab648d90ec303ad56df9a26fc6df4358e610154634eccd934b64295d99c2611fd454b8321d761f7aca9bcde4263495ac2fdfc58cca8447bc61
+  metadata.gz: 4e31e9b19c7ca850977bc1a04c912a98d49116d1b780e7ecdde7be43abbe447e44eceb20bc18be0d038887257b0432fc15ae79d20609ec9dfdea75e8946a82cc
+  data.tar.gz: b9639133a35990cabfe146fb13866e9a948e418a48a36962de3d10a70b52794f2466de9e789d851b778d91fa165659f4b90560759aee0b421313d9326ef2329d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /app/samvera/hyrax-webapp
   specs:
-    iiif_print (3.1.1)
+    iiif_print (3.1.2)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)

data/app/models/iiif_print/iiif_search_decorator.rb

@@ -26,7 +26,7 @@ module IiifPrint
       return { q: 'nil:nil' } unless q
 
       {
-        q: "#{q} AND has_model_ssim:FileSet AND (#{iiif_config[:object_relation_field]}:\"#{parent_document.id}\" OR id:\"#{parent_document.id}\")",
+        q: "(#{q}) AND has_model_ssim:FileSet AND (#{iiif_config[:object_relation_field]}:\"#{parent_document.id}\" OR id:\"#{parent_document.id}\")",
         rows: rows,
         page: page
       }

data/lib/iiif_print/blacklight_iiif_search/annotation_decorator.rb

@@ -36,8 +36,9 @@ module IiifPrint
 
         query_terms = sanitized_query.split(' ')
 
+        terms_pattern = Regexp.union(query_terms)
         matches = coords_json['coords'].select do |k, _v|
-          k.downcase =~ /(#{query_terms.join('|')})/
+          k.downcase.match?(terms_pattern)
         end
         return default_coords if matches.blank?
 
@@ -113,16 +114,16 @@ module IiifPrint
 
       ##
       # This method is a workaround to compensate for overriding the solr_params method in
-      # BlacklightIiifSearch::IiifSearch. In the override, the solr_params method adds an additional filter to the query
-      # to include either the object_relation_field OR the parent document's id and removes the :f parameter from the
-      # query. This resulted in the query split here returning more than the actual query term.
+      # BlacklightIiifSearch::IiifSearch. In the override, the solr_params method wraps the user's query in
+      # parentheses and adds filters for the FileSet model and the object_relation_field OR the parent document's id.
+      # This extracts the user's query from inside those parentheses so the filters are not treated as search terms.
       #
       # @see IiifPrint::IiifSearchDecorator#solr_params
-      # @return [Regexp] A regular expression to find the last AND and everything after it
+      # @return [Regexp] A regular expression capturing the user's query
       # @example
-      #   'foo AND (is_page_of_ssim:\"123123\" OR id:\"123123\")' #=> 'foo'
+      #   '(foo) AND has_model_ssim:FileSet AND (is_page_of_ssim:\"123123\" OR id:\"123123\")' #=> 'foo'
       def additional_query_terms_regex
-        /(.*)(?= AND (\(.+\)|\w+)$)/
+        /\A\((.*)\) AND has_model_ssim/m
       end
 
       ##

data/lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -96,7 +96,7 @@ module IiifPrint
       #    of finding child works by title.
       # 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)
+        all_child_works = Hyrax.custom_queries.find_child_works(resource: work).to_a
         return if all_child_works.blank?
         # look first for children by the file set id they were split from
         children = all_child_works.select { |m| m.split_from_pdf_id == file_set.id }

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '3.1.1'.freeze
+  VERSION = '3.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Sean Upton
@@ -11,10 +11,9 @@ authors:
 - Kirk Wang
 - LaRita Robinson
 - Jeremy Friesen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search
@@ -497,7 +496,6 @@ homepage: https://github.com/notch8/iiif_print/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -512,8 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
-signing_key:
+rubygems_version: 3.6.7
 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