Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[i335] - port over serverless code from nnp #198

Merged
merged 6 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/indexers/concerns/iiif_print/file_set_indexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,15 @@ def generate_solr_document
text = text.tr("\n", ' ').squeeze(' ')
solr_doc['all_text_timv'] = text
solr_doc['all_text_tsimv'] = text
solr_doc['digest_ssim'] = digest_from_content
end
end

private

def digest_from_content
return unless object.original_file
object.original_file.digest.first.to_s
end
end
end
5 changes: 5 additions & 0 deletions app/models/concerns/iiif_print/solr/document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module IiifPrint::Solr::Document
def self.decorate(base)
base.prepend(self)
base.send(:attribute, :is_child, Hyrax::SolrDocument::Metadata::Solr::String, 'is_child_bsi')
base.send(:attribute, :digest, Hyrax::SolrDocument::Metadata::Solr::String, 'digest_ssim')

# @note These properties came from the newspaper_works gem. They are configurable.
base.class_attribute :iiif_print_solr_field_names, default: %w[alternative_title genre
Expand All @@ -31,6 +32,10 @@ def self.decorate(base)
base
end

def digest_sha1
digest[/urn:sha1:([\w]+)/, 1]
end

def method_missing(method_name, *args, &block)
super unless iiif_print_solr_field_names.include? method_name.to_s
self[::ActiveFedora.index_field_mapper.solr_name(method_name.to_s)]
Expand Down
69 changes: 69 additions & 0 deletions app/presenters/iiif_print/iiif_manifest_presenter_behavior.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,74 @@ def sequence_rendering
'label' => I18n.t("hyrax.manifest.download_text") + (rendering.label || '') }
end.flatten
end

module DisplayImagePresenterBehavior
ShanaLMoore marked this conversation as resolved.
Show resolved Hide resolved
def display_image
return nil unless latest_file_id

IIIFManifest::DisplayImage
.new(display_image_url(hostname),
format: image_format(alpha_channels),
width: width,
height: height,
iiif_endpoint: iiif_endpoint(latest_file_id, base_url: hostname))
end

def display_image_url(base_url)
if ENV['SERVERLESS_IIIF_URL'].present?
# At the moment we are only concerned about Hyrax's default image url builder
iiif_image_url_builder(url_builder: Hyrax.config.iiif_image_url_builder)
else
super
end
end

def iiif_endpoint(file_id, base_url: request.base_url)
if ENV['SERVERLESS_IIIF_URL'].present?
IIIFManifest::IIIFEndpoint.new(
File.join(ENV['SERVERLESS_IIIF_URL'], file_id),
profile: Hyrax.config.iiif_image_compliance_level_uri
)
else
super
end
end

def hostname
@hostname || 'localhost'
end

##
# @return [Boolean] false
def work?
false
end

private

def latest_file_id
if ENV['SERVERLESS_IIIF_URL'].present?
serverless_latest_file_id
else
super
end
end

def serverless_latest_file_id
@latest_file_id ||= digest_sha1
end

def iiif_image_url_builder(url_builder:)
args = [
latest_file_id,
ENV['SERVERLESS_IIIF_URL'],
Hyrax.config.iiif_image_size_default
]
# In Hyrax 3, Hyrax.config.iiif_image_url_builder takes an additional argument
args << image_format(alpha_channels) if url_builder.arity == 4

url_builder.call(*args).gsub(%r{images/}, '')
end
end
end
end
2 changes: 2 additions & 0 deletions lib/iiif_print/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ def ability

config.after_initialize do
IiifPrint::Solr::Document.decorate(SolrDocument)
Hyrax::IiifManifestPresenter::DisplayImagePresenter
.prepend(IiifPrint::IiifManifestPresenterBehavior::DisplayImagePresenterBehavior)
end
# rubocop:enable Metrics/BlockLength
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,33 @@
expect(presenter.search_service).to include("#{solr_document.id}/iiif_search")
end
end

# this method is inside of the DisplayImagePresenterBehavior module
describe '#display_image' do
let(:presenter) { Hyrax::IiifManifestPresenter::DisplayImagePresenter.new(solr_document) }
let(:id) { 'abc123' }

context 'when serverless_iiif is enabled' do
let(:url) { 'serverless_iiif_url' }

it 'renders a serverless url' do
allow(ENV).to receive(:[])
allow(ENV).to receive(:[]).with('SERVERLESS_IIIF_URL').and_return(url)
allow(presenter).to receive(:latest_file_id).and_return(id)
expect(presenter.display_image.iiif_endpoint.url).to eq "#{url}/#{id}"
expect(presenter.display_image.iiif_endpoint.profile).to eq "http://iiif.io/api/image/2/level2.json"
end
end

context 'when serverless_iiif is not enabled' do
let(:iiif_info_url_builder) { ->(file_id, base_url) { "#{base_url}/#{file_id}" } }

it 'does not render a serverless url' do
allow(presenter).to receive(:latest_file_id).and_return(id)
allow(Hyrax.config).to receive(:iiif_image_server?).and_return(true)
allow(Hyrax.config).to receive(:iiif_info_url_builder).and_return(iiif_info_url_builder)
expect(presenter.display_image.iiif_endpoint.url).to eq "localhost/#{id}"
end
end
end
end