cocina_display 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3465ccfb8142f2351977032932d4e38e8ea97188bbeea980073eb145780c7465
-  data.tar.gz: 9a7c59a505bc7eaa88b3ae0cb81becd67f508eeff72d39b9db4725db4a0403e4
+  metadata.gz: 314d08be365121515add19014c2c3d6593d1016fd3ce5e53928c991ce209b64a
+  data.tar.gz: 31cc7393ccaf6285f7e1df378a22d3347c23d4853a0eb34bfe3402b3d5818045
 SHA512:
-  metadata.gz: cc5c29815d9d5250cfc63eb5546db9eae7374d50f4308089dce8eb7cc5383193ebb125fb4fe0a07226602b3f631fc75aa4fbec78b7796794ad2c27c7c9717217
-  data.tar.gz: 7046fcda48d7004206e5b1ee3f724f591f7cc8306c9e560226fb48832ff041f1bdff0c4d28e45d38090e356a8e1375d3da1d39c2ff3a13316e4870d83c7fd0d3
+  metadata.gz: ae4df0a3875374c472f8360110281e519e8bd423f68bfb29f61e618cf8f39e4a99182273ae6d61b77373cd298d827110a50acb3d7c9fafc1e80fe5f996576e74
+  data.tar.gz: af43069ebf9d00828814b9d313ed1f670beb94591cc2a15d28fcaa24bd72773cca3b48b23429fd7a1e195b65e3ea258c073e56e9382722b2bd45aa8244374b9a

data/config/searchworks_languages.yml

@@ -12,8 +12,7 @@ afa: Afroasiatic (Other)
 afh: Afrihili (Artificial language)
 afr: Afrikaans
 ain: Ainu
-# ajm is deprecated
-ajm: Aljamía
+ajm: Aljamía # deprecated
 aka: Akan
 akk: Akkadian
 alb: Albanian
@@ -32,8 +31,7 @@ arn: Mapuche
 arp: Arapaho
 art: Artificial (Other)
 arw: Arawak
-# ase from iso639-3
-ase: American Sign Language
+ase: American Sign Language # from iso639-3
 asm: Assamese
 ast: Bable
 ath: Athapascan (Other)
@@ -75,8 +73,7 @@ bur: Burmese
 byn: Bilin
 cad: Caddo
 cai: Central American Indian (Other)
-# cam is deprecated
-cam: Khmer
+cam: Khmer # deprecated
 car: Carib
 cat: Catalan
 cau: Caucasian (Other)
@@ -119,6 +116,7 @@ den: Slavey
 dgr: Tlicho
 din: Dinka
 div: Divehi
+dnt: Mid Grand Valley Dani # from iso639-3
 doi: Dogri
 dra: Dravidian (Other)
 dsb: Lower Sorbian
@@ -129,26 +127,21 @@ dyu: Dyula
 dzo: Dzongkha
 efi: Efik
 egy: Egyptian
-# per RFC 5646 and ISO 15924
-egy-Egyd: Egyptian, Demotic
+egy-Egyd: Egyptian, Demotic # per RFC 5646 and ISO 15924
 eka: Ekajuk
 elx: Elamite
 eng: English
 enm: English, Middle (1100-1500)
 epo: Esperanto
-# esk is deprecated
-esk: Eskimo languages
-# esp is deprecated
-esp: Esperanto
+esk: Eskimo languages # deprecated
+esp: Esperanto # deprecated
 est: Estonian
-# eth is deprecated
-eth: Ethiopic
+eth: Ethiopic # deprecated
 ewe: Ewe
 ewo: Ewondo
 fan: Fang
 fao: Faroese
-# far is deprecated
-far: Faroese
+far: Faroese # deprecated
 fat: Fanti
 fij: Fijian
 fil: Filipino
@@ -156,8 +149,7 @@ fin: Finnish
 fiu: Finno-Ugrian (Other)
 fon: Fon
 fre: French
-# fri is deprecated
-fri: Frisian
+fri: Frisian # deprecated
 frm: French, Middle (ca. 1300-1600)
 fro: French, Old (ca. 842-1300)
 frr: North Frisian
@@ -166,12 +158,9 @@ fry: Frisian
 ful: Fula
 fur: Friulian
 gaa: Gã
-# gae is deprecated
-gae: Scottish Gaelic
-# gag is deprecated
-gag: Galician
-# gal is deprecated
-gal: Oromo
+gae: Scottish Gaelic # deprecated
+gag: Galician # deprecated
+gal: Oromo # deprecated
 gay: Gayo
 gba: Gbaya
 gem: Germanic (Other)
@@ -193,8 +182,7 @@ grc: Greek, Ancient (to 1453)
 gre: Greek, Modern (1453-)
 grn: Guarani
 gsw: Swiss German
-# gua is deprecated
-gua: Guarani
+gua: Guarani # deprecated
 guj: Gujarati
 gwi: Gwich'in
 hai: Haida
@@ -227,12 +215,10 @@ inc: Indic (Other)
 ind: Indonesian
 ine: Indo-European (Other)
 inh: Ingush
-# int is deprecated
-int: Interlingua (International Auxiliary Language Association)
+int: Interlingua (International Auxiliary Language Association) # deprecated
 ipk: Inupiaq
 ira: Iranian (Other)
-# iri is deprecated
-iri: Irish
+iri: Irish # deprecated
 iro: Iroquoian (Other)
 ita: Italian
 jav: Javanese
@@ -273,17 +259,14 @@ kru: Kurukh
 kua: Kuanyama
 kum: Kumyk
 kur: Kurdish
-# kus is deprecated
-kus: Kusaie
+kus: Kusaie # deprecated
 kut: Kootenai
 lad: Ladino
 lah: Lahndā
 lam: Lamba (Zambia and Congo)
-# lan is deprecated
-lan: Occitan (post 1500)
+lan: Occitan (post 1500) # deprecated
 lao: Lao
-# lap is deprecated
-lap: Sami
+lap: Sami # deprecated
 lat: Latin
 lav: Latvian
 lez: Lezgian
@@ -312,8 +295,7 @@ mao: Maori
 map: Austronesian (Other)
 mar: Marathi
 mas: Maasai
-# max is deprecated
-max: Manx
+max: Manx # deprecated
 may: Malay
 mdf: Moksha
 mdr: Mandar
@@ -323,16 +305,14 @@ mic: Micmac
 min: Minangkabau
 # mis: Miscellaneous languages
 mkh: Mon-Khmer (Other)
-# mla is deprecated
-mla: Malagasy
+mla: Malagasy # deprecated
 mlg: Malagasy
 mlt: Maltese
 mnc: Manchu
 mni: Manipuri
 mno: Manobo languages
 moh: Mohawk
-# mol is deprecated
-mol: Moldavian
+mol: Moldavian # deprecated
 mon: Mongolian
 mos: Mooré
 # mul: Multiple languages
@@ -396,6 +376,7 @@ por: Portuguese
 pra: Prakrit languages
 pro: Provençal (to 1500)
 pus: Pushto
+quc: K'iche' # from iso639-3
 que: Quechua
 raj: Rajasthani
 rap: Rapanui
@@ -414,27 +395,24 @@ sai: South American Indian (Other)
 sal: Salishan languages
 sam: Samaritan Aramaic
 san: Sanskrit
-# sao is deprecated
-sao: Samoan
+sao: Samoan # deprecated
 sas: Sasak
 sat: Santali
-# scc is deprecated
-scc: Serbian
+scc: Serbian # deprecated
 scn: Sicilian Italian
 sco: Scots
-# scr is deprecated
-scr: Croatian
+scr: Croatian # deprecated
 sel: Selkup
 sem: Semitic (Other)
 sga: Irish, Old (to 1100)
 sgn: Sign languages
 shn: Shan
-# sho is deprecated
-sho: Shona
+sho: Shona # deprecated
 sid: Sidamo
 sin: Sinhalese
 sio: Siouan (Other)
 sit: Sino-Tibetan (Other)
+skr: Saraiki # from iso639-3
 sla: Slavic (Other)
 slo: Slovak
 slv: Slovenian
@@ -447,8 +425,7 @@ smo: Samoan
 sms: Skolt Sami
 sna: Shona
 snd: Sindhi
-# snh is deprecated
-snh: Sinhalese
+snh: Sinhalese # deprecated
 snk: Soninke
 sog: Sogdian
 som: Somali
@@ -460,8 +437,7 @@ srn: Sranan
 srp: Serbian
 srr: Serer
 ssa: Nilo-Saharan (Other)
-# sso is deprecated
-sso: Sotho
+sso: Sotho # deprecated
 ssw: Swazi
 suk: Sukuma
 sun: Sundanese
@@ -469,19 +445,15 @@ sus: Susu
 sux: Sumerian
 swa: Swahili
 swe: Swedish
-# swz is deprecated
-swz: Swazi
+swz: Swazi # deprecated
 syc: Syriac
 syr: Syriac, Modern
-# tag is deprecated
-tag: Tagalog
+tag: Tagalog # deprecated
 tah: Tahitian
 tai: Tai (Other)
-# taj is deprecated
-taj: Tajik
+taj: Tajik # deprecated
 tam: Tamil
-# tar is deprecated
-tar: Tatar
+tar: Tatar # deprecated
 tat: Tatar
 tel: Telugu
 tem: Temne
@@ -501,13 +473,12 @@ tmh: Tamashek
 tog: Tonga (Nyasa)
 ton: Tongan
 tpi: Tok Pisin
-# tru is deprecated
-tru: Truk
+tru: Truk # deprecated
+trw: Torwali # from iso639-3
 tsi: Tsimshian
 tsn: Tswana
 tso: Tsonga
-# tsw is deprecated
-tsw: Tswana
+tsw: Tswana # deprecated
 tuk: Turkmen
 tum: Tumbuka
 tup: Tupi languages

data/lib/cocina_display/cocina_record.rb

@@ -6,6 +6,7 @@ module CocinaDisplay
     include CocinaDisplay::Concerns::Accesses
     include CocinaDisplay::Concerns::Events
     include CocinaDisplay::Concerns::Contributors
+    include CocinaDisplay::Concerns::Druid
     include CocinaDisplay::Concerns::Identifiers
     include CocinaDisplay::Concerns::Notes
     include CocinaDisplay::Concerns::Titles

data/lib/cocina_display/concerns/druid.rb

@@ -0,0 +1,24 @@
+module CocinaDisplay
+  module Concerns
+    # Methods for extracting and formatting identifiers from Cocina records.
+    module Druid
+      # The DRUID for the object, with the +druid:+ prefix.
+      # @note A {RelatedResource} may not have a DRUID, but could have a purl URL.
+      # @return [String, nil]
+      # @example
+      #   record.druid #=> "druid:bb099mt5053"
+      def druid
+        cocina_doc["externalIdentifier"]
+      end
+
+      # The DRUID for the object, without the +druid:+ prefix.
+      # @note A {RelatedResource} may not have a DRUID.
+      # @return [String, nil]
+      # @example
+      #   record.bare_druid #=> "bb099mt5053"
+      def bare_druid
+        druid&.delete_prefix("druid:")
+      end
+    end
+  end
+end

data/lib/cocina_display/concerns/identifiers.rb

@@ -2,24 +2,6 @@ module CocinaDisplay
   module Concerns
     # Methods for extracting and formatting identifiers from Cocina records.
     module Identifiers
-      # The DRUID for the object, with the +druid:+ prefix.
-      # @note A {RelatedResource} may not have a DRUID.
-      # @return [String, nil]
-      # @example
-      #   record.druid #=> "druid:bb099mt5053"
-      def druid
-        cocina_doc["externalIdentifier"] || purl_url&.split("/")&.last
-      end
-
-      # The DRUID for the object, without the +druid:+ prefix.
-      # @note A {RelatedResource} may not have a DRUID.
-      # @return [String, nil]
-      # @example
-      #   record.bare_druid #=> "bb099mt5053"
-      def bare_druid
-        druid&.delete_prefix("druid:")
-      end
-
       # The DOI for the object, if there is one – just the identifier part.
       # @return [String, nil]
       # @example

data/lib/cocina_display/concerns/structural.rb

@@ -101,10 +101,11 @@ module CocinaDisplay
       end
 
       # DRUIDs of virtual objects this object is a part of.
+      # NOTE: not all virtual objects have this relationship in the description.related_resources.
       # @return [Array<String>]
       # @example "hj097bm8879"
       def virtual_object_parents
-        related_resources.filter { |res| res.type == "part of" }.map(&:druid).compact_blank
+        related_resources.filter_map { |res| res.purl_url&.split("/")&.last if res.type == "part of" }.compact_blank
       end
 
       # The thumbnail file for this object, if any.

data/lib/cocina_display/contributors/role.rb

@@ -53,7 +53,7 @@ module CocinaDisplay
 
         Role.marc_relators.fetch(code)
       rescue
-        CocinaDisplay.notifier&.notify("Invalid marc relator: #{code}")
+        CocinaDisplay.notifier&.notify("Invalid marc relator.", context: {code: code})
         nil
       end
 

data/lib/cocina_display/dates/date.rb

@@ -83,7 +83,7 @@ module CocinaDisplay
       # @return [String]
       def self.normalize_to_edtf(value)
         unless value
-          notifier&.notify("Invalid date value: #{value}")
+          notifier&.notify("Invalid date value.", context: {value: value})
           return
         end
 
@@ -513,7 +513,7 @@ module CocinaDisplay
         begin
           date = ISO8601::Date.new(value)
         rescue ISO8601::Errors::UnknownPattern
-          notifier&.notify("Invalid date value \"#{value}\" for iso8601 encoding")
+          notifier&.notify("Invalid date value for iso8601 encoding.", context: {value: value})
           return nil
         end
 
@@ -532,7 +532,7 @@ module CocinaDisplay
         when /^\d{4}-\d{3}$/, /^\d{7}$/
           ::Date.edtf(date.to_s)
         else
-          notifier&.notify("Unhandled date value \"#{value}\" for iso8601 encoding")
+          notifier&.notify("Unhandled date value for iso8601 encoding.", context: {value: value})
           nil
         end
       end
@@ -542,7 +542,7 @@ module CocinaDisplay
     class W3cdtfFormat < Date
       def self.normalize_to_edtf(value)
         unless value
-          notifier&.notify("Invalid date value: #{value}")
+          notifier&.notify("Invalid date value for W3CDTF encoding.", context: {value: value})
           return
         end
         super.gsub("-00", "")

data/lib/cocina_display/structural/file.rb

@@ -10,9 +10,9 @@ module CocinaDisplay
 
       # 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
+      # @param druid [String] DRUID (without "druid:" prefix) 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)
+      def initialize(cocina, druid:, base_url: "https://stacks.stanford.edu")
         @cocina = cocina
         @base_url = base_url
         @druid = druid
@@ -92,42 +92,24 @@ module CocinaDisplay
       # @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?
+        ERB::Util.url_encode(file_id.delete_suffix(".jp2")) if jp2_image?
       end
 
       # Generate a download URL for this file from stacks.
-      # @return [String, nil]
+      # @return [String]
       def download_url
-        return unless file_id.present?
-
-        "#{base_url}/file/druid:#{file_id}"
+        "#{base_url}/file/druid:#{druid}/#{ERB::Util.url_encode(filename)}"
       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
+      attr_reader :druid
 
       # Combination of the DRUID and filename to uniquely identify the file.
-      # @return [String, nil]
+      # @return [String]
       # @example "ts786ny5936/PC0170_s1_E_0204.jp2"
       def file_id
-        "#{druid}/#{filename}" if druid.present? && filename.present?
+        "#{druid}/#{filename}"
       end
     end
   end

data/lib/cocina_display/structural/file_set.rb

@@ -10,9 +10,9 @@ module CocinaDisplay
 
       # Initialize the FileSet with Cocina structural data.
       # @param cocina [Hash] Cocina structured data for a single FileSet
+      # @param druid [String] DRUID (without "druid:" prefix) of the object this fileset belongs to
       # @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)
+      def initialize(cocina, druid:, base_url: "https://stacks.stanford.edu")
         @cocina = cocina
         @base_url = base_url
         @druid = druid

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "2.2.0" # :nodoc:
+  VERSION = "2.3.1" # :nodoc:
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Nick Budak
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath
@@ -247,6 +247,7 @@ files:
 - lib/cocina_display/concerns.rb
 - lib/cocina_display/concerns/accesses.rb
 - lib/cocina_display/concerns/contributors.rb
+- lib/cocina_display/concerns/druid.rb
 - lib/cocina_display/concerns/events.rb
 - lib/cocina_display/concerns/forms.rb
 - lib/cocina_display/concerns/geospatial.rb
@@ -319,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []