Merge pull request #5317 from avalonmediasystem/bump_iiif

Bump iiif_manifest

Gemfile.lock

@@ -67,7 +67,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/iiif_manifest.git
-  revision: b4b0eb4c003e84bbad92510a3391bb5dba357e42
+  revision: c8ca0c6e54517446419c20221260eaf3dcf46d4e
   branch: main
   specs:
     iiif_manifest (1.3.1)

app/models/iiif_canvas_presenter.rb

@@ -98,7 +98,7 @@ def supplementing_content_data(file)
             else
               Rails.application.routes.url_helpers.master_file_supplemental_file_url(master_file.id, file.id)
             end
-      IIIFManifest::V3::AnnotationContent.new(url, **supplemental_attributes(file))
+      IIIFManifest::V3::AnnotationContent.new(body_id: url, **supplemental_attributes(file))
     end
 
     def stream_urls

app/models/iiif_playlist_canvas_presenter.rb

@@ -99,7 +99,7 @@ def audio_display_content(quality)
     def marker_content(marker)
       url = Rails.application.routes.url_helpers.avalon_marker_url(marker.id)
 
-      IIIFManifest::V3::AnnotationContent.new(url, **marker_attributes(marker))
+      IIIFManifest::V3::AnnotationContent.new(annotation_id: url, **marker_attributes(marker))
     end
 
     def stream_urls

spec/models/iiif_canvas_presenter_spec.rb

@@ -148,13 +148,13 @@
       end
 
       it 'includes transcript and caption files' do
-        expect(subject.any? { |content| content.url =~ /supplemental_files\/#{transcript_file.id}/ }).to eq true
-        expect(subject.any? { |content| content.url =~ /supplemental_files\/#{caption_file.id}/ }).to eq true
+        expect(subject.any? { |content| content.body_id =~ /supplemental_files\/#{transcript_file.id}/ }).to eq true
+        expect(subject.any? { |content| content.body_id =~ /supplemental_files\/#{caption_file.id}/ }).to eq true
       end
 
       it 'differentiates between transcript and caption files' do
-        expect(subject.any? { |content| content.url =~ /supplemental_files\/#{transcript_file.id}\/transcripts/ }).to eq true
-        expect(subject.any? { |content| content.url =~ /supplemental_files\/#{caption_file.id}\/captions/ }).to eq true
+        expect(subject.any? { |content| content.body_id =~ /supplemental_files\/#{transcript_file.id}\/transcripts/ }).to eq true
+        expect(subject.any? { |content| content.body_id =~ /supplemental_files\/#{caption_file.id}\/captions/ }).to eq true
       end
 
       it 'does not add " (machine generated)" to label of non-generated files' do
@@ -163,19 +163,19 @@
       end
 
       it 'does not include generic supplemental files or waveform' do
-        expect(subject.any? { |content| content.url =~ /supplemental_files\/#{supplemental_file.id}/ }).to eq false
+        expect(subject.any? { |content| content.body_id =~ /supplemental_files\/#{supplemental_file.id}/ }).to eq false
         expect(subject.any? { |content| content.label == { "en" => ["waveform.json"] } }).to eq false
       end
 
       it 'does not include master file captions url when legacy captions are not present' do
-        expect(subject.any? { |content| content.url =~ /master_files\/#{master_file.id}\/captions/ }).to eq false
+        expect(subject.any? { |content| content.body_id =~ /master_files\/#{master_file.id}\/captions/ }).to eq false
       end
 
       context 'legacy master file captions' do
         let(:master_file) { FactoryBot.create(:master_file, :with_waveform, :with_captions, supplemental_files_json: supplemental_files_json, media_object: media_object, derivatives: [derivative]) }
 
         it 'includes the master file captions' do
-          expect(subject.any? { |content| content.url =~ /master_files\/#{master_file.id}\/captions/ }).to eq true
+          expect(subject.any? { |content| content.body_id =~ /master_files\/#{master_file.id}\/captions/ }).to eq true
         end
       end