Merge pull request #6004 from avalonmediasystem/sup_file_rendering_link

Generate correct rendering link in iiif manifest

app/models/concerns/iiif_supplemental_file_behavior.rb

@@ -33,7 +33,7 @@ def supplemental_files_rendering(object)
   end
 
   def object_supplemental_file_url(object, supplemental_file)
-    if object.is_a? MasterFile
+    if object.is_a?(MasterFile) || object.is_a?(SpeedyAF::Proxy::MasterFile)
       Rails.application.routes.url_helpers.master_file_supplemental_file_url(id: supplemental_file.id, master_file_id: object.id)
     else
       Rails.application.routes.url_helpers.media_object_supplemental_file_url(id: supplemental_file.id, media_object_id: object.id)

spec/controllers/media_objects_controller_spec.rb

@@ -1853,6 +1853,34 @@
   end
 
   describe '#manifest' do
+    before do
+      login_as :administrator
+    end
+
+    context 'with supplemental files' do
+      let(:mf_supplemental_file) { FactoryBot.create(:supplemental_file) }
+      let(:mo_supplemental_file) { FactoryBot.create(:supplemental_file) }
+      let(:master_file) { FactoryBot.create(:master_file, media_object: media_object, supplemental_files: [mf_supplemental_file]) }
+      let(:media_object) { FactoryBot.create(:published_media_object, supplemental_files: [mo_supplemental_file]) }
+
+      before do
+        mf_supplemental_file.parent_id = master_file.id
+        mo_supplemental_file.parent_id = media_object.id
+        mf_supplemental_file.save
+        mo_supplemental_file.save
+      end
+
+      it 'should link to proper object route in rendering section' do
+        get 'manifest', params: { id: media_object.id, format: 'json' }
+        parsed_response = JSON.parse(response.body)
+        mo_rendering = parsed_response['rendering'].first
+        expect(mo_rendering['id']).to eq Rails.application.routes.url_helpers.media_object_supplemental_file_url(id: mo_supplemental_file.id, media_object_id: media_object.id)
+        item = parsed_response['items'].first
+        mf_rendering = item['rendering'].first
+        expect(mf_rendering['id']).to eq Rails.application.routes.url_helpers.master_file_supplemental_file_url(id: mf_supplemental_file.id, master_file_id: master_file.id)
+      end
+    end
+
     context 'read from solr' do
       let!(:master_file) { FactoryBot.create(:master_file, :with_derivative, media_object: media_object) }
       let!(:media_object) { FactoryBot.create(:published_media_object, visibility: 'public') }