cocina_display 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f339ed91ca38de77fe91e83e50ba0dbdae117c810b831ed7597181b949dab7
-  data.tar.gz: 10e954dc692155b1c2ea3e219840431b4bae188b09399060973bc873b5dc9d63
+  metadata.gz: ac41e805ba8d1ab521f7d647a0407c7c0cc02840bd3bde547c4ef5a017b32dca
+  data.tar.gz: ca2d3190ea5e1b9e83f504343fbfc9af462cdd0b4a51e615c623a33ceaef7e21
 SHA512:
-  metadata.gz: 04f6b7138b9079fb12f9455e5363fce77743f19e0ae30aa01a2d13a567182d184475304316bfa81d720970cbab77ac7d8854f29e62bbcf15df43cf95593898eb
-  data.tar.gz: 791231009d1e945f959bae16095d022306052bf0a8a02fe76f3d722343e79434469fd1bf5e32309a638afda378a8070e7f8dd259adce155106c307808a1602c4
+  metadata.gz: 6962854fc5bffc3288692a8feb183f098adba9f3c0f4f424db58d326e87a2d63f534fc06ea644124d6e37fd2fb0846f2970e49348b70f96a4269b2a0f0c53ab0
+  data.tar.gz: 1650a3791e4236bc2cc9fdbbcd9b4920c670a5c5fb52acc3122b3bea5755efe69d31a61496f3c41f1d8f4defa125791fd38a872d2a75f58055acf5ab41cde0f2

data/lib/cocina_display/concerns/events.rb

@@ -126,7 +126,10 @@ module CocinaDisplay
       # All root level events associated with the object.
       # @return [Array<CocinaDisplay::Events::Event>]
       def events
-        @events ||= path("$.description.event.*").map { |event| CocinaDisplay::Events::Event.new(event) }
+        @events ||= path("$.description.event.*").map do |cocina|
+          event = CocinaDisplay::Events::Event.new(cocina)
+          event.imprint? ? CocinaDisplay::Events::Imprint.new(cocina) : event
+        end
       end
 
       # The adminMetadata creation event (When was it was deposited?)
@@ -144,12 +147,9 @@ module CocinaDisplay
       end
 
       # Array of CocinaDisplay::Imprint objects for all relevant Cocina events.
-      # Considers publication, creation, capture, and copyright events.
-      # Considers event types as well as date types if the event is untyped.
-      # Prefers events where the date was not encoded, if any.
-      # @return [Array<CocinaDisplay::Imprint>] The list of Imprint objects
+      # @return [Array<CocinaDisplay::Imprint>]
       def imprint_events
-        events.filter(&:imprint?)
+        events.filter { |event| event.is_a? CocinaDisplay::Events::Imprint }
       end
 
       # All dates associated with the object via an event.

data/lib/cocina_display/events/event.rb

@@ -16,7 +16,7 @@ module CocinaDisplay
       # @note Also supports `event1.between?(event2, event3)` via {Comparable}.
       # @return [Integer, nil]
       def <=>(other)
-        [unique_dates_for_display] <=> [other.unique_dates_for_display] if other.is_a?(Event)
+        [dates] <=> [other.dates] if other.is_a?(Event)
       end
 
       # The display label for the event.
@@ -26,7 +26,6 @@ module CocinaDisplay
       # @return [String]
       def label
         return cocina["displayLabel"] if cocina["displayLabel"].present?
-        return "Imprint" if imprint?
         return dates.map(&:label).first if date_only?
 
         type&.capitalize || date_types.first&.capitalize || "Event"
@@ -80,7 +79,10 @@ module CocinaDisplay
       # @note Unencoded dates or no dates often indicate an imprint statement.
       # @return [Boolean]
       def imprint?
-        (has_type?("publication") || types.empty?) && (dates.none?(&:encoding?) || dates.none?)
+        contributors.present? &&
+          locations.present? &&
+          (has_type?("publication") || types.empty?) &&
+          (dates.any? { |date| !date.encoding? } || dates.none?)
       end
 
       # All contributors associated with this event.
@@ -107,49 +109,11 @@ module CocinaDisplay
         end
       end
 
-      # String representation of the event using edition, dates, locations, and contributors.
-      # Format is inspired by typical imprint statements for books.
+      # String representation of the event using date and location.
       # @return [String]
-      # @example "2nd ed. - New York : John Doe, 1999"
+      # @example "John Doe, New York (State), 1999"
       def to_s
-        place_contrib = Utils.compact_and_join([place_str, contributor_str], delimiter: " : ")
-        note_place_contrib = Utils.compact_and_join([edition_note_str, place_contrib], delimiter: " - ")
-        Utils.compact_and_join([note_place_contrib, date_str, copyright_note_str], delimiter: ", ")
-      end
-
-      # Filter dates for uniqueness using base value according to predefined rules.
-      # 1. For a group of dates with the same base value, choose a single one
-      # 2. Prefer unencoded dates over encoded ones when choosing a single date
-      # 3. Remove date ranges that duplicate any unencoded non-range dates
-      # @return [Array<CocinaDisplay::Dates::Date>]
-      # @see CocinaDisplay::Dates::Date#base_value
-      # @see https://consul.stanford.edu/display/chimera/MODS+display+rules#MODSdisplayrules-3b.%3CoriginInfo%3E
-      def unique_dates_for_display
-        # Choose a single date for each group with the same base value
-        deduped_dates = dates.group_by(&:base_value).map do |base_value, group|
-          if (unencoded = group.reject(&:encoding?)).any?
-            unencoded.first
-          else
-            group.first
-          end
-        end
-
-        # 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! { |date_range| unencoded_singles_dates.any? { |date| date_range.as_range.include?(date) } }
-
-        (singles + ranges).sort
-      end
-
-      # Filter locations to display according to predefined rules.
-      # 1. Prefer unencoded locations (plain value) over encoded ones
-      # 2. If no unencoded locations but there are MARC country codes, decode them
-      # 3. Keep only unique locations after decoding
-      def locations_for_display
-        unencoded_locs, encoded_locs = locations.partition { |loc| loc.unencoded_value? }
-        locs_for_display = unencoded_locs.presence || encoded_locs
-        locs_for_display.map(&:to_s).compact_blank.uniq
+        Utils.compact_and_join([place_str, date_str], delimiter: ", ")
       end
 
       # Union of event's type and its date types.
@@ -168,34 +132,38 @@ module CocinaDisplay
         to_s == date_str
       end
 
-      # 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(&:to_s), delimiter: "; ")
-      end
+      # The dates associated with this event that should be used for display.
+      # Prefers encoded dates when there are duplicates.
+      # @return [Array<CocinaDisplay::Dates::Date>]
+      def display_dates
+        # Choose a single date for each group with the same base value;
+        # prefer encoded dates when there are duplicates.
+        deduped_dates = dates.group_by(&:base_value).map do |base_value, group|
+          if (encoded = group.filter(&:encoding?)).any?
+            encoded.first
+          else
+            group.first
+          end
+        end
 
-      # Edition notes associated with the event as a single string.
-      # @return [String]
-      def edition_note_str
-        Utils.compact_and_join(notes.filter { |note| note.type == "edition" }.map(&:to_s), delimiter: ", ")
-      end
+        # Remove any ranges that duplicate part of an encoded non-range date
+        ranges, singles = deduped_dates.partition { |date| date.is_a?(CocinaDisplay::Dates::DateRange) }
+        encoded_singles_dates = singles.filter(&:encoding?).flat_map(&:to_a)
+        ranges.reject! { |date_range| encoded_singles_dates.any? { |date| date_range.as_range.include?(date) } }
 
-      # Copyright notes associated with the event as a single string.
-      # @return [String]
-      def copyright_note_str
-        Utils.compact_and_join(notes.filter { |note| note.type == "copyright statement" }.map(&:to_s), delimiter: ", ")
+        (singles + ranges).sort
       end
 
-      # All contributors associated with the event as a single string.
+      # Dates associated with this event as a single string.
       # @return [String]
-      def contributor_str
-        Utils.compact_and_join(contributors.map(&:display_name), delimiter: " : ")
+      def date_str
+        display_dates.map(&:qualified_value).compact_blank.uniq.to_sentence
       end
 
-      # The place of publication, combining all location values.
+      # Locations associated with this event as a single string.
       # @return [String]
       def place_str
-        Utils.compact_and_join(locations_for_display, delimiter: " : ")
+        locations.map(&:to_s).compact_blank.uniq.join(", ")
       end
     end
   end

data/lib/cocina_display/events/imprint.rb

@@ -0,0 +1,89 @@
+module CocinaDisplay
+  module Events
+    # An imprint statement associated with an object.
+    class Imprint < Event
+      # Imprints are labelled "Imprint" unless overridden by a displayLabel.
+      # @return [String]
+      def label
+        cocina["displayLabel"].presence || "Imprint"
+      end
+
+      # Imprint statement for a book, formatted using typical conventions.
+      # @return [String]
+      # @example "2nd ed. - New York : John Doe, 1999"
+      def to_s
+        place_contrib = Utils.compact_and_join([place_str, contributor_str], delimiter: " : ")
+        note_place_contrib = Utils.compact_and_join([edition_note_str, place_contrib], delimiter: " - ")
+        Utils.compact_and_join([note_place_contrib, date_str, copyright_note_str], delimiter: ", ")
+      end
+
+      private
+
+      # Filter dates for uniqueness using base value according to predefined rules.
+      # 1. For a group of dates with the same base value, choose a single one
+      # 2. Prefer unencoded dates over encoded ones when choosing a single date
+      # 3. Remove date ranges that duplicate any unencoded non-range dates
+      # @return [Array<CocinaDisplay::Dates::Date>]
+      # @see CocinaDisplay::Dates::Date#base_value
+      # @see https://consul.stanford.edu/display/chimera/MODS+display+rules#MODSdisplayrules-3b.%3CoriginInfo%3E
+      def display_dates
+        # Choose a single date for each group with the same base value
+        deduped_dates = dates.group_by(&:base_value).map do |base_value, group|
+          if (unencoded = group.reject(&:encoding?)).any?
+            unencoded.first
+          else
+            group.first
+          end
+        end
+
+        # 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! { |date_range| unencoded_singles_dates.any? { |date| date_range.as_range.include?(date) } }
+
+        (singles + ranges).sort
+      end
+
+      # Filter locations to display according to predefined rules.
+      # 1. Prefer unencoded locations (plain value) over encoded ones
+      # 2. If no unencoded locations but there are MARC country codes, decode them
+      # 3. Keep only unique locations after decoding
+      # @return [Array<String>]
+      def display_locations
+        unencoded_locs, encoded_locs = locations.partition { |loc| loc.unencoded_value? }
+        locs_for_display = unencoded_locs.presence || encoded_locs
+        locs_for_display.map(&:to_s).compact_blank.uniq
+      end
+
+      # Dates associated with this event as a single string.
+      # @return [String]
+      def date_str
+        Utils.compact_and_join(display_dates.map(&:to_s), delimiter: "; ")
+      end
+
+      # Edition notes associated with the event as a single string.
+      # @return [String]
+      def edition_note_str
+        Utils.compact_and_join(notes.filter { |note| note.type == "edition" }.map(&:to_s), delimiter: ", ")
+      end
+
+      # Copyright notes associated with the event as a single string.
+      # @return [String]
+      def copyright_note_str
+        Utils.compact_and_join(notes.filter { |note| note.type == "copyright statement" }.map(&:to_s), delimiter: ", ")
+      end
+
+      # All contributors associated with the event as a single string.
+      # @return [String]
+      def contributor_str
+        Utils.compact_and_join(contributors.map(&:display_name), delimiter: " : ")
+      end
+
+      # The place of publication, combining all location values.
+      # @return [String]
+      def place_str
+        Utils.compact_and_join(display_locations, delimiter: " : ")
+      end
+    end
+  end
+end

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "2.0.0" # :nodoc:
+  VERSION = "2.1.0" # :nodoc:
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Nick Budak
 bindir: exe
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath
@@ -269,6 +269,7 @@ files:
 - lib/cocina_display/description/url.rb
 - lib/cocina_display/display_data.rb
 - lib/cocina_display/events/event.rb
+- lib/cocina_display/events/imprint.rb
 - lib/cocina_display/events/location.rb
 - lib/cocina_display/events/note.rb
 - lib/cocina_display/forms/form.rb