cocina_display 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dfb0909c582a5d1e3109bf0c98983e0ebd523af7340722856cb9d4482faa925
-  data.tar.gz: c2143a971249f8e6262dced0f4a05ef0d197426d3e86173f808c6f8f9321727e
+  metadata.gz: 688c7fafb0400ee43f4164d61ef4ef59c664345243ddaeb7ad57f18c236129b2
+  data.tar.gz: ea761030a2784394d0ce3d13624a39f212080fb084d2387a48b1e36c07a3eb25
 SHA512:
-  metadata.gz: e83761f763f300b62a7da1624d65f21b89fea93ab4170052c66a324dcd7b306b534fc5b84dc726dbb9945d5b98746398d84d8a9dbc00f3bd467658e12b801241
-  data.tar.gz: c06a74d7e19525eb27c71e314f2676d79fb1c3422efa0a9e08f39404feaa001d0c7252986761447a0bee6dd5bad6bc818310dae7a2fa89cb760af836b4bfd33f
+  metadata.gz: d52107bf61c72a2020b42883bf8e3679d3dbf5c9e202d770b6bf3adb4273f1b53c8af38525ae292dbffbe36aa7f45063898188fcb8f620fa5ae31b79f6a5799d
+  data.tar.gz: dba215b6897c505518a2509c6781f9f2dda73e81b31a0f86f74fe11c173e79172cdbf5c6f5e2fcfbb70f1d6222614b412cfda8e10449956937863046c7f8b7b1

data/lib/cocina_display/cocina_record.rb

@@ -17,6 +17,7 @@ module CocinaDisplay
     include CocinaDisplay::Concerns::Geospatial
     include CocinaDisplay::Concerns::Structural
     include CocinaDisplay::Concerns::RelatedResources
+    include CocinaDisplay::Concerns::ContentType
 
     # Fetch a public Cocina document from PURL and create a CocinaRecord.
     # @param druid [String] The bare DRUID of the object to fetch.
@@ -51,21 +52,6 @@ module CocinaDisplay
       Time.parse(cocina_doc["modified"])
     end
 
-    # SDR content type of the object.
-    # @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/")
-    end
-
-    # True if the object is a collection.
-    # @return [Boolean]
-    def collection?
-      content_type == "collection"
-    end
-
     # Copyright statement from Cocina access metadata.
     # @return [String, nil]
     def copyright

data/lib/cocina_display/concerns/accesses.rb

@@ -73,6 +73,7 @@ module CocinaDisplay
 
       # Download rights for the object.
       # @note Individual files may have differing download rights.
+      # @note Collections have no download rights, so this is always nil for them.
       # @return [String, nil]
       # @example "world", "stanford_only", "none", "location-based"
       def download_rights
@@ -95,7 +96,7 @@ module CocinaDisplay
       # Is the object downloadable in some capacity?
       # @return [Boolean]
       def downloadable?
-        download_rights != "none"
+        download_rights.present? && download_rights != "none"
       end
 
       # Is the object viewable by anyone?
@@ -111,8 +112,11 @@ module CocinaDisplay
       end
 
       # Is the object both viewable and downloadable by anyone?
+      # @note Collections have no download rights, so only view rights are considered.
       # @return [Boolean]
       def world_access?
+        return world_viewable? if collection?
+
         world_viewable? && world_downloadable?
       end
 
@@ -147,8 +151,11 @@ module CocinaDisplay
       end
 
       # Is the object both viewable and downloadable by Stanford affiliates?
+      # @note Collections have no download rights, so only view rights are considered.
       # @return [Boolean]
       def stanford_access?
+        return stanford_viewable? if collection?
+
         stanford_viewable? && stanford_downloadable?
       end
 

data/lib/cocina_display/concerns/content_type.rb

@@ -0,0 +1,21 @@
+module CocinaDisplay
+  module Concerns
+    # Methods related to the content type of a Cocina object.
+    module ContentType
+      # SDR content type of the object.
+      # @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/")
+      end
+
+      # True if the object is a collection.
+      # @return [Boolean]
+      def collection?
+        content_type == "collection"
+      end
+    end
+  end
+end

data/lib/cocina_display/events/event.rb

@@ -157,7 +157,7 @@ module CocinaDisplay
       # Dates associated with this event as a single string.
       # @return [String]
       def date_str
-        display_dates.map(&:qualified_value).compact_blank.uniq.to_sentence
+        display_dates.map(&:to_s).compact_blank.uniq.to_sentence
       end
 
       # Locations associated with this event as a single string.

data/lib/cocina_display/related_resource.rb

@@ -15,6 +15,7 @@ module CocinaDisplay
     include CocinaDisplay::Concerns::Forms
     include CocinaDisplay::Concerns::Languages
     include CocinaDisplay::Concerns::Geospatial
+    include CocinaDisplay::Concerns::ContentType
 
     # Description of the relation to the source record.
     # @return [String]

data/lib/cocina_display/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module CocinaDisplay
-  VERSION = "2.13.0" # :nodoc:
+  VERSION = "2.14.0" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina_display
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Nick Budak
@@ -238,6 +238,7 @@ files:
 - lib/cocina_display/cocina_record.rb
 - lib/cocina_display/concerns.rb
 - lib/cocina_display/concerns/accesses.rb
+- lib/cocina_display/concerns/content_type.rb
 - lib/cocina_display/concerns/contributors.rb
 - lib/cocina_display/concerns/druid.rb
 - lib/cocina_display/concerns/events.rb
@@ -313,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Helpers for rendering Cocina metadata
 test_files: []