cocina_display 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d724bfbe5e313a116cdba675f7d4f563662e8370f9ede927bef32a8cb7f90f26
-  data.tar.gz: e3fccfd8188a3f21ad05beb49d281bca8e24cf7e03524b51bd03fde4facbfa90
+  metadata.gz: add082bf5794bc0df8fc9480cae4fe320b295867ec41ee09099ba5a5333eab93
+  data.tar.gz: d0a5d92a67890c13ef0e26876655956c277c04571ccefb5ab120d5e68e058137
 SHA512:
-  metadata.gz: 1a3bcecb41e8a3ca656f079f2fb7f09aa256669e868c0ca34c1b42e5e60ed3e083b1f1bb862122f0a9864fbfd989406a961671b560edff1ba8d29e9620b0c62c
-  data.tar.gz: 5f1b3688911de060ff1a7ef6a31f4e98a300d217a42fb27cf76d401766a4d741a93821d26f0bdb7549506e462911d0a9da3f5fc25c68d041b7a7d2cc12285b29
+  metadata.gz: 2828617fb57955a4578da26efb839c038df38809417c5fe63bcc44fe7ec8d3412c7ebf8259679e984e997f28e9d535a200818e4a546b0f26b4f3df122cd96e85
+  data.tar.gz: 0a6e51f36f516c1e414f8aa2cf10828a1608509dd7f06da9be2b5a3d866141c3be02cfcf3f1a282c08d00097880ee96e79d4cf0d4e61bdd4c6084d4322f65c2d

data/lib/cocina_display/concerns/contributors.rb

@@ -88,6 +88,7 @@ module CocinaDisplay
 
       # DisplayData for Contributors, one per role (excluding publisher).
       # Contributors with no role are grouped under a default heading.
+      # @note For displaying publisher information, use {publication_display_data}.
       # @return [Array<DisplayData>]
       def contributor_display_data
         contributors_by_role.except("publisher").map do |role, contributors|

data/lib/cocina_display/concerns/events.rb

@@ -135,6 +135,13 @@ module CocinaDisplay
         CocinaDisplay::DisplayData.from_objects(event_dates)
       end
 
+      # DisplayData for publisher and publication place.
+      # @return [Array<CocinaDisplay::DisplayData>]
+      def publication_display_data
+        CocinaDisplay::DisplayData.from_strings(publication_places, label: "Place") +
+          CocinaDisplay::DisplayData.from_strings(publisher_names, label: "Publisher")
+      end
+
       # The earliest preferred publication date as a CocinaDisplay::Dates::Date object.
       # Considers publication, creation, and capture dates in that order.
       # Prefers dates marked as primary and those with a declared encoding.

data/lib/cocina_display/concerns/forms.rb

@@ -9,6 +9,7 @@ module CocinaDisplay
       def searchworks_resource_types
         mapped_values = resource_type_values.flat_map { |resource_type| searchworks_resource_type(resource_type) }
         mapped_values << "Dataset" if dataset?
+        mapped_values << "Software/Multimedia" if digital_only?
         mapped_values.uniq
       end
 
@@ -187,13 +188,21 @@ module CocinaDisplay
 
       private
 
-      # Map a resource type to SearchWorks format value(s).
+      # Is the object a digital resource without a more specific resource type?
+      # @return [Boolean]
+      def digital_only?
+        resource_type_values.all?("digital")
+      end
+
+      # Map a MODS or LC resource type to SearchWorks format value(s).
       # @param resource_type [String] The resource type to map.
       # @return [Array<String>]
       def searchworks_resource_type(resource_type)
         values = []
 
         case resource_type
+        when "dataset"
+          values << "Dataset"
         when "cartographic"
           values << "Map"
         when "manuscript", "mixed material"
@@ -202,10 +211,10 @@ module CocinaDisplay
           values << "Video/Film"
         when "notated music"
           values << "Music score"
-        when "software, multimedia"
+        when "software, multimedia", "multimedia"
           # Prevent GIS datasets from being labeled as "Software"
           values << "Software/Multimedia" unless cartographic? || dataset?
-        when "sound recording-musical", "sound recording-nonmusical", "sound recording"
+        when "sound recording-musical", "sound recording-nonmusical", "sound recording", "audio"
           values << "Sound recording"
         when "still image"
           values << "Image"
@@ -219,7 +228,7 @@ module CocinaDisplay
           else
             values << "Book"
           end
-        when "three dimensional object"
+        when "three dimensional object", "artifact", "tactile"
           values << "Object"
         end
 

data/lib/cocina_display/dates/date.rb

@@ -1,4 +1,5 @@
 require "edtf"
+require "iso8601"
 
 require "active_support"
 require "active_support/core_ext/object/blank"
@@ -486,11 +487,48 @@ module CocinaDisplay
 
     # Strict ISO8601-encoded date parser.
     class Iso8601Format < Date
+      def self.normalize_to_edtf(value)
+        # Remove time component if there is one
+        value = value.split("T").first if value.include?("T")
+
+        # Datetime without "T" was valid until 2019, but iso8601 gem rejects it.
+        # YYYYMMDD is valid but EDTF needs dashes to parse it.
+        if /^\d{14}$/.match?(value) || /^\d{8}$/.match?(value)
+          "#{value[0..3]}-#{value[4..5]}-#{value[6..7]}"
+        else
+          super
+        end
+      end
+
       def self.parse_date(value)
-        ::Date.parse(normalize_to_edtf(value))
-      rescue ::Date::Error
-        notifier&.notify("Invalid date value \"#{value}\" for iso8601 encoding")
-        nil
+        value = normalize_to_edtf(value)
+
+        # Bail out if ISO8601 gem doesn't validate it
+        begin
+          date = ISO8601::Date.new(value)
+        rescue ISO8601::Errors::UnknownPattern
+          notifier&.notify("Invalid date value \"#{value}\" for iso8601 encoding")
+          return nil
+        end
+
+        case value
+        # Calendar dates already match EDTF format
+        when /^\d{4}-\d{2}-\d{2}$/, /^\d{4}-\d{2}$/, /^\d{4}$/
+          super
+        # Weeks with no day become a 7-day range
+        when /^\d{4}-W\d{2}$/, /^\d{4}W\d{2}$/
+          week_end = date + 6
+          ::Date.edtf("#{date}/#{week_end}")
+        # Weeks with day become a single day
+        when /^\d{4}-W\d{2}-\d$/, /^\d{4}W\d{3}$/
+          ::Date.edtf(date.to_s)
+        # Ordinal dates become a single day
+        when /^\d{4}-\d{3}$/, /^\d{7}$/
+          ::Date.edtf(date.to_s)
+        else
+          notifier&.notify("Unhandled date value \"#{value}\" for iso8601 encoding")
+          nil
+        end
       end
     end
 

data/lib/cocina_display/forms/form.rb

@@ -5,7 +5,7 @@ module CocinaDisplay
   module Forms
     # A form associated with part or all of a Cocina object.
     class Form
-      attr_reader :cocina
+      attr_reader :cocina, :delimiter
 
       # Create a Form object from Cocina structured data.
       # Delegates to subclasses for specific types.
@@ -24,8 +24,10 @@ module CocinaDisplay
 
       # Create a Form object from Cocina structured data.
       # @param cocina [Hash]
-      def initialize(cocina)
+      # @param delimiter [String] The delimiter to use when flattening for display
+      def initialize(cocina, delimiter: " > ")
         @cocina = cocina
+        @delimiter = delimiter
       end
 
       # The value to use for display.
@@ -37,7 +39,7 @@ module CocinaDisplay
       # Single concatenated string value for the form.
       # @return [String]
       def flat_value
-        Utils.compact_and_join(values, delimiter: " > ")
+        Utils.compact_and_join(values, delimiter: delimiter)
       end
 
       # The raw values from the Cocina data, flattened if nested.

data/lib/cocina_display/note.rb

@@ -8,24 +8,35 @@ module CocinaDisplay
     TOC_TYPES = ["table of contents"].freeze
     TOC_DISPLAY_LABEL_REGEX = /Table of contents/i
 
-    attr_reader :cocina
+    attr_reader :cocina, :delimiter
 
     # Initialize a Note from Cocina structured data.
     # @param cocina [Hash]
-    def initialize(cocina)
+    # @param delimiter [String] Delimiter to use when joining for display.
+    def initialize(cocina, delimiter: " -- ")
       @cocina = cocina
+      @delimiter = delimiter
     end
 
-    # String representation of the note.
+    # The value to use for display.
     # @return [String, nil]
     def to_s
-      Utils.compact_and_join(values, delimiter: " -- ").presence
+      flat_value
+    end
+
+    # Single concatenated string value for the note.
+    # @return [String, nil]
+    def flat_value
+      Utils.compact_and_join(values, delimiter: delimiter).presence
     end
 
     # The raw values from the Cocina data, flattened if nested.
-    # @return [String]
+    # Strips excess whitespace and the delimiter if present.
+    # @return [Array<String>]
     def values
-      Utils.flatten_nested_values(cocina).pluck("value").compact_blank
+      Utils.flatten_nested_values(cocina).pluck("value")
+        .map { |value| value.gsub(delimiter.strip, "").strip }
+        .compact_blank
     end
 
     # The raw values from the Cocina data as a hash with type as key.

data/lib/cocina_display/subjects/subject.rb

@@ -2,12 +2,14 @@ module CocinaDisplay
   module Subjects
     # Base class for subjects in Cocina structured data.
     class Subject
-      attr_reader :cocina
+      attr_reader :cocina, :delimiter
 
       # Initialize a Subject object with Cocina structured data.
       # @param cocina [Hash] The Cocina structured data for the subject.
-      def initialize(cocina)
+      # @param delimiter [String] The delimiter to use when flattening for display
+      def initialize(cocina, delimiter: " > ")
         @cocina = cocina
+        @delimiter = delimiter
       end
 
       # The top-level type of the subject.
@@ -20,7 +22,7 @@ module CocinaDisplay
       # Array of display strings for each value in the subject.
       # Used for search, where each value should be indexed separately.
       # @return [Array<String>]
-      def display_values
+      def values
         subject_values.map(&:to_s).compact_blank
       end
 
@@ -28,13 +30,13 @@ module CocinaDisplay
       # Genre values are capitalized; other subject values are not.
       # @return [String]
       def to_s
-        (type == "genre") ? display_value&.upcase_first : display_value
+        (type == "genre") ? flat_value&.upcase_first : flat_value
       end
 
       # A string representation of the entire subject, concatenated for display.
       # @return [String]
-      def display_value
-        Utils.compact_and_join(display_values, delimiter: " > ")
+      def flat_value
+        Utils.compact_and_join(values, delimiter: delimiter)
       end
 
       # Label used to render the subject for display.

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.9.0" # :nodoc:
+  VERSION = "1.11.0" # :nodoc:
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Nick Budak
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: iso8601
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []