app/models/spotlight/resources/iiif_manifest.rb in blacklight-spotlight-3.0.0.rc2 vs app/models/spotlight/resources/iiif_manifest.rb in blacklight-spotlight-3.0.0.rc3

- old
+ new

@@ -67,11 +67,11 @@ solr_hash[full_image_field] = full_image_url end def add_label - return unless title_fields.present? && manifest.try(:label) + return unless title_fields.present? && manifest&.label Array.wrap(title_fields).each do |field| solr_hash[field] = metadata_class.new(manifest).label end end @@ -142,23 +142,23 @@ def sequences manifest.try(:sequences) || [] end def thumbnail_field - blacklight_config.index.try(:thumbnail_field) + blacklight_config.index.thumbnail_field end def full_image_field Spotlight::Engine.config.full_image_field end def tile_source_field - blacklight_config.show.try(:tile_source_field) + blacklight_config.show.tile_source_field end def title_fields - Spotlight::Engine.config.iiif_title_fields || blacklight_config.index.try(:title_field) + Spotlight::Engine.config.iiif_title_fields || blacklight_config.index&.title_field end def sidecar @sidecar ||= document_model.new(id: compound_id).sidecar(exhibit) end @@ -185,20 +185,20 @@ def to_solr metadata_hash.merge(manifest_level_metadata) end def label - return unless manifest.try(:label) + return unless manifest&.label Array(json_ld_value(manifest.label)).map { |v| html_sanitize(v) }.first end private attr_reader :manifest def metadata - manifest.try(:metadata) || [] + manifest&.metadata || [] end def metadata_hash return {} unless metadata.present? return {} unless metadata.is_a?(Array)