cocina_display 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c9a2548b9c996e4083311c34980125df77e41dc01ffa613e1539f9524b623a
-  data.tar.gz: ec9d5c04f50fb1cba69384b40c8ab9b009e8f8e9046b8e4dd67b15dd22f60479
+  metadata.gz: add082bf5794bc0df8fc9480cae4fe320b295867ec41ee09099ba5a5333eab93
+  data.tar.gz: d0a5d92a67890c13ef0e26876655956c277c04571ccefb5ab120d5e68e058137
 SHA512:
-  metadata.gz: f3f777efbd5262a640b9e9c93e63411d7c52c6aaf603b3203742a0af5108c8ece948918b6900db17dd42ec92e63c17f71a15b739fc2ced4c82d4b8f4e05d6af7
-  data.tar.gz: 91633c63df3e10220d5a8c564f2900194546d14b96ca6b115ddcbb12fff8a2f182bda92023dfd32ff5f6486f1fda3c93a8b578e93ae3075c4d5812bbfd39ffea
+  metadata.gz: 2828617fb57955a4578da26efb839c038df38809417c5fe63bcc44fe7ec8d3412c7ebf8259679e984e997f28e9d535a200818e4a546b0f26b4f3df122cd96e85
+  data.tar.gz: 0a6e51f36f516c1e414f8aa2cf10828a1608509dd7f06da9be2b5a3d866141c3be02cfcf3f1a282c08d00097880ee96e79d4cf0d4e61bdd4c6084d4322f65c2d

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

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.10.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.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Nick Budak
 bindir: exe
 cert_chain: []
-date: 2026-02-25 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