cocina_display 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7faaded226886ab37cfbff854b64721c55964959089a1675706ae6160d4a1a5c
-  data.tar.gz: 111b995bfdf70805eb7a613bf5f221bacf101be1ed3f9ad6fb2407266c7a35ab
+  metadata.gz: b6eddb643cc7413aaefd5b2b73df29c7d9aaa98ce7a0008816d405c82f73517d
+  data.tar.gz: 0ce368a036754577ab65e1f917750f4b6142d48bcb413eb202a4538324fca2ea
 SHA512:
-  metadata.gz: 6a8586d41059d8880ac29c48f564907a51b718dc7812f2314e564032e1f19722d97620755cd53f52aa927e17e45dbfab79b56936c022255f2c22c3147e2c110c
-  data.tar.gz: 58ddd5de3cfe25d78904c24c1edaed72d4212eb7149b58b3b6e5c216390db75acc0c8ad81c039c9c712da99480842df2cab27c70573c848e2cb9377f0a31b909
+  metadata.gz: e1a2cff79e052b77dfa25a84ac2899b21143342fdbff2b16c12a8f059c15b7a3cbfbb75b6daf52db21778989aea4beab60c35ad590f1ce4badea4ed7322f3876
+  data.tar.gz: 52f9cb5bba2e219da180275de8c2db31e82e4dfea8bc72987be4ccaaa4239007af4491f8db2f2633e03cf2cc4141d6963483f408740dfdeeb8f03ef661c14a0c

data/lib/cocina_display/cocina_record.rb

@@ -90,12 +90,13 @@ module CocinaDisplay
     end
 
     # SDR content type of the object.
-    # @return [String]
+    # @note {RelatedResource}s may not have a content type.
+    # @return [String, nil]
     # @see https://github.com/sul-dlss/cocina-models/blob/main/openapi.yml#L532-L546
     # @example
     #  record.content_type #=> "image"
     def content_type
-      cocina_doc["type"].split("/").last
+      cocina_doc["type"]&.split("/")&.last
     end
 
     # Primary processing label for the object.
@@ -128,7 +129,7 @@ module CocinaDisplay
     attr_reader :type
 
     # Restructure the hash so that everything is under "description" key, since
-    # it's all descriptive metadata. This makes CocinaRecord methods work.
+    # it's all descriptive metadata. This makes most CocinaRecord methods work.
     def initialize(cocina_doc)
       @type = cocina_doc["type"]
       @cocina_doc = {"description" => cocina_doc.except("type")}

data/lib/cocina_display/concerns/access.rb

@@ -7,30 +7,7 @@ module CocinaDisplay
       # @example
       #  record.purl_url #=> "https://purl.stanford.edu/bx658jh7339"
       def purl_url
-        cocina_doc.dig("description", "purl") || "https://purl.stanford.edu/#{bare_druid}"
-      end
-
-      # The URL to the PURL environment this object is from.
-      # @note Objects accessed via UAT will still have a production PURL base URL.
-      # @return [String]
-      # @example
-      #   record.purl_base_url #=> "https://purl.stanford.edu"
-      def purl_base_url
-        URI(purl_url).origin
-      end
-
-      # The URL to the stacks environment this object is shelved in.
-      # Corresponds to the PURL environment.
-      # @see purl_base_url
-      # @return [String]
-      # @example
-      #  record.stacks_base_url #=> "https://stacks.stanford.edu"
-      def stacks_base_url
-        if purl_base_url == "https://sul-purl-stage.stanford.edu"
-          "https://sul-stacks-stage.stanford.edu"
-        else
-          "https://stacks.stanford.edu"
-        end
+        cocina_doc.dig("description", "purl") || ("https://purl.stanford.edu/#{bare_druid}" if bare_druid)
       end
 
       # The oEmbed URL for the object, optionally with additional parameters.
@@ -41,7 +18,7 @@ module CocinaDisplay
       # @example Generate an oEmbed URL for the viewer and hide the title
       #   record.oembed_url(hide_title: true) #=> "https://purl.stanford.edu/bx658jh7339/embed.json?hide_title=true"
       def oembed_url(params: {})
-        return if collection?
+        return if collection? || purl_url.blank?
 
         params[:url] ||= purl_url
         "#{purl_base_url}/embed.json?#{params.to_query}"
@@ -53,7 +30,7 @@ module CocinaDisplay
       # @example
       #   record.download_url #=> "https://stacks.stanford.edu/object/bx658jh7339"
       def download_url
-        "#{stacks_base_url}/object/#{bare_druid}"
+        "#{stacks_base_url}/object/#{bare_druid}" if bare_druid.present?
       end
 
       # The IIIF manifest URL for the object.
@@ -64,7 +41,32 @@ module CocinaDisplay
       #  record.iiif_manifest_url #=> "https://purl.stanford.edu/bx658jh7339/iiif3/manifest"
       def iiif_manifest_url(version: 3)
         iiif_path = (version == 3) ? "iiif3" : "iiif"
-        "#{purl_url}/#{iiif_path}/manifest"
+        "#{purl_url}/#{iiif_path}/manifest" if purl_url.present?
+      end
+
+      private
+
+      # The URL to the PURL environment this object is from.
+      # @note Objects accessed via UAT will still have a production PURL base URL.
+      # @return [String]
+      # @example
+      #   record.purl_base_url #=> "https://purl.stanford.edu"
+      def purl_base_url
+        URI(purl_url).origin if purl_url.present?
+      end
+
+      # The URL to the stacks environment this object is shelved in.
+      # Corresponds to the PURL environment.
+      # @see purl_base_url
+      # @return [String]
+      # @example
+      #  record.stacks_base_url #=> "https://stacks.stanford.edu"
+      def stacks_base_url
+        if purl_base_url == "https://sul-purl-stage.stanford.edu"
+          "https://sul-stacks-stage.stanford.edu"
+        elsif purl_base_url.present?
+          "https://stacks.stanford.edu"
+        end
       end
     end
   end

data/lib/cocina_display/concerns/identifiers.rb

@@ -3,19 +3,22 @@ module CocinaDisplay
     # Methods for extracting and formatting identifiers from Cocina records.
     module Identifiers
       # The DRUID for the object, with the +druid:+ prefix.
-      # @return [String]
+      # @note A {RelatedResource} may not have a DRUID.
+      # @return [String, nil]
       # @example
       #   record.druid #=> "druid:bb099mt5053"
       def druid
-        cocina_doc["externalIdentifier"]
+        cocina_doc["externalIdentifier"] ||
+          cocina_doc.dig("description", "purl")&.split("/")&.last
       end
 
       # The DRUID for the object, without the +druid:+ prefix.
-      # @return [String]
+      # @note A {RelatedResource} may not have a DRUID.
+      # @return [String, nil]
       # @example
       #   record.bare_druid #=> "bb099mt5053"
       def bare_druid
-        druid.delete_prefix("druid:")
+        druid&.delete_prefix("druid:")
       end
 
       # The DOI for the object, if there is one – just the identifier part.
@@ -59,7 +62,7 @@ module CocinaDisplay
       # @note This doesn't imply the object is available in Searchworks at this ID.
       # @see folio_hrid
       # @see bare_druid
-      # @return [String]
+      # @return [String, nil]
       def searchworks_id
         folio_hrid || bare_druid
       end

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

@@ -99,6 +99,8 @@ module CocinaDisplay
     # this may be useful for boosting and exact matching for search results
     # @return [Array<String>] the main title value(s) for Solr - can be array due to parallel titles
     def main_title(titles)
+      return [] if titles.empty?
+
       cocina_title = primary_title(titles) || untyped_title(titles)
       cocina_title = other_title(titles) if cocina_title.blank?
 

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.1.0" # :nodoc:
+  VERSION = "1.1.2" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Nick Budak