Skip to content

Commit

Permalink
[i335] rubocop fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Shana Moore committed Mar 22, 2023
1 parent a3cda4e commit f83b632
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 61 deletions.
9 changes: 4 additions & 5 deletions app/indexers/concerns/iiif_print/file_set_indexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ def generate_solr_document
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
def digest_from_content
return unless object.original_file
object.original_file.digest.first.to_s
end
end
end
108 changes: 54 additions & 54 deletions app/presenters/iiif_print/iiif_manifest_presenter_behavior.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,65 +26,65 @@ def sequence_rendering
end.flatten
end

module DisplayImagePresenterBehavior
def display_image
return nil unless model.image?
return nil unless latest_file_id
module DisplayImagePresenterBehavior
def display_image
# return nil unless model.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
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?
Hyrax.config.iiif_image_url_builder.call(
latest_file_id,
ENV['SERVERLESS_IIIF_URL'],
Hyrax.config.iiif_image_size_default
).gsub(%r{images/}, '')
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
def display_image_url(base_url)
if ENV['SERVERLESS_IIIF_URL'].present?
Hyrax.config.iiif_image_url_builder.call(
latest_file_id,
ENV['SERVERLESS_IIIF_URL'],
Hyrax.config.iiif_image_size_default
).gsub(%r{images/}, '')
else
super
end

def hostname
@hostname || 'localhost'
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

##
# @return [Boolean] false
def work?
false
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

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
end

def serverless_latest_file_id
@latest_file_id ||= digest_sha1
end
end
end
end
4 changes: 2 additions & 2 deletions lib/iiif_print/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ def ability
end
end
end

config.after_initialize do
IiifPrint::Solr::Document.decorate(SolrDocument)
Hyrax::IiifManifestPresenter::DisplayImagePresenter
.prepend(IiifPrint::IiifManifestPresenterBehavior::DisplayImagePresenterBehavior)
.prepend(IiifPrint::IiifManifestPresenterBehavior::DisplayImagePresenterBehavior)
end
# rubocop:enable Metrics/BlockLength
end
Expand Down

0 comments on commit f83b632

Please sign in to comment.