cocina_display 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cfe681a820ad5986d0503157b5add9a8cb089af31e3afaba0ed2964d33bda6
-  data.tar.gz: b60af2ecc9cfdc031e57ae98cb1093aa3b111a5c14dda40b71814e07a9f2d941
+  metadata.gz: 9b7ec735c0ad257e8313d365e8900790b9acc115f98607a61a3b4eb293a2cb9a
+  data.tar.gz: a9761a59329eb8095c055063ef63b5b9e9c99d1d754cc8af3b20d95f59ec1fa7
 SHA512:
-  metadata.gz: 2c010edefb699c21c82a3c426befcb16e4fa0e72aeeda6e77c2ed8eba9fa1aa6e365e889fda6f94f6d118a3bde2a968e4ece610f918995721c14a1fc6fc5b723
-  data.tar.gz: fa61cbcd25787c2ec552fff17f5282e425ff5b46d03f0b60476c017faab41f7f059bd7630e54c2fc753a6330cf87a41c12bda20fbd3bd602e567264cfa6b133b
+  metadata.gz: 1e522347186bddba536dd3139b6ce540a06724879d300caa296f96dbd29c866bc087756e3b95beb4b8b20541141b41ae60b1b892dcf49b30ffe8f26e3de67102
+  data.tar.gz: e87f404d0eaa5aaf3e7fbac2ff2effdfef1a644fa7ae02b4f29f9207804249eabcd25f9c992892a839a634750817d76c78e9e8f388a79a3e855f8cb5b782e23d

data/config/searchworks_languages.yml

@@ -1,7 +1,8 @@
 # Map of language codes to language names used in Searchworks, ported from stanford-mods gem.
 # See: https://github.com/solrmarc/stanford-solr-marc/blob/master/stanford-sw/translation_maps/language_map.properties
 
-aaa: Afar
+#???: null
+aar: Afar
 abk: Abkhaz
 ace: Achinese
 ach: Acoli
@@ -11,7 +12,8 @@ afa: Afroasiatic (Other)
 afh: Afrihili (Artificial language)
 afr: Afrikaans
 ain: Ainu
-ajm: Aljamia
+# ajm is deprecated
+ajm: Aljamía
 aka: Akan
 akk: Akkadian
 alb: Albanian
@@ -24,12 +26,13 @@ anp: Angika
 apa: Apache languages
 ara: Arabic
 arc: Aramaic
-arg: Aragonese Spanish
+arg: Aragonese
 arm: Armenian
 arn: Mapuche
 arp: Arapaho
 art: Artificial (Other)
 arw: Arawak
+# ase from iso639-3
 ase: American Sign Language
 asm: Assamese
 ast: Bable
@@ -40,7 +43,7 @@ ave: Avestan
 awa: Awadhi
 aym: Aymara
 aze: Azerbaijani
-bad: Banda
+bad: Banda languages
 bai: Bamileke languages
 bak: Bashkir
 bal: Baluchi
@@ -55,7 +58,7 @@ bem: Bemba
 ben: Bengali
 ber: Berber (Other)
 bho: Bhojpuri
-bih: Bihari
+bih: Bihari (Other)
 bik: Bikol
 bin: Edo
 bis: Bislama
@@ -72,6 +75,7 @@ bur: Burmese
 byn: Bilin
 cad: Caddo
 cai: Central American Indian (Other)
+# cam is deprecated
 cam: Khmer
 car: Carib
 cat: Catalan
@@ -83,7 +87,7 @@ chb: Chibcha
 che: Chechen
 chg: Chagatai
 chi: Chinese
-chk: Truk
+chk: Chuukese
 chm: Mari
 chn: Chinook jargon
 cho: Choctaw
@@ -93,6 +97,7 @@ chu: Church Slavic
 chv: Chuvash
 chy: Cheyenne
 cmc: Chamic languages
+cnr: Montenegrin
 cop: Coptic
 cor: Cornish
 cos: Corsican
@@ -110,8 +115,8 @@ dan: Danish
 dar: Dargwa
 day: Dayak
 del: Delaware
-den: Slave
-dgr: Dogrib
+den: Slavey
+dgr: Tlicho
 din: Dinka
 div: Divehi
 doi: Dogri
@@ -124,20 +129,25 @@ dyu: Dyula
 dzo: Dzongkha
 efi: Efik
 egy: Egyptian
+# per RFC 5646 and ISO 15924
 egy-Egyd: Egyptian, Demotic
 eka: Ekajuk
 elx: Elamite
 eng: English
 enm: English, Middle (1100-1500)
 epo: Esperanto
+# esk is deprecated
 esk: Eskimo languages
+# esp is deprecated
 esp: Esperanto
 est: Estonian
+# eth is deprecated
 eth: Ethiopic
 ewe: Ewe
 ewo: Ewondo
 fan: Fang
 fao: Faroese
+# far is deprecated
 far: Faroese
 fat: Fanti
 fij: Fijian
@@ -146,17 +156,21 @@ fin: Finnish
 fiu: Finno-Ugrian (Other)
 fon: Fon
 fre: French
+# fri is deprecated
 fri: Frisian
-frm: French, Middle (ca. 1400-1600)
-fro: French, Old (ca. 842-1400)
+frm: French, Middle (ca. 1300-1600)
+fro: French, Old (ca. 842-1300)
 frr: North Frisian
 frs: East Frisian
 fry: Frisian
 ful: Fula
 fur: Friulian
-gaa: Ga
+gaa: Gã
+# gae is deprecated
 gae: Scottish Gaelic
+# gag is deprecated
 gag: Galician
+# gal is deprecated
 gal: Oromo
 gay: Gayo
 gba: Gbaya
@@ -176,12 +190,13 @@ gor: Gorontalo
 got: Gothic
 grb: Grebo
 grc: Greek, Ancient (to 1453)
-gre: Greek, Modern (1453- )
+gre: Greek, Modern (1453-)
 grn: Guarani
 gsw: Swiss German
+# gua is deprecated
 gua: Guarani
 guj: Gujarati
-gwi: Gwich'in 
+gwi: Gwich'in
 hai: Haida
 hat: Haitian French Creole
 hau: Hausa
@@ -189,7 +204,7 @@ haw: Hawaiian
 heb: Hebrew
 her: Herero
 hil: Hiligaynon
-him: Himachali
+him: Western Pahari languages
 hin: Hindi
 hit: Hittite
 hmn: Hmong
@@ -212,9 +227,11 @@ inc: Indic (Other)
 ind: Indonesian
 ine: Indo-European (Other)
 inh: Ingush
+# int is deprecated
 int: Interlingua (International Auxiliary Language Association)
 ipk: Inupiaq
 ira: Iranian (Other)
+# iri is deprecated
 iri: Irish
 iro: Iroquoian (Other)
 ita: Italian
@@ -226,10 +243,10 @@ jrb: Judeo-Arabic
 kaa: Kara-Kalpak
 kab: Kabyle
 kac: Kachin
-kal: Kalatdlisut
+kal: Kalâtdlisut
 kam: Kamba
 kan: Kannada
-kar: Karen
+kar: Karen languages
 kas: Kashmiri
 kau: Kanuri
 kaw: Kawi
@@ -247,22 +264,25 @@ kok: Konkani
 kom: Komi
 kon: Kongo
 kor: Korean
-kos: Kusaie
+kos: Kosraean
 kpe: Kpelle
 krc: Karachay-Balkar
 krl: Karelian
-kro: Kru
+kro: Kru (Other)
 kru: Kurukh
 kua: Kuanyama
 kum: Kumyk
 kur: Kurdish
+# kus is deprecated
 kus: Kusaie
-kut: Kutenai
+kut: Kootenai
 lad: Ladino
-lah: Lahnda
-lam: Lamba
-lan: Occitan (post-1500)
+lah: Lahndā
+lam: Lamba (Zambia and Congo)
+# lan is deprecated
+lan: Occitan (post 1500)
 lao: Lao
+# lap is deprecated
 lap: Sami
 lat: Latin
 lav: Latvian
@@ -272,11 +292,11 @@ lin: Lingala
 lit: Lithuanian
 lol: Mongo-Nkundu
 loz: Lozi
-ltz: Letzeburgesch
+ltz: Luxembourgish
 lua: Luba-Lulua
 lub: Luba-Katanga
 lug: Ganda
-lui: Luiseno
+lui: Luiseño
 lun: Lunda
 luo: Luo (Kenya and Tanzania)
 lus: Lushai
@@ -291,7 +311,8 @@ man: Mandingo
 mao: Maori
 map: Austronesian (Other)
 mar: Marathi
-mas: Masai
+mas: Maasai
+# max is deprecated
 max: Manx
 may: Malay
 mdf: Moksha
@@ -302,6 +323,7 @@ mic: Micmac
 min: Minangkabau
 # mis: Miscellaneous languages
 mkh: Mon-Khmer (Other)
+# mla is deprecated
 mla: Malagasy
 mlg: Malagasy
 mlt: Maltese
@@ -309,9 +331,10 @@ mnc: Manchu
 mni: Manipuri
 mno: Manobo languages
 moh: Mohawk
+# mol is deprecated
 mol: Moldavian
 mon: Mongolian
-mos: Moore
+mos: Mooré
 # mul: Multiple languages
 mun: Munda (Other)
 mus: Creek
@@ -334,7 +357,7 @@ nia: Nias
 nic: Niger-Kordofanian (Other)
 niu: Niuean
 nno: Norwegian (Nynorsk)
-nob: Norwegian (Bokmal)
+nob: Norwegian (Bokmål)
 nog: Nogai
 non: Old Norse
 nor: Norwegian
@@ -368,10 +391,10 @@ phi: Philippine (Other)
 phn: Phoenician
 pli: Pali
 pol: Polish
-pon: Ponape
+pon: Pohnpeian
 por: Portuguese
 pra: Prakrit languages
-pro: Provencal (to 1500)
+pro: Provençal (to 1500)
 pus: Pushto
 que: Quechua
 raj: Rajasthani
@@ -391,18 +414,22 @@ sai: South American Indian (Other)
 sal: Salishan languages
 sam: Samaritan Aramaic
 san: Sanskrit
+# sao is deprecated
 sao: Samoan
 sas: Sasak
 sat: Santali
+# scc is deprecated
 scc: Serbian
 scn: Sicilian Italian
 sco: Scots
+# scr is deprecated
 scr: Croatian
 sel: Selkup
 sem: Semitic (Other)
 sga: Irish, Old (to 1100)
 sgn: Sign languages
 shn: Shan
+# sho is deprecated
 sho: Shona
 sid: Sidamo
 sin: Sinhalese
@@ -420,6 +447,7 @@ smo: Samoan
 sms: Skolt Sami
 sna: Shona
 snd: Sindhi
+# snh is deprecated
 snh: Sinhalese
 snk: Soninke
 sog: Sogdian
@@ -432,6 +460,7 @@ srn: Sranan
 srp: Serbian
 srr: Serer
 ssa: Nilo-Saharan (Other)
+# sso is deprecated
 sso: Sotho
 ssw: Swazi
 suk: Sukuma
@@ -440,14 +469,18 @@ sus: Susu
 sux: Sumerian
 swa: Swahili
 swe: Swedish
+# swz is deprecated
 swz: Swazi
 syc: Syriac
 syr: Syriac, Modern
+# tag is deprecated
 tag: Tagalog
 tah: Tahitian
 tai: Tai (Other)
+# taj is deprecated
 taj: Tajik
 tam: Tamil
+# tar is deprecated
 tar: Tatar
 tat: Tatar
 tel: Telugu
@@ -458,7 +491,7 @@ tgk: Tajik
 tgl: Tagalog
 tha: Thai
 tib: Tibetan
-tig: Tigre
+tig: Tigré
 tir: Tigrinya
 tiv: Tiv
 tkl: Tokelauan
@@ -468,10 +501,12 @@ tmh: Tamashek
 tog: Tonga (Nyasa)
 ton: Tongan
 tpi: Tok Pisin
+# tru is deprecated
 tru: Truk
 tsi: Tsimshian
 tsn: Tswana
 tso: Tsonga
+# tsw is deprecated
 tsw: Tswana
 tuk: Turkmen
 tum: Tumbuka
@@ -492,17 +527,17 @@ uzb: Uzbek
 vai: Vai
 ven: Venda
 vie: Vietnamese
-vol: Volapuk
+vol: Volapük
 vot: Votic
 wak: Wakashan languages
-wal: Walamo
+wal: Wolayta
 war: Waray
-was: Washo
+was: Washoe
 wel: Welsh
-wen: Sorbian languages
+wen: Sorbian (Other)
 wln: Walloon
 wol: Wolof
-xal: Kalmyk
+xal: Oirat
 xho: Xhosa
 yao: Yao (Africa)
 yap: Yapese
@@ -513,7 +548,7 @@ zap: Zapotec
 zbl: Blissymbolics
 zen: Zenaga
 zha: Zhuang
-znd: Zande
+znd: Zande languages
 zul: Zulu
 zun: Zuni
 # zxx: null

data/lib/cocina_display/concerns/contributors.rb

@@ -108,11 +108,13 @@ module CocinaDisplay
       end
 
       # All contributors for the object, including authors, editors, etc.
-      # @note Does not include contributors attached to events.
+      # Checks both description.contributor and description.event.contributor.
       # @return [Array<Contributor>]
       def contributors
-        @contributors ||= path("$.description.contributor.*")
-          .map { |c| CocinaDisplay::Contributors::Contributor.new(c) }
+        @contributors ||= Enumerator::Chain.new(
+          path("$.description.contributor.*"),
+          path("$.description.event.*.contributor.*")
+        ).map { |c| CocinaDisplay::Contributors::Contributor.new(c) }
       end
 
       # All contributors with an "author" role.
@@ -145,7 +147,13 @@ module CocinaDisplay
       # @return [Array<Contributor>]
       def additional_contributors
         return [] if contributors.empty? || contributors.one?
-        contributors - [main_contributor]
+        contributors.reject { |c| imprint_contributors.include?(c) } - [main_contributor]
+      end
+
+      # The contributors associated with imprint events (usually publishers).
+      # @return [Array<Contributor>]
+      def imprint_contributors
+        imprint_events.flat_map(&:contributors).uniq
       end
     end
   end

data/lib/cocina_display/concerns/events.rb

@@ -38,11 +38,10 @@ module CocinaDisplay
       # @param ignore_qualified [Boolean] Reject qualified dates (e.g. approximate)
       # @return [Array<Integer>, nil]
       # @note 6 BCE will appear as -5; 4 CE will appear as 4.
-      def pub_year_int_range(ignore_qualified: false)
+      def pub_year_ints(ignore_qualified: false)
         date = pub_date(ignore_qualified: ignore_qualified)
         return unless date
 
-        date = date.as_interval if date.is_a? CocinaDisplay::Dates::DateRange
         date.to_a.map(&:year).compact.uniq.sort
       end
 

data/lib/cocina_display/concerns/forms.rb

@@ -199,15 +199,13 @@ module CocinaDisplay
         when "manuscript", "mixed material"
           values << "Archive/Manuscript"
         when "moving image"
-          values << "Video"
+          values << "Video/Film"
         when "notated music"
           values << "Music score"
         when "software, multimedia"
           # Prevent GIS datasets from being labeled as "Software"
           values << "Software/Multimedia" unless cartographic? || dataset?
-        when "sound recording-musical"
-          values << "Music recording"
-        when "sound recording-nonmusical", "sound recording"
+        when "sound recording-musical", "sound recording-nonmusical", "sound recording"
           values << "Sound recording"
         when "still image"
           values << "Image"
@@ -216,7 +214,8 @@ module CocinaDisplay
           # 2 records currently (2025) in Searchworks do this, but it is real.
           if periodical? || archived_website?
             values << "Journal/Periodical" if periodical?
-            values << "Archived website" if archived_website?
+            values << "Website" if archived_website?
+            values << "Website|Archived website" if archived_website?
           else
             values << "Book"
           end

data/lib/cocina_display/concerns/geospatial.rb

@@ -13,9 +13,10 @@ module CocinaDisplay
 
       # All valid coordinate data formatted for indexing into a Solr RPT field.
       # @note This type of field accommodates both points and bounding boxes.
+      # @note In WKT, points have longitude first, unlike {coordinates_as_point}.
       # @see https://solr.apache.org/guide/solr/latest/query-guide/spatial-search.html#rpt
       # @return [Array<String>]
-      # @example ["POINT(34.0522 -118.2437)", "POLYGON((-118.2437 34.0522, -118.2437 34.1996, -117.9522 34.1996, -117.9522 34.0522, -118.2437 34.0522))"]
+      # @example ["POINT(-118.2437 34.0522)", "POLYGON((-118.2437 34.0522, -118.2437 34.1996, -117.9522 34.1996, -117.9522 34.0522, -118.2437 34.0522))"]
       def coordinates_as_wkt
         coordinate_objects.map(&:as_wkt).uniq
       end

data/lib/cocina_display/concerns/identifiers.rb

@@ -8,8 +8,7 @@ module CocinaDisplay
       # @example
       #   record.druid #=> "druid:bb099mt5053"
       def druid
-        cocina_doc["externalIdentifier"] ||
-          cocina_doc.dig("description", "purl")&.split("/")&.last
+        cocina_doc["externalIdentifier"] || purl_url&.split("/")&.last
       end
 
       # The DRUID for the object, without the +druid:+ prefix.
@@ -64,10 +63,12 @@ module CocinaDisplay
         folio_hrid || bare_druid
       end
 
-      # Identifier objects extracted from the Cocina metadata.
+      # All identifier objects, optionally filtered by type.
+      # @param type [String, nil] The type of identifier to filter by (e.g. "DOI").
+      # @note Type matching is case insensitive.
       # @return [Array<Identifier>]
-      def identifiers
-        @identifiers ||= path("$.description.identifier[*]").map { |id| Identifier.new(id) } + Array(doi_from_identification)
+      def identifiers(type: nil)
+        type.present? ? all_identifiers.filter { |id| id.type&.casecmp?(type) } : all_identifiers
       end
 
       # Labelled display data for identifiers.
@@ -78,6 +79,12 @@ module CocinaDisplay
 
       private
 
+      # All identifier objects extracted from the Cocina metadata.
+      # @return [Array<Identifier>]
+      def all_identifiers
+        @identifiers ||= path("$.description.identifier[*]").map { |id| Identifier.new(id) } + Array(doi_from_identification)
+      end
+
       # Synthetic Identifier object for a DOI in the identification block.
       # @return [Array<Identifier>]
       def doi_from_identification

data/lib/cocina_display/concerns/notes.rb

@@ -8,6 +8,25 @@ module CocinaDisplay
         @notes ||= path("$.description.note.*").map { |note| CocinaDisplay::Note.new(note) }
       end
 
+      # Text of all abstract notes.
+      # @return [Array<String>]
+      def abstracts
+        notes.select(&:abstract?).map(&:to_s).compact_blank
+      end
+
+      # Text of all table of contents notes.
+      # @return [Array<String>]
+      def tables_of_contents
+        notes.select(&:table_of_contents?).map(&:to_s).compact_blank
+      end
+
+      # Preferred citation for the object.
+      # If there are multiple notes with this type, uses the first.
+      # @return [String, nil]
+      def preferred_citation
+        notes.find(&:preferred_citation?)&.to_s
+      end
+
       # Abstract metadata for display.
       # @return [Array<CocinaDisplay::DisplayData>]
       def abstract_display_data

data/lib/cocina_display/concerns/structural.rb

@@ -4,23 +4,44 @@ module CocinaDisplay
   module Concerns
     # Methods for inspecting structural metadata (e.g. file hierarchy)
     module Structural
+      # Structured data for all file sets in the object.
+      # Each fileset contains one or more files.
+      # @return [Array<CocinaDisplay::Structural::FileSet>]
+      # @example
+      #  record.filesets.each do |fileset|
+      #   puts fileset.type #=> "image"
+      #   puts fileset.label #=> "High Resolution Images"
+      #  end
+      def filesets
+        @filesets ||= path("$.structural.contains.*").map do |fileset|
+          CocinaDisplay::Structural::FileSet.new(fileset, druid: bare_druid, base_url: stacks_base_url)
+        end
+      end
+
       # Structured data for all individual files in the object.
       # Traverses nested FileSet structure to return a flattened array.
-      # @return [Array<Hash>]
+      # @return [Array<CocinaDisplay::Structural::File>]
       # @example
       #  record.files.each do |file|
-      #   puts file["filename"] #=> "image1.jpg"
-      #   puts file["size"] #=> 123456
+      #   puts file.filename #=> "image1.jpg"
+      #   puts file.size #=> 123456
       #  end
       def files
-        @files ||= path("$.structural.contains.*.structural.contains.*").search
+        filesets.flat_map(&:files)
       end
 
       # All unique MIME types of files in this object.
       # @return [Array<String>]
       # @example ["image/jpeg", "application/pdf"]
       def file_mime_types
-        files.pluck("hasMimeType").uniq
+        files.map(&:mime_type).compact.uniq
+      end
+
+      # All unique types of filesets in this object.
+      # @return [Array<String>]
+      # @example ["image", "document"]
+      def fileset_types
+        filesets.map(&:type).compact.uniq
       end
 
       # Human-readable string representation of {total_file_size_int}.
@@ -34,7 +55,25 @@ module CocinaDisplay
       # @return [Integer]
       # @example 2621440
       def total_file_size_int
-        files.pluck("size").sum
+        files.map(&:size).compact.sum
+      end
+
+      # URL to a thumbnail image for this object, if any.
+      # @note Uses the IIIF image server to generate an image of the given size.
+      # @param region [String] Desired region of the image (e.g., "full", "square", "x,y,w,h", "pct:x,y,w,h").
+      # @param width [String] Desired width of the image in pixels (use "!" prefix to preserve aspect ratio).
+      # @param height [String] Desired height of the image in pixels.
+      # @return [String, nil]
+      # @example "https://stacks.stanford.edu/image/iiif/ts786ny5936%2FPC0170_s1_E_0204.jp2/full/!400,400/0/default.jpg"
+      def thumbnail_url(region: "full", width: "!400", height: "400")
+        thumbnail_file&.iiif_url(region: region, width: width, height: height)
+      end
+
+      # True if the object has a usable thumbnail file.
+      # @note Does not attempt to crawl virtual object members for thumbnails.
+      # @return [Boolean]
+      def thumbnail?
+        thumbnail_file.present?
       end
 
       # DRUIDs of collections this object is a member of.
@@ -44,17 +83,36 @@ module CocinaDisplay
         path("$.structural.isMemberOf.*").map { |druid| druid.delete_prefix("druid:") }
       end
 
+      # Whether this object is a virtual object.
+      # @return [Boolean]
       def virtual_object?
-        return false if path("$.structural.contains.*").any?
+        return false if filesets.any?
 
         path("$.structural.hasMemberOrders.*.members.*").any?
       end
 
+      # DRUIDs of members of this virtual object.
+      # @return [Array<String>]
+      # @example ["ts786ny5936", "tp006ms8736", "tj297ys4758"]
       def virtual_object_members
         return [] unless virtual_object?
 
         path("$.structural.hasMemberOrders.*.members.*").map { |druid| druid.delete_prefix("druid:") }
       end
+
+      # DRUIDs of virtual objects this object is a part of.
+      # @return [Array<String>]
+      # @example "hj097bm8879"
+      def virtual_object_parents
+        related_resources.filter { |res| res.type == "part of" }.map(&:druid).compact_blank
+      end
+
+      # The thumbnail file for this object, if any.
+      # Prefers files marked as thumbnails; falls back to any JP2 image.
+      # @return [CocinaDisplay::Structural::File, nil]
+      def thumbnail_file
+        files.find(&:thumbnail?) || files.find(&:jp2_image?)
+      end
     end
   end
 end

data/lib/cocina_display/dates/date.rb

@@ -84,7 +84,7 @@ module CocinaDisplay
           return
         end
 
-        sanitized = value.gsub(/^[\[]+/, "").gsub(/[\.\]]+$/, "")
+        sanitized = value.gsub(/^\[+/, "").gsub(/[.\]]+$/, "")
         sanitized = value.rjust(4, "0") if /^\d{3}$/.match?(value)
 
         sanitized
@@ -291,25 +291,17 @@ module CocinaDisplay
           return value.sub(/(\d{2})(\d{2})-(\d{2})/, '\1\2-\1\3')
         end
 
-        value.gsub(/(?<![\d])(\d{1,3})([xu-]{1,3})/i) { "#{Regexp.last_match(1)}#{"0" * Regexp.last_match(2).length}" }.scan(/[\d-]/).join
+        value.gsub(/(?<!\d)(\d{1,3})([xu-]{1,3})/i) { "#{Regexp.last_match(1)}#{"0" * Regexp.last_match(2).length}" }.scan(/[\d-]/).join
       end
 
       # Decoded version of the date with "BCE" or "CE". Strips leading zeroes.
       # @param allowed_precisions [Array<Symbol>] List of allowed precisions for the output.
       #   Defaults to [:day, :month, :year, :decade, :century, :unknown].
-      # @param ignore_unparseable [Boolean] Return nil instead of the original value if it couldn't be parsed
-      # @param display_original_value [Boolean] Return the original value if it was not encoded
       # @return [String]
-      def decoded_value(allowed_precisions: [:day, :month, :year, :decade, :century, :unknown], ignore_unparseable: false, display_original_value: true)
-        return if ignore_unparseable && !parsed_date?
-        return value.strip unless parsed_date?
-
-        if display_original_value
-          unless encoding?
-            return value.strip unless value =~ /^-?\d+$/ || value =~ /^[\dXxu?-]{4}$/
-          end
+      def decoded_value(allowed_precisions: [:day, :month, :year, :decade, :century, :unknown])
+        if !parsed_date? || (!encoding? && value !~ /^-?\d+$/ && value !~ /^[\dXxu?-]{4}$/)
+          return value.strip
         end
-
         if date.is_a?(EDTF::Interval)
           range = [
             Date.format_date(date.min, date.min.precision, allowed_precisions),
@@ -342,18 +334,25 @@ module CocinaDisplay
         format(qualified_format, decoded_value)
       end
 
-      # Range between earliest possible date and latest possible date.
-      # @note Some encodings support disjoint sets of ranges, so this method could be less accurate than {#to_a}.
-      # @return [Range]
+      # Range of {Date}s between earliest possible date and latest possible date.
+      # @note Output has day precision, using the first day/month if unspecified.
+      # @note If the range is open-ended, uses today's date as the end date.
+      # @note {EDTF::Set}s can be disjoint ranges, but this method will return the full span, unlike {#to_a}.
+      # @return [Range<Date>, nil]
       def as_range
-        return unless earliest_date && latest_date
+        return unless earliest_date || latest_date
 
-        earliest_date..latest_date
+        start = earliest_date || latest_date
+        stop = latest_date || ::Date.today
+
+        start..stop
       end
 
-      # Array of all dates that fall into the range of possible dates in the data.
-      # @note Some encodings support disjoint sets of ranges, so this method could be more accurate than {#as_range}.
-      # @return [Array]
+      # Array of all individual {Date}s that are described by the data.
+      # @note Output dates will have the same precision as the input date (e.g. year vs day).
+      # @note If the range is open-ended, uses today's date as the end date.
+      # @note {EDTF::Set}s can be disjoint ranges; unlike {#as_range} this method will respect any gaps.
+      # @return [Array<Date>]
       def to_a
         case date
         when EDTF::Set
@@ -363,8 +362,6 @@ module CocinaDisplay
         end
       end
 
-      private
-
       class << self
         # Returns the date in the format specified by the precision.
         # Supports e.g. retrieving year precision when the actual date is more precise.
@@ -444,6 +441,8 @@ module CocinaDisplay
         end
       end
 
+      private
+
       # Expand placeholders like "19XX" into an object representing the full range.
       # @note This is different from dates with an explicit start/end in the Cocina.
       # @see CocinaDisplay::Dates::DateRange
@@ -523,13 +522,11 @@ module CocinaDisplay
     # MARC date parser; similar to EDTF but with some MARC-specific encodings.
     class MarcFormat < Date
       def self.normalize_to_edtf(value)
-        return nil if value == "9999" || value == "uuuu" || value == "||||"
+        return nil if value == "9999" || value == "||||"
 
         super
       end
 
-      private
-
       def earliest_date
         if value == "1uuu"
           ::Date.parse("1000-01-01")
@@ -545,6 +542,8 @@ module CocinaDisplay
           super
         end
       end
+
+      private
     end
 
     # Base class for date formats that match using a regex.
@@ -600,7 +599,7 @@ module CocinaDisplay
 
     # Extractor for dates encoded as Roman numerals.
     class RomanNumeralYearFormat < ExtractorDateFormat
-      REGEX = /(?<![A-Za-z\.])(?<year>[MCDLXVI\.]+)(?![A-Za-z])/
+      REGEX = /(?<![A-Za-z.])(?<year>[MCDLXVI.]+)(?![A-Za-z])/
 
       def self.normalize_to_edtf(text)
         matches = text.match(REGEX)

data/lib/cocina_display/dates/date_range.rb

@@ -14,8 +14,8 @@ module CocinaDisplay
         # Create the individual dates; if no encoding/type declared give them
         # top-level encoding/type
         dates = cocina["structuredValue"].map do |sv|
+          sv["encoding"] ||= cocina["encoding"]
           date = Date.from_cocina(sv)
-          date.encoding ||= cocina.dig("encoding", "code")
           date.type ||= cocina["type"]
           date
         end
@@ -44,7 +44,7 @@ module CocinaDisplay
       # @see CocinaDisplay::Date#value
       # @return [Array<String>]
       def value
-        [start&.value, stop&.value]
+        [start&.value, stop&.value].compact
       end
 
       # Key used to sort this date range. Respects BCE/CE ordering and precision.
@@ -52,7 +52,7 @@ module CocinaDisplay
       # @see CocinaDisplay::Date#sort_key
       # @return [String]
       def sort_key
-        [start&.sort_key, stop&.sort_key].join(" - ")
+        [start&.sort_key, stop&.sort_key].compact.join(" - ")
       end
 
       # Base values of start/end as single string. Used for comparison/deduping.
@@ -116,7 +116,7 @@ module CocinaDisplay
         [
           start&.decoded_value(**kwargs),
           stop&.decoded_value(**kwargs)
-        ].uniq.join(" - ")
+        ].uniq.join(" - ").strip
       end
 
       # Decoded range with "BCE" or "CE" and qualifier markers applied.
@@ -137,12 +137,34 @@ module CocinaDisplay
         end
       end
 
-      # Express the range as an EDTF::Interval between the start and stop dates.
-      # @return [EDTF::Interval]
-      def as_interval
-        interval_start = start&.date&.edtf || "open"
-        interval_stop = stop&.date&.edtf || "open"
-        ::Date.edtf("#{interval_start}/#{interval_stop}")
+      # Earliest possible date encoded in data, respecting unspecified/imprecise info.
+      # @return [Date]
+      # @return [nil] if no start or stop date is parsable
+      def earliest_date
+        start&.earliest_date || stop&.earliest_date
+      end
+
+      # Latest possible date encoded in data, respecting unspecified/imprecise info.
+      # @note If the range is open-ended, uses today's date as the end date.
+      # @return [Date]
+      # @return [nil] if open-ended range or stop is not parsable
+      def latest_date
+        stop&.latest_date || ::Date.today
+      end
+
+      # Array of all individual {Date}s that are described by the data.
+      # @note Output dates will have the same precision as the input date (e.g. year vs day).
+      # @note {EDTF::Set}s can be disjoint ranges; unlike {#as_range} this method will respect any gaps.
+      # @note If the range is open-ended, uses today's date as the end date.
+      # @return [Array<Date>]
+      def to_a
+        start_dates = start&.to_a || []
+        stop_dates = stop&.to_a || []
+
+        return [] if start_dates.empty? && stop_dates.empty?
+        return as_range.to_a if start_dates.one? && stop_dates.one? || stop_dates.empty?
+
+        [start_dates, stop_dates].flatten.sort.uniq
       end
     end
   end

data/lib/cocina_display/events/imprint.rb

@@ -23,7 +23,7 @@ module CocinaDisplay
       # The date portion of the imprint statement, comprising all unique dates.
       # @return [String]
       def date_str
-        Utils.compact_and_join(unique_dates_for_display.map(&:qualified_value))
+        Utils.compact_and_join(unique_dates_for_display.map(&:qualified_value), delimiter: "; ")
       end
 
       # The editions portion of the imprint statement, combining all edition notes.
@@ -71,7 +71,7 @@ module CocinaDisplay
         # Remove any ranges that duplicate part of an unencoded non-range date
         ranges, singles = deduped_dates.partition { |date| date.is_a?(CocinaDisplay::Dates::DateRange) }
         unencoded_singles_dates = singles.reject(&:encoding?).flat_map(&:to_a)
-        ranges.reject! { |range| unencoded_singles_dates.any? { |date| range.as_interval.include?(date) } }
+        ranges.reject! { |date_range| unencoded_singles_dates.any? { |date| date_range.as_range.include?(date) } }
 
         (singles + ranges).sort
       end

data/lib/cocina_display/forms/resource_type.rb

@@ -2,10 +2,19 @@ module CocinaDisplay
   module Forms
     # A Resource Type form associated with part or all of a Cocina object.
     class ResourceType < Form
-      # Resource types are lowercased for display.
+      # Resource types are lowercased for display, except self-deposit types.
       # @return [String]
       def to_s
-        super&.downcase
+        stanford_self_deposit? ? flat_value : flat_value.downcase
+      end
+
+      # For self-deposit resource types, the flat value comprises primary and any subtypes.
+      # @return [String]
+      def flat_value
+        return super unless stanford_self_deposit?
+        return primary_type unless subtypes.any?
+
+        "#{primary_type} (#{subtypes.join(", ")})"
       end
 
       # Is this a Stanford self-deposit resource type?
@@ -33,6 +42,30 @@ module CocinaDisplay
       def type_label
         (I18n.t("cocina_display.field_label.form.genre") if stanford_self_deposit?) || super
       end
+
+      # The primary type, if this is a structured self-deposit resource type.
+      # @return [String, nil]
+      def primary_type
+        type_components["type"].first
+      end
+
+      # The subtypes, if this is a structured self-deposit resource type.
+      # @return [Array<String>]
+      def subtypes
+        type_components["subtype"] || []
+      end
+
+      # A hash containing the destructured resource type and subtypes, if any.
+      # @return [Hash<String, Array<String>>]
+      # @see https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md#form-part-types-for-structured-value
+      # @note Only used by self-deposit resource types.
+      def type_components
+        Utils.flatten_nested_values(cocina).each_with_object({}) do |node, hash|
+          type = node["type"]
+          hash[type] ||= []
+          hash[type] << node["value"]
+        end.compact_blank
+      end
     end
   end
 end

data/lib/cocina_display/geospatial.rb

@@ -38,7 +38,7 @@ module CocinaDisplay
         # @return [Coordinates, nil]
         def parse(value)
           # Remove all whitespace for easier matching/parsing
-          match_str = value.gsub(/[\s]+/, "")
+          match_str = value.gsub(/\s+/, "")
 
           # Try each parser in order until one matches; bail out if none do
           parser_class = [
@@ -117,10 +117,10 @@ module CocinaDisplay
       # Format using the Well-Known Text (WKT) representation.
       # @note Limits decimals to 6 places.
       # @see https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry
-      # @example "POINT(34.0522 -118.2437)"
+      # @example "POINT(-118.2437 34.0522)"
       # @return [String]
       def as_wkt
-        "POINT(%.6f %.6f)" % [point.lat, point.lng]
+        "POINT(%.6f %.6f)" % [point.lng, point.lat]
       end
 
       # Format using the CQL ENVELOPE representation.
@@ -310,12 +310,14 @@ module CocinaDisplay
     # Parse for decimal degree points, like "41.891797, 12.486419".
     class DecimalPointParser < PointParser
       include DecimalParser
-      PATTERN = /(?<lat>[0-9.EW\+\-]+),(?<lng>[0-9.NS\+\-]+)/
+
+      PATTERN = /(?<lat>[0-9.EW+-]+),(?<lng>[0-9.NS+-]+)/
     end
 
     # Parser for DMS-format points, like "N34°03′08″ W118°14′37″".
     class DMSPointParser < PointParser
       include DMSParser
+
       PATTERN = /(?<lat>[^EW]+)(?<lng>[^NS]+)/
     end
 
@@ -324,6 +326,7 @@ module CocinaDisplay
     # @see https://www.oclc.org/bibformats/en/2xx/255.html#subfieldc
     class DMSBoundingBoxParser < BoundingBoxParser
       include DMSParser
+
       PATTERN = /(?<min_lng>.+?)-+(?<max_lng>.+)\/(?<max_lat>.+?)-+(?<min_lat>.+)/
     end
 
@@ -331,6 +334,7 @@ module CocinaDisplay
     # @example W 126.04--W 052.03/N 050.37--N 006.8
     class DecimalBoundingBoxParser < BoundingBoxParser
       include DecimalParser
+
       PATTERN = /(?<min_lng>[0-9.EW]+?)-+(?<max_lng>[0-9.EW]+)\/(?<max_lat>[0-9.NS]+?)-+(?<min_lat>[0-9.NS]+)/
     end
 

data/lib/cocina_display/json_backed_record.rb

@@ -8,7 +8,10 @@ module CocinaDisplay
     attr_reader :cocina_doc
 
     # Initialize a record with a Cocina document hash.
-    # @param cocina_doc [Hash]
+    # @param cocina_doc [Hash<String, Object>] The Cocina document hash
+    # @example Initialize a record with a Cocina document
+    #   cocina = Cocina.find(id)
+    #   record = CocinaDisplay::CocinaDisplay.new(cocina.as_json)
     def initialize(cocina_doc)
       @cocina_doc = cocina_doc
     end

data/lib/cocina_display/structural/file.rb

@@ -0,0 +1,134 @@
+module CocinaDisplay
+  module Structural
+    # Represents a single file in a Cocina object.
+    class File
+      # Underlying hash parsed from Cocina JSON.
+      attr_reader :cocina
+
+      # URL to Stacks environment that will serve this file.
+      attr_reader :base_url
+
+      # Initialize the File with Cocina file data.
+      # @param cocina [Hash] Cocina structured data for a single file
+      # @param druid [String, nil] DRUID of the object this file belongs to
+      # @note Staging objects can't infer their DRUID and need it passed in explicitly.
+      def initialize(cocina, base_url: "https://stacks.stanford.edu", druid: nil)
+        @cocina = cocina
+        @base_url = base_url
+        @druid = druid
+      end
+
+      # The name of the file on disk, including file extension.
+      # @return [String, nil]
+      # @example "bc798xr9549_30C_Kalsang_Yulgial_thumb.jp2"
+      def filename
+        cocina["filename"]
+      end
+
+      # The MIME type of the file.
+      # @return [String, nil]
+      # @example "image/jp2"
+      def mime_type
+        cocina["hasMimeType"]
+      end
+
+      # The relation of the file to the object.
+      # @return [String, nil]
+      # @example "thumbnail"
+      def use
+        cocina["use"]
+      end
+
+      # The size in bytes of the file.
+      # @return [Integer, nil]
+      # @example 204800
+      def size
+        cocina["size"]
+      end
+
+      # True if this file was marked as a thumbnail and has nonzero dimensions.
+      # @return [Boolean]
+      def thumbnail?
+        use == "thumbnail" && nonzero_dimensions?
+      end
+
+      # True if this file is a JP2 image and has nonzero dimensions.
+      # @return [Boolean]
+      def jp2_image?
+        mime_type == "image/jp2" && nonzero_dimensions?
+      end
+
+      # True if file is an image with nonzero height and width.
+      # @return [Boolean]
+      def nonzero_dimensions?
+        height&.positive? && width&.positive?
+      end
+
+      # The height of the image in pixels, if applicable.
+      # @return [Integer, nil]
+      def height
+        cocina.dig("presentation", "height").to_i
+      end
+
+      # The width of the image in pixels, if applicable.
+      # @return [Integer, nil]
+      def width
+        cocina.dig("presentation", "width").to_i
+      end
+
+      # Generate a IIIF image URL for this file.
+      # @param region [String] Desired region of the image (e.g., "full", "square", "x,y,w,h", "pct:x,y,w,h").
+      # @param width [String] Desired width of the image in pixels (use "!" prefix to preserve aspect ratio).
+      # @param height [String] Desired height of the image in pixels.
+      # @return [String, nil]
+      # @example "https://stacks.stanford.edu/image/iiif/ts786ny5936%2FPC0170_s1_E_0204.jp2/full/!400,400/0/default.jpg"
+      def iiif_url(region: "full", width: "!400", height: "400")
+        return unless iiif_id.present?
+
+        "#{base_url}/image/iiif/#{iiif_id}/#{region}/#{width},#{height}/0/default.jpg"
+      end
+
+      # For images served over IIIF, we use the encoded file ID minus the extension.
+      # @return [String, nil]
+      # @example "ts786ny5936%2FPC0170_s1_E_0204"
+      def iiif_id
+        ERB::Util.url_encode(file_id.delete_suffix(".jp2")) if file_id.present? && jp2_image?
+      end
+
+      # Generate a download URL for this file from stacks.
+      # @return [String, nil]
+      def download_url
+        return unless file_id.present?
+
+        "#{base_url}/file/druid:#{file_id}"
+      end
+
+      private
+
+      # External identifier for the file, minus the URL prefix.
+      # @return [String, nil]
+      # @note Staging and production formats differ.
+      # @example production
+      #   "fn851zf9475-fn851zf9475_1/fn851zf9475_00_0001.jp2"
+      # @example staging
+      #   "ddbd323d-0dd9-4f14-ba72-336c2bccfb29"
+      def external_id
+        cocina["externalIdentifier"]&.delete_prefix("https://cocina.sul.stanford.edu/file/")
+      end
+
+      # The DRUID of the object this file belongs to.
+      # @note Staging objects can't infer this from the externalIdentifier.
+      # @return [String, nil]
+      def druid
+        @druid || external_id.split("-").first if external_id.present?
+      end
+
+      # Combination of the DRUID and filename to uniquely identify the file.
+      # @return [String, nil]
+      # @example "ts786ny5936/PC0170_s1_E_0204.jp2"
+      def file_id
+        "#{druid}/#{filename}" if druid.present? && filename.present?
+      end
+    end
+  end
+end

data/lib/cocina_display/structural/file_set.rb

@@ -0,0 +1,57 @@
+module CocinaDisplay
+  module Structural
+    # Represents a set of files in a Cocina object.
+    class FileSet
+      # Underlying hash parsed from Cocina JSON.
+      attr_reader :cocina
+
+      # URL to Stacks environment that will serve this fileset.
+      attr_reader :base_url
+
+      # Initialize the FileSet with Cocina structural data.
+      # @param cocina [Hash] Cocina structured data for a single FileSet
+      # @param base_url [String] URL to Stacks environment that will serve this fileset
+      # @param druid [String, nil] DRUID of the object this fileset belongs to
+      def initialize(cocina, base_url: "https://stacks.stanford.edu", druid: nil)
+        @cocina = cocina
+        @base_url = base_url
+        @druid = druid
+      end
+
+      # The declared type of the FileSet, like "image" or "document".
+      # @note This can differ from the contained file types.
+      # @return [String, nil]
+      def type
+        cocina["type"]&.delete_prefix("https://cocina.sul.stanford.edu/models/resources/")
+      end
+
+      # All files contained in this FileSet.
+      # @return [Array<CocinaDisplay::Structural::File>]
+      def files
+        @files ||= Array(cocina.dig("structural", "contains")).map do |file|
+          CocinaDisplay::Structural::File.new(file, base_url: base_url, druid: druid)
+        end
+      end
+
+      private
+
+      # DRUID of the object this fileset belongs to.
+      # @note Inferred from the start of the externalIdentifier.
+      # @return [String, nil]
+      def druid
+        @druid || external_id[/^[a-z]{2}\d{3}[a-z]{2}\d{4}/] if external_id.present?
+      end
+
+      # External identifier for the fileset, minus the URL prefix.
+      # @return [String, nil]
+      # @note Staging and production formats differ.
+      # @example production
+      #   "bk264hq9320-bk264hq9320_3"
+      # @example staging
+      #   "bh114dk3076_4"
+      def external_id
+        cocina["externalIdentifier"]&.delete_prefix("https://cocina.sul.stanford.edu/fileSet/")
+      end
+    end
+  end
+end

data/lib/cocina_display/title.rb

@@ -109,7 +109,7 @@ module CocinaDisplay
     # Generate the display title by stripping trailing punctuation from the full title.
     # @return [String, nil]
     def display_title_str
-      full_title_str&.sub(/[\.,;:\/\\]+\z/, "")
+      full_title_str&.sub(/[.,;:\/\\]+\z/, "")
     end
 
     # The main title and subtitle, joined together with a colon.

data/lib/cocina_display/utils.rb

@@ -13,12 +13,12 @@ module CocinaDisplay
       return compacted_values.first if compacted_values.one?
 
       compacted_values.reduce(+"") do |result, value|
-        result << if value.end_with?(delimiter.strip)
+        result << if value.end_with?(delimiter.strip) || value.start_with?(delimiter.strip)
           value + " "
         else
           value + delimiter
         end
-      end.delete_suffix(delimiter)
+      end.delete_prefix(delimiter).delete_suffix(delimiter).strip
     end
 
     # Recursively flatten structured, and grouped values in Cocina metadata.

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.7.0" # :nodoc:
+  VERSION = "1.8.1" # :nodoc:
 end

data/lib/cocina_display.rb

@@ -6,8 +6,7 @@ require "janeway"
 require "json"
 require "net/http"
 require "active_support"
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/hash/conversions"
+require "active_support/core_ext"
 require "geo/coord"
 require "edtf"
 require "i18n"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Nick Budak
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath
@@ -268,6 +268,8 @@ files:
 - lib/cocina_display/license.rb
 - lib/cocina_display/note.rb
 - lib/cocina_display/related_resource.rb
+- lib/cocina_display/structural/file.rb
+- lib/cocina_display/structural/file_set.rb
 - lib/cocina_display/subjects/subject.rb
 - lib/cocina_display/subjects/subject_value.rb
 - lib/cocina_display/title.rb
@@ -296,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []