cocina_display 1.4.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91655b5e875b9fe1be7449bc1ba5cca1034e8b811a38444510dffc08e05cfbe
-  data.tar.gz: 58b7286e58890a2bbc769fcc7de8a18aebc1f44108123b4cfb3cec4069e2cc3d
+  metadata.gz: 90c6c88e6e77dc0d93ec05d8fb3a9b92bf5359609750a27b995a6da5fd1cc3bc
+  data.tar.gz: d92229bac2e2ffe80d9446e2e1e6ce286621d2218570c29acae543eaff07946b
 SHA512:
-  metadata.gz: dc64eef19cc55375a71eaa27aacbd84c068155b5d36d2a019515f4a8a74ffe22aae82375e5f2ae2dc5cad2a4201b718cc1cc2e5796e1278c95ab1bd6149177f2
-  data.tar.gz: e64de6a2785f71535b4854dd9eff74da93085d3c658bfd039586c027ba1e88b2beff0310e28d7a9bd68a6766bb9b4bfb202ad21a4512c1d21b3869f802ba9ba8
+  metadata.gz: b5861fb54b037cefe435a84f80ece667ecf48d1579ff29d548ca64e5bfcf0a51313eafb76b4d20a0145a625e9cf1406b7e2bb58dc16802a7d749f016e93ac5fb
+  data.tar.gz: 0a57cfb8965d62a653348694ad309e70a7f8771d13e6c5f3978dfaf50d4cfe6d87fb45f679621a67eb8cf1542688d52ad3b2e5ab4a7fa9f9c92787b1782a8b53

data/lib/cocina_display/cocina_record.rb

@@ -18,16 +18,14 @@ module CocinaDisplay
     include CocinaDisplay::Concerns::RelatedResources
 
     # Fetch a public Cocina document from PURL and create a CocinaRecord.
-    # @note This is intended to be used in development or testing only.
     # @param druid [String] The bare DRUID of the object to fetch.
     # @param purl_url [String] The base url for the purl service.
     # @param deep_compact [Boolean] If true, compact the JSON to remove blank values.
     # @return [CocinaDisplay::CocinaRecord]
-    # :nocov:
     def self.fetch(druid, deep_compact: true, purl_url: "https://purl.stanford.edu")
-      from_json(Net::HTTP.get(URI("#{purl_url}/#{druid}.json")), deep_compact: deep_compact)
+      response = Net::HTTP.get_response(URI("#{purl_url}/#{druid}.json"))
+      from_json(response.body, deep_compact: deep_compact) if response.is_a?(Net::HTTPSuccess)
     end
-    # :nocov:
 
     # Create a CocinaRecord from a JSON string.
     # @param cocina_json [String]
@@ -53,13 +51,12 @@ module CocinaDisplay
     end
 
     # SDR content type of the object.
-    # @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"].delete_prefix("https://cocina.sul.stanford.edu/models/")
+      cocina_doc["type"]&.delete_prefix("https://cocina.sul.stanford.edu/models/")
     end
 
     # Primary processing label for the object.

data/lib/cocina_display/concerns/contributors.rb

@@ -27,6 +27,12 @@ module CocinaDisplay
         publisher_contributors.flat_map(&:display_names).compact
       end
 
+      # All names of authors, formatted for display.
+      # @return [Array<String>]
+      def author_names
+        author_contributors.flat_map(&:display_names).compact
+      end
+
       # All names of contributors who are people, formatted for display.
       # @param with_date [Boolean] Include life dates, if present
       # @return [Array<String>]
@@ -80,11 +86,11 @@ module CocinaDisplay
         end
       end
 
-      # DisplayData for Contributors, one per role.
+      # DisplayData for Contributors, one per role (excluding publisher).
       # Contributors with no role are grouped under a default heading.
       # @return [Array<DisplayData>]
       def contributor_display_data
-        contributors_by_role.map do |role, contributors|
+        contributors_by_role.except("publisher").map do |role, contributors|
           label = I18n.t(role, scope: "cocina_display.contributor.role",
             default: role&.capitalize || I18n.t("default", scope: "cocina_display.contributor.role"))
           DisplayData.new(label: label, objects: contributors)
@@ -111,6 +117,13 @@ module CocinaDisplay
         ).map { |c| CocinaDisplay::Contributors::Contributor.new(c) }
       end
 
+      # All contributors with an "author" role.
+      # @return [Array<Contributor>]
+      # @see Contributor#author?
+      def author_contributors
+        contributors.filter(&:author?)
+      end
+
       # All contributors with a "publisher" role.
       # @return [Array<Contributor>]
       # @see Contributor#publisher?

data/lib/cocina_display/concerns/forms.rb

@@ -75,10 +75,16 @@ module CocinaDisplay
       end
 
       # All form notes to be rendered for display.
+      # Checks both description.form.note and description.geographic.form.note.
       # @return [Array<DisplayData>]
       def form_note_display_data
-        CocinaDisplay::DisplayData.from_cocina(path("$.description.form[*].note[*]"),
-          label: I18n.t("cocina_display.field_label.form.note"))
+        CocinaDisplay::DisplayData.from_cocina(
+          Enumerator::Chain.new(
+            path("$.description.form.*.note.*"),
+            path("$.description.geographic.*.form.*.note.*")
+          ),
+          label: I18n.t("cocina_display.field_label.form.note")
+        )
       end
 
       # Is the object a periodical or serial?
@@ -106,10 +112,14 @@ module CocinaDisplay
       end
 
       # Collapses all nested form values into an array of {Form} objects.
+      # Checks both description.form and description.geographic.form.
       # Preserves resource type without flattening, since it can be structured.
       # @return [Array<Form>]
       def all_forms
-        @all_forms ||= path("$.description.form.*")
+        @all_forms ||= Enumerator::Chain.new(
+          path("$.description.form.*"),
+          path("$.description.geographic.*.form.*")
+        )
           .flat_map { |form| Utils.flatten_nested_values(form, atomic_types: ["resource type"]) }
           .map { |form| CocinaDisplay::Forms::Form.from_cocina(form) }
       end

data/lib/cocina_display/concerns/identifiers.rb

@@ -53,6 +53,7 @@ module CocinaDisplay
 
         (link["refresh"] == refresh) ? hrid : nil
       end
+      alias_method :catkey, :folio_hrid
 
       # The FOLIO HRID if defined, otherwise the bare DRUID.
       # @note This doesn't imply the object is available in Searchworks at this ID.

data/lib/cocina_display/concerns/structural.rb

@@ -36,6 +36,13 @@ module CocinaDisplay
       def total_file_size_int
         files.pluck("size").sum
       end
+
+      # DRUIDs of collections this object is a member of.
+      # @return [Array<String>]
+      # @example ["sj775xm6965"]
+      def containing_collections
+        path("$.structural.isMemberOf.*").map { |druid| druid.delete_prefix("druid:") }
+      end
     end
   end
 end

data/lib/cocina_display/concerns/url_helpers.rb

@@ -3,7 +3,7 @@ module CocinaDisplay
     # Methods that generate URLs to access an object.
     module UrlHelpers
       # The PURL URL for this object.
-      # @return [String]
+      # @return [String, nil]
       # @example
       #  record.purl_url #=> "https://purl.stanford.edu/bx658jh7339"
       def purl_url
@@ -13,8 +13,7 @@ module CocinaDisplay
       # The oEmbed URL for the object, optionally with additional parameters.
       # Corresponds to the PURL environment.
       # @param params [Hash] Additional parameters to include in the oEmbed URL.
-      # @return [String]
-      # @return [nil] if the object is a collection.
+      # @return [String, nil]
       # @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: {})
@@ -26,17 +25,18 @@ module CocinaDisplay
 
       # The download URL to get the entire object as a .zip file.
       # Stacks generates the .zip for the object on request.
-      # @return [String]
+      # @note Collections and related resources do not have a download URL.
+      # @return [String, nil]
       # @example
       #   record.download_url #=> "https://stacks.stanford.edu/object/bx658jh7339"
       def download_url
-        "#{stacks_base_url}/object/#{bare_druid}" if bare_druid.present?
+        "#{stacks_base_url}/object/#{bare_druid}" if is_a?(CocinaDisplay::CocinaRecord) && bare_druid.present? && !collection?
       end
 
       # The IIIF manifest URL for the object.
       # PURL generates the IIIF manifest.
       # @param version [Integer] The IIIF presentation spec version to use (3 or 2).
-      # @return [String]
+      # @return [String, nil]
       # @example
       #  record.iiif_manifest_url #=> "https://purl.stanford.edu/bx658jh7339/iiif3/manifest"
       def iiif_manifest_url(version: 3)
@@ -44,11 +44,22 @@ module CocinaDisplay
         "#{purl_url}/#{iiif_path}/manifest" if purl_url.present?
       end
 
+      # The Searchworks URL for this object.
+      # Uses the catkey (FOLIO HRID) if present, otherwise uses the druid.
+      # @note This does not guarantee that the object is actually in Searchworks.
+      # @return [String, nil]
+      # @example
+      #  record.searchworks_url #=> "https://searchworks.stanford.edu/view/bx658jh7339"
+      def searchworks_url
+        return "#{searchworks_base_url}/view/#{folio_hrid}" if folio_hrid.present?
+        "#{searchworks_base_url}/view/#{bare_druid}" if bare_druid.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]
+      # @return [String, nil]
       # @example
       #   record.purl_base_url #=> "https://purl.stanford.edu"
       def purl_base_url
@@ -58,7 +69,7 @@ module CocinaDisplay
       # The URL to the stacks environment this object is shelved in.
       # Corresponds to the PURL environment.
       # @see purl_base_url
-      # @return [String]
+      # @return [String, nil]
       # @example
       #  record.stacks_base_url #=> "https://stacks.stanford.edu"
       def stacks_base_url
@@ -68,6 +79,20 @@ module CocinaDisplay
           "https://stacks.stanford.edu"
         end
       end
+
+      # The URL to the Searchworks environment this object could be found in.
+      # Corresponds to the PURL environment.
+      # @see purl_base_url
+      # @return [String, nil]
+      # @example
+      #  record.searchworks_base_url #=> "https://searchworks.stanford.edu"
+      def searchworks_base_url
+        if purl_base_url == "https://sul-purl-stage.stanford.edu"
+          "https://searchworks-stage.stanford.edu"
+        elsif purl_base_url.present?
+          "https://searchworks.stanford.edu"
+        end
+      end
     end
   end
 end

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "1.4.3" # :nodoc:
+  VERSION = "1.6.0" # :nodoc:
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Nick Budak
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-31 00:00:00.000000000 Z
+date: 2025-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: janeway-jsonpath
@@ -212,7 +211,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-description:
 email:
 - budak@stanford.edu
 executables: []
@@ -284,7 +282,6 @@ licenses:
 metadata:
   homepage_uri: https://sul-dlss.github.io/cocina_display/
   source_code_uri: https://github.com/sul-dlss/cocina_display
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -299,8 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []