If a versioned file is available, send that path to cantaloupe

Author: jcoyne

app/models/iiif_image.rb

@@ -30,17 +30,13 @@ def response
   private
 
   def image_uri
-    @image_uri ||= IIIF::Image::URI.new(base_uri: @base_uri, identifier: remote_id, transformation:)
+    @image_uri ||= IIIF::Image::URI.new(base_uri: @base_uri, identifier: stacks_file.cantaloupe_identifier, transformation:)
   end
 
   def image_url
     image_uri.to_s
   end
 
-  def remote_id
-    CGI.escape(stacks_file.treeified_path)
-  end
-
   attr_reader :transformation, :stacks_file
 
   delegate :logger, to: Rails

app/models/stacks_file.rb

@@ -44,8 +44,9 @@ def path
   end
 
   # Used as the IIIF identifier for retrieving this file from the image server
-  def treeified_path
-    storage_root.relative_path
+  # return the content addressable path if available, otherwise the legacy path
+  def cantaloupe_identifier
+    CGI.escape(storage_root.relative_path)
   end
 
   def storage_root

app/models/storage_root.rb

@@ -43,20 +43,27 @@ def initialize(treeified_id:, file_name:, cocina:)
 
     # As this is used for external service URLs (Canteloupe image server), we don't want to put content addressable path here.'
     def relative_path
-      File.join(@treeified_id, @file_name)
+      return relative_content_addressable_path if File.exist?(content_addressable_path)
+
+      File.join(@treeified_id, @file_name) # For legacy files
     end
 
     def absolute_path
       return content_addressable_path if File.exist?(content_addressable_path)
 
-      File.join(Settings.stacks.storage_root, relative_path)
+      File.join(Settings.stacks.storage_root, relative_path) # For legacy files
     end
 
+    private
+
     def content_addressable_path
-      @content_addressable_path ||= begin
-        md5 = @cocina.find_file_md5(@file_name)
-        File.join(Settings.stacks.storage_root, @treeified_id, @cocina.druid, 'content', md5)
-      end
+      @content_addressable_path ||= File.join(Settings.stacks.storage_root, relative_content_addressable_path)
+    end
+
+    def relative_content_addressable_path
+      md5 = @cocina.find_file_md5(@file_name)
+
+      File.join(@treeified_id, @cocina.druid, 'content', md5)
     end
   end
 end

app/services/iiif_metadata_service.rb

@@ -8,7 +8,7 @@ class IiifMetadataService
   # @param canonical_url [String]
   # @param base_uri [String] base path to the IIIF server
   def initialize(stacks_file:, canonical_url:, base_uri: Settings.imageserver.base_uri)
-    identifier = CGI.escape(stacks_file.treeified_path)
+    identifier = stacks_file.cantaloupe_identifier
     @url = IIIF::Image::URI.new(identifier:, base_uri:).to_s
     @canonical_url = canonical_url
   end

spec/models/iiif_image_spec.rb

@@ -7,15 +7,9 @@
   let(:druid) { 'nr349ct7889' }
   let(:file_name) { 'image.jp2' }
   let(:transformation) { IIIF::Image::Transformation.new(size: 'full', region: 'full') }
-  let(:stacks_file) { StacksFile.new(file_name:, cocina: Cocina.new({ "externalIdentifier" => druid })) }
+  let(:stacks_file) { StacksFile.new(file_name:, cocina: Cocina.new(Factories.legacy_cocina_with_file)) }
   let(:instance) { described_class.new(stacks_file:, base_uri:, transformation:) }
 
-  describe "#remote_id" do
-    subject { instance.send(:remote_id) }
-
-    it { is_expected.to eq(image_server_path(druid, file_name)) }
-  end
-
   describe "#valid?" do
     subject { instance.valid? }
 

spec/models/projection_spec.rb

@@ -99,7 +99,7 @@
   describe '#response' do
     let(:druid) { 'nr349ct7889' }
     let(:file_name) { 'image.jp2' }
-    let(:cocina) { Cocina.new({ 'externalIdentifier' => druid }) }
+    let(:cocina) { Cocina.new(Factories.legacy_cocina_with_file) }
 
     context 'for an image' do
       let(:image) { StacksImage.new(stacks_file: StacksFile.new(file_name:, cocina:)) }

spec/models/stacks_image_spec.rb

@@ -12,7 +12,7 @@
 
   describe "#info_service" do
     subject { instance.send(:info_service) }
-    let(:stacks_file) { StacksFile.new(file_name: 'image.jp2', cocina: Cocina.new({ 'externalIdentifier' => 'nr349ct7889' })) }
+    let(:stacks_file) { StacksFile.new(file_name: 'image.jp2', cocina: Cocina.new(Factories.legacy_cocina_with_file)) }
     let(:instance) { described_class.new(stacks_file:) }
 
     it { is_expected.to be_a IiifMetadataService }

spec/requests/iiif_spec.rb

@@ -147,9 +147,11 @@
     end
 
     describe 'image requests for world readable items' do
+      let(:image_path_component) { "bb%2F000%2Fcr%2F7262%2Fbb000cr7262%2Fcontent%2F8ff299eda08d7c506273840d52a03bf3" }
+
       context 'when the request is valid' do
         before do
-          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_server_path('bb000cr7262', 'image.jp2')}/0,640,2552,2552/100,100/0/default.jpg")
+          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_path_component}/0,640,2552,2552/100,100/0/default.jpg")
             .to_return(status: 200, body: "")
         end
 
@@ -163,7 +165,7 @@
 
       context 'when additional params are provided' do
         before do
-          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_server_path('bb000cr7262', 'image.jp2')}/0,640,2552,2552/100,100/0/default.jpg")
+          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_path_component}/0,640,2552,2552/100,100/0/default.jpg")
             .to_return(status: 200, body: "")
         end
 
@@ -176,7 +178,7 @@
 
       context 'when image is missing' do
         before do
-          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_server_path('bb000cr7262', 'image.jp2')}/0,640,2552,2552/100,100/0/default.jpg")
+          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_path_component}/0,640,2552,2552/100,100/0/default.jpg")
             .to_return(status: 404, body: "")
         end
 
@@ -201,7 +203,7 @@
 
       context 'with the download flag set' do
         before do
-          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_server_path('bb000cr7262', 'image.jp2')}/0,640,2552,2552/100,100/0/default.jpg")
+          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_path_component}/0,640,2552,2552/100,100/0/default.jpg")
             .to_return(status: 200, body: "")
         end
 
@@ -215,7 +217,7 @@
 
       context 'with a pct region' do
         before do
-          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_server_path('bb000cr7262', 'image.jp2')}/pct:3.0,3.0,77.0,77.0/full/0/default.jpg")
+          stub_request(:get, "http://imageserver-prod.stanford.edu/iiif/2/#{image_path_component}/pct:3.0,3.0,77.0,77.0/full/0/default.jpg")
             .to_return(status: 200, body: "")
         end
 

spec/services/iiif_metadata_service_spec.rb

@@ -6,7 +6,7 @@
   let(:base_uri) { 'https://sul-imageserver-uat.stanford.edu/cantaloupe/iiif/2/' } # 'image-server-path'
   let(:druid) { 'nr349ct7889' }
   let(:file_name) { 'image.jp2' }
-  let(:stacks_file) { StacksFile.new(file_name:, cocina: Cocina.new({ 'externalIdentifier' => "druid:#{druid}" })) }
+  let(:stacks_file) { StacksFile.new(file_name:, cocina: Cocina.new(Factories.legacy_cocina_with_file)) }
   let(:service) { described_class.new(stacks_file:, canonical_url: 'foo', base_uri:) }
   let(:http_client) { instance_double(HTTP::Client) }
 

spec/support/image_server_path.rb

@@ -5,7 +5,7 @@
 # reading from OCFL or not
 module ImageServerPath
   def image_server_path(druid, file_name)
-    cocina = instance_double(Cocina, druid:)
+    cocina = instance_double(Cocina, druid:, find_file_md5: '02f77c96c40ad3c7c843baa9c7b2ff2c')
     CGI.escape(StorageRoot.new(cocina:, file_name:).relative_path)
   end
 end