cocina_display 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b164eda474dc396b74c8b911fe50bbba7c2dbbce17b29c24923db4f25ff8a5
-  data.tar.gz: c782186b53a4dcb7f53b11a3d552dcf5f892f4435fc46fb4bcddd65ad444d9be
+  metadata.gz: d3e38973fd7ea8399ce60829b3d11bafaa551c0f87e2bc1ccb49f55463b2c1b9
+  data.tar.gz: dd1398f2e2176979fdedfede55b9b09f46e42fffad1c7a16d2a4bcc9e9ef0229
 SHA512:
-  metadata.gz: efed0c780617aaeadb7187391c74691bcacddcb24cb2850e14918ab755acfaef273c8e3277a9c4674b2b41201a72ffe91a79a0065daa07ad469e2178ea17fd92
-  data.tar.gz: 28933bab6be3f6cd2fed4155d5b4a73bf9f9d9301e5edc679018f6428d90f88ca14ab8a6614d1c07e53f1723644b0871786fb075b664bb7e2fb73dba96d21588
+  metadata.gz: 39fd439e148f6eb1dc58fdec2752519083b627bd102eb8b1f0c40a74e539fdc2799aa6caed446f1142c16ffc59220bccc94f8a1fe7cc846786dc8832ba585310
+  data.tar.gz: 7a6560028d3f0e75e90ac922fc15b83eeabf393f28eeca4b50a78462278dba9db5e9785a8c8ab4f93a3cabc70ab1f6cf6ce7047a5712f05dd5de8c06d3b2b7e4

data/lib/cocina_display/concerns/contributors.rb

@@ -20,20 +20,20 @@ module CocinaDisplay
       # @param with_date [Boolean] Include life dates, if present
       # @return [Array<String>]
       def additional_contributor_names(with_date: false)
-        additional_contributors.map { |c| c.display_name(with_date: with_date) }
+        additional_contributors.map { |c| c.display_name(with_date: with_date) }.compact
       end
 
       # All names of publishers, formatted for display.
       # @return [Array<String>]
       def publisher_names
-        publisher_contributors.map(&:display_name)
+        publisher_contributors.map(&:display_name).compact
       end
 
-      # All names of authors who are people, formatted for display.
+      # All names of contributors who are people, formatted for display.
       # @param with_date [Boolean] Include life dates, if present
       # @return [Array<String>]
       def person_contributor_names(with_date: false)
-        contributors.filter(&:person?).map { |c| c.display_name(with_date: with_date) }
+        contributors.filter(&:person?).map { |c| c.display_name(with_date: with_date) }.compact
       end
 
       # All names of non-person contributors, formatted for display.
@@ -41,19 +41,19 @@ module CocinaDisplay
       # @return [Array<String>]
       # @see https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md#contributor-types
       def impersonal_contributor_names
-        contributors.reject(&:person?).map(&:display_name)
+        contributors.reject(&:person?).map(&:display_name).compact
       end
 
       # All names of contributors that are organizations, formatted for display.
       # @return [Array<String>]
       def organization_contributor_names
-        contributors.filter(&:organization?).map(&:display_name)
+        contributors.filter(&:organization?).map(&:display_name).compact
       end
 
       # All names of contributors that are conferences, formatted for display.
       # @return [Array<String>]
       def conference_contributor_names
-        contributors.filter(&:conference?).map(&:display_name)
+        contributors.filter(&:conference?).map(&:display_name).compact
       end
 
       # A hash mapping role names to the names of contributors with that role.
@@ -61,9 +61,11 @@ module CocinaDisplay
       # @return [Hash<String, Array<String>>]
       def contributor_names_by_role(with_date: false)
         contributors.each_with_object({}) do |contributor, hash|
-          contributor.roles.each do |role|
-            hash[role.to_s] ||= []
-            hash[role.to_s] << contributor.display_name(with_date: with_date)
+          if (name = contributor.display_name(with_date: with_date)).present?
+            contributor.roles.each do |role|
+              hash[role.to_s] ||= []
+              hash[role.to_s] << name
+            end
           end
         end
       end

data/lib/cocina_display/contributors/contributor.rb

@@ -80,7 +80,7 @@ module CocinaDisplay
       # @param with_date [Boolean] Include life dates, if present
       # @return [String]
       def display_name(with_date: false)
-        names.map { |name| name.to_s(with_date: with_date) }.first
+        names.map { |name| name.to_s(with_date: with_date) }.compact_blank.first
       end
 
       # The full forename for the contributor from the first available name.

data/lib/cocina_display/dates/date.rb

@@ -37,6 +37,7 @@ module CocinaDisplay
           # Try to match against known date formats using their regexes
           # Order matters here; more specific formats should be checked first
           date_class ||= [
+            UndeclaredEdtfFormat,
             MMDDYYYYFormat,
             MMDDYYFormat,
             YearRangeFormat,
@@ -86,10 +87,16 @@ module CocinaDisplay
       # @return [String, nil]
       attr_accessor :type
 
+      # The encoding name of this date, if specified.
+      # @example "iso8601"
+      # @return [String, nil]
+      attr_accessor :encoding
+
       def initialize(cocina)
         @cocina = cocina
         @date = self.class.parse_date(cocina["value"])
         @type = cocina["type"] unless ["start", "end"].include?(cocina["type"])
+        @encoding = cocina.dig("encoding", "code")
       end
 
       # Compare this date to another {Date} or {DateRange} using its {sort_key}.
@@ -115,14 +122,6 @@ module CocinaDisplay
         qualifier.present?
       end
 
-      # The encoding of this date, if specified.
-      # @example
-      #   date.encoding #=> "iso8601"
-      # @return [String, nil]
-      def encoding
-        cocina.dig("encoding", "code")
-      end
-
       # Was an encoding declared for this date?
       # @return [Boolean]
       def encoding?
@@ -515,6 +514,12 @@ module CocinaDisplay
       end
     end
 
+    # Extractor for dates that already match EDTF, they just didn't declare it
+    # Matches YYYY-MM-DD, YYYY-MM and YYYY; no further normalization needed
+    class UndeclaredEdtfFormat < ExtractorDateFormat
+      REGEX = /^(?<year>\d{4})(?:-(?<month>\d{2}))?(?:-(?<day>\d{2}))?$/
+    end
+
     # Extractor for MM/DD/YYYY and MM/DD/YYY-formatted dates
     class MMDDYYYYFormat < ExtractorDateFormat
       REGEX = /(?<month>\d{1,2})\/(?<day>\d{1,2})\/(?<year>\d{3,4})/

data/lib/cocina_display/dates/date_range.rb

@@ -13,7 +13,16 @@ module CocinaDisplay
       def self.from_cocina(cocina)
         return unless cocina["structuredValue"].present?
 
-        dates = cocina["structuredValue"].map { |sv| Date.from_cocina(sv) }
+        # Create the individual dates; if no encoding/type declared give them
+        # top-level encoding/type
+        dates = cocina["structuredValue"].map do |sv|
+          date = Date.from_cocina(sv)
+          date.encoding ||= cocina.dig("encoding", "code")
+          date.type ||= cocina["type"]
+          date
+        end
+
+        # Ensure we have at least a start or a stop
         start = dates.find(&:start?)
         stop = dates.find(&:end?)
         return unless start || stop

data/lib/cocina_display/geospatial.rb

@@ -150,12 +150,15 @@ module CocinaDisplay
       # @param [String] south southern latitude
       # @return [BoundingBox, nil] nil if parsing fails
       def self.from_coords(west:, east:, north:, south:)
-        min_point = Geo::Coord.parse("#{north}, #{west}")
-        max_point = Geo::Coord.parse("#{south}, #{east}")
+        min_point = Geo::Coord.parse("#{south}, #{west}")
+        max_point = Geo::Coord.parse("#{north}, #{east}")
 
         # Must be parsable
         return unless min_point && max_point
 
+        # Ensure min_point is southwest and max_point is northeast
+        return if min_point.lat > max_point.lat || min_point.lng > max_point.lng
+
         new(min_point: min_point, max_point: max_point)
       end
 
@@ -175,7 +178,7 @@ module CocinaDisplay
       def to_s
         min_lat, min_lng = format_point(min_point)
         max_lat, max_lng = format_point(max_point)
-        "#{min_lng} -- #{max_lng} / #{min_lat} -- #{max_lat}"
+        "#{min_lng} -- #{max_lng} / #{max_lat} -- #{min_lat}"
       end
 
       # Format using the Well-Known Text (WKT) representation.
@@ -300,7 +303,7 @@ module CocinaDisplay
         min_lat = normalize_coord(matches[:min_lat])
         max_lat = normalize_coord(matches[:max_lat])
 
-        BoundingBox.from_coords(west: min_lng, east: max_lng, north: min_lat, south: max_lat)
+        BoundingBox.from_coords(west: min_lng, east: max_lng, north: max_lat, south: min_lat)
       end
     end
 
@@ -321,28 +324,28 @@ module CocinaDisplay
     # @see https://www.oclc.org/bibformats/en/2xx/255.html#subfieldc
     class DMSBoundingBoxParser < BoundingBoxParser
       include DMSParser
-      PATTERN = /(?<min_lng>.+?)-+(?<max_lng>.+)\/(?<min_lat>.+?)-+(?<max_lat>.+)/
+      PATTERN = /(?<min_lng>.+?)-+(?<max_lng>.+)\/(?<max_lat>.+?)-+(?<min_lat>.+)/
     end
 
     # Format that pairs hemispheres with decimal degrees.
     # @example W 126.04--W 052.03/N 050.37--N 006.8
     class DecimalBoundingBoxParser < BoundingBoxParser
       include DecimalParser
-      PATTERN = /(?<min_lng>[0-9.EW]+?)-+(?<max_lng>[0-9.EW]+)\/(?<min_lat>[0-9.NS]+?)-+(?<max_lat>[0-9.NS]+)/
+      PATTERN = /(?<min_lng>[0-9.EW]+?)-+(?<max_lng>[0-9.EW]+)\/(?<max_lat>[0-9.NS]+?)-+(?<min_lat>[0-9.NS]+)/
     end
 
     # DMS-format data that appears to come from MARC 034 subfields.
     # @see https://www.oclc.org/bibformats/en/0xx/034.html
     # @example $dW0963700$eW0900700$fN0433000$gN040220
     class MarcDMSBoundingBoxParser < DMSBoundingBoxParser
-      PATTERN = /\$d(?<min_lng>[WENS].+)\$e(?<max_lng>[WENS].+)\$f(?<min_lat>[WENS].+)\$g(?<max_lat>[WENS].+)/
+      PATTERN = /\$d(?<min_lng>[WENS].+)\$e(?<max_lng>[WENS].+)\$f(?<max_lat>[WENS].+)\$g(?<min_lat>[WENS].+)/
     end
 
     # Decimal degree format data that appears to come from MARC 034 subfields.
     # @see https://www.oclc.org/bibformats/en/0xx/034.html
     # @example $d-112.0785250$e-111.6012719$f037.6516503$g036.8583209
     class MarcDecimalBoundingBoxParser < DecimalBoundingBoxParser
-      PATTERN = /\$d(?<min_lng>[0-9.-]+)\$e(?<max_lng>[0-9.-]+)\$f(?<min_lat>[0-9.-]+)\$g(?<max_lat>[0-9.-]+)/
+      PATTERN = /\$d(?<min_lng>[0-9.-]+)\$e(?<max_lng>[0-9.-]+)\$f(?<max_lat>[0-9.-]+)\$g(?<min_lat>[0-9.-]+)/
     end
   end
 end

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.1.1" # :nodoc:
+  VERSION = "1.1.3" # :nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Nick Budak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-14 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath