cocina_display 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b326b540fee8c0ad46a66aa4db50c2857328b08c42a57b0777b3f2e4ccc2a684
-  data.tar.gz: e8c17b5bcee9af19b32c98a29d60424ee693131f703936dbe10c91fd9a67caa6
+  metadata.gz: 9b7ec735c0ad257e8313d365e8900790b9acc115f98607a61a3b4eb293a2cb9a
+  data.tar.gz: a9761a59329eb8095c055063ef63b5b9e9c99d1d754cc8af3b20d95f59ec1fa7
 SHA512:
-  metadata.gz: aea3773bf3e3aa17c1e150a33da7c906f178a1814cc8c911fff1dd2cc5d08c5969970d9d68ecb07c72e29b4692654935f66b44f4445ea239ec437c5ab1e98017
-  data.tar.gz: 409b98e5c82a5456cc137e07f5786ab2d5118ab267b5667938e0e1be9896a116b416a2bc73f077d61c4c434f83f1dc3a4f59abf05eeeb1ea3ec6195efd45aa09
+  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/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/dates/date_range.rb

@@ -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.
@@ -139,29 +139,23 @@ module CocinaDisplay
 
       # Earliest possible date encoded in data, respecting unspecified/imprecise info.
       # @return [Date]
-      # @return [nil] if open start
+      # @return [nil] if no start or stop date is parsable
       def earliest_date
-        start&.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
+      # @return [nil] if open-ended range or stop is not parsable
       def latest_date
-        stop&.latest_date
-      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}")
+        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 || []

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/geospatial.rb

@@ -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.

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.8.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.8.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
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []