cocina-models 0.58.1 → 0.61.0

data/lib/cocina/models/location_based_download_access.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class LocationBasedDownloadAccess < Struct
+      # Access level.
+      attribute :access, Types::Strict::String.enum('stanford', 'world')
+      # Download access level.
+      attribute :download, Types::Strict::String.enum('location-based')
+      # If access is "location-based", which location should have access.
+      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
+      attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/presentation.rb

@@ -4,9 +4,9 @@ module Cocina
   module Models
     class Presentation < Struct
       # Height in pixels
-      attribute :height, Types::Strict::Integer.optional.meta(omittable: true)
+      attribute :height, Types::Strict::Integer.meta(omittable: true)
       # Width in pixels
-      attribute :width, Types::Strict::Integer.optional.meta(omittable: true)
+      attribute :width, Types::Strict::Integer.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/purl.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    Purl = Types::String.constrained(
+      format: %r{^http://}i
+    )
+  end
+end

data/lib/cocina/models/related_resource.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class RelatedResource < Struct
       # The relationship of the related resource to the described resource.
-      attribute :type, Types::Strict::String.optional.meta(omittable: true)
+      attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the related resource relative to other related resources.
-      attribute :status, Types::Strict::String.optional.meta(omittable: true)
+      attribute :status, Types::Strict::String.meta(omittable: true)
       # The preferred display label to use for the related resource in access systems.
-      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
       attribute :title, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
       attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
@@ -18,15 +18,15 @@ module Cocina
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :standard, Standard.optional.meta(omittable: true)
       attribute :subject, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # Stanford persistent URL associated with the related resource.
-      attribute :purl, Types::Strict::String.optional.meta(omittable: true)
+      # Stanford persistent URL associated with the related resource. Note this is http, not https.
+      attribute :purl, Types::Strict::String.meta(omittable: true)
       attribute :access, DescriptiveAccessMetadata.optional.meta(omittable: true)
       attribute :relatedResource, Types::Strict::Array.of(RelatedResource).meta(omittable: true)
       attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
       # The version of the related resource.
-      attribute :version, Types::Strict::String.optional.meta(omittable: true)
+      attribute :version, Types::Strict::String.meta(omittable: true)
       # URL or other pointer to the location of the related resource information.
-      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/release_tag.rb

@@ -5,15 +5,15 @@ module Cocina
     class ReleaseTag < Struct
       # Who did this release
       # example: petucket
-      attribute :who, Types::Strict::String.optional.meta(omittable: true)
+      attribute :who, Types::Strict::String.meta(omittable: true)
       # What is being released. This item or the whole collection.
       # example: self
-      attribute :what, Types::Strict::String.optional.enum('self', 'collection').meta(omittable: true)
+      attribute :what, Types::Strict::String.enum('self', 'collection').meta(omittable: true)
       # When did this action happen
-      attribute :date, Types::Params::DateTime.optional.meta(omittable: true)
+      attribute :date, Types::Params::DateTime.meta(omittable: true)
       # What platform is it released to
       # example: Searchworks
-      attribute :to, Types::Strict::String.optional.meta(omittable: true)
+      attribute :to, Types::Strict::String.meta(omittable: true)
       attribute :release, Types::Strict::Bool.default(false)
     end
   end

data/lib/cocina/models/request_admin_policy.rb

@@ -7,7 +7,6 @@ module Cocina
 
       TYPES = ['http://cocina.sul.stanford.edu/models/admin_policy.jsonld'].freeze
 
-      # example: item
       attribute :type, Types::Strict::String.enum(*RequestAdminPolicy::TYPES)
       attribute :label, Types::Strict::String
       attribute :version, Types::Strict::Integer

data/lib/cocina/models/request_collection.rb

@@ -11,11 +11,10 @@ module Cocina
                'http://cocina.sul.stanford.edu/models/exhibit.jsonld',
                'http://cocina.sul.stanford.edu/models/series.jsonld'].freeze
 
-      # example: item
       attribute :type, Types::Strict::String.enum(*RequestCollection::TYPES)
       attribute :label, Types::Strict::String
       attribute :version, Types::Strict::Integer
-      attribute(:access, Access.default { Access.new })
+      attribute(:access, CollectionAccess.default { CollectionAccess.new })
       attribute(:administrative, Administrative.default { Administrative.new })
       attribute :description, Description.optional.meta(omittable: true)
       attribute :identification, CollectionIdentification.optional.meta(omittable: true)

data/lib/cocina/models/request_dro.rb

@@ -21,7 +21,6 @@ module Cocina
                'http://cocina.sul.stanford.edu/models/webarchive-binary.jsonld',
                'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'].freeze
 
-      # example: item
       attribute :type, Types::Strict::String.enum(*RequestDRO::TYPES)
       attribute :label, Types::Strict::String
       attribute :version, Types::Strict::Integer

data/lib/cocina/models/request_dro_structural.rb

@@ -6,7 +6,7 @@ module Cocina
       attribute :contains, Types::Strict::Array.of(RequestFileSet).meta(omittable: true)
       attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
       attribute :isMemberOf, Types::Strict::Array.of(Druid).meta(omittable: true)
-      attribute :hasAgreement, Types::Strict::String.optional.meta(omittable: true)
+      attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/request_file.rb

@@ -10,11 +10,11 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*RequestFile::TYPES)
       attribute :label, Types::Strict::String
       attribute :filename, Types::Strict::String
-      attribute :size, Types::Strict::Integer.optional.meta(omittable: true)
+      attribute :size, Types::Strict::Integer.meta(omittable: true)
       attribute :version, Types::Strict::Integer
-      attribute :hasMimeType, Types::Strict::String.optional.meta(omittable: true)
-      attribute :externalIdentifier, Types::Strict::String.optional.meta(omittable: true)
-      attribute :use, Types::Strict::String.optional.meta(omittable: true)
+      attribute :hasMimeType, Types::Strict::String.meta(omittable: true)
+      attribute :externalIdentifier, Types::Strict::String.meta(omittable: true)
+      attribute :use, Types::Strict::String.meta(omittable: true)
       attribute :hasMessageDigests, Types::Strict::Array.of(MessageDigest).default([].freeze)
       attribute(:access, FileAccess.default { FileAccess.new })
       attribute(:administrative, FileAdministrative.default { FileAdministrative.new })

data/lib/cocina/models/request_identification.rb

@@ -3,13 +3,16 @@
 module Cocina
   module Models
     class RequestIdentification < Struct
+      # A barcode
+      attribute :barcode, Types::Nominal::Any.meta(omittable: true)
+      attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+      # Digital Object Identifier (https://www.doi.org)
+      # example: 10.25740/druid:bc123df4567
+      attribute :doi, Types::Strict::String.meta(omittable: true)
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
       attribute :sourceId, Types::Strict::String
-      attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
-      # A barcode
-      attribute :barcode, Types::Nominal::Any.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/sequence.rb

@@ -5,7 +5,7 @@ module Cocina
     class Sequence < Struct
       attribute :members, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
       # The direction that a sequence of canvases should be displayed to the user
-      attribute :viewingDirection, Types::Strict::String.optional.enum('right-to-left', 'left-to-right').meta(omittable: true)
+      attribute :viewingDirection, Types::Strict::String.enum('right-to-left', 'left-to-right').meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/source.rb

@@ -4,14 +4,14 @@ module Cocina
   module Models
     class Source < Struct
       # Code representing the value source.
-      attribute :code, Types::Strict::String.optional.meta(omittable: true)
+      attribute :code, Types::Strict::String.meta(omittable: true)
       # URI for the value source.
-      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
+      attribute :uri, Types::Strict::String.meta(omittable: true)
       # String describing the value source.
-      attribute :value, Types::Strict::String.optional.meta(omittable: true)
+      attribute :value, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # The version of the value source.
-      attribute :version, Types::Strict::String.optional.meta(omittable: true)
+      attribute :version, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/standard.rb

@@ -4,14 +4,14 @@ module Cocina
   module Models
     class Standard < Struct
       # Code representing the standard or encoding.
-      attribute :code, Types::Strict::String.optional.meta(omittable: true)
+      attribute :code, Types::Strict::String.meta(omittable: true)
       # URI for the standard or encoding.
-      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
+      attribute :uri, Types::Strict::String.meta(omittable: true)
       # String describing the standard or encoding.
-      attribute :value, Types::Strict::String.optional.meta(omittable: true)
+      attribute :value, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # The version of the standard or encoding.
-      attribute :version, Types::Strict::String.optional.meta(omittable: true)
+      attribute :version, Types::Strict::String.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/stanford_access.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class StanfordAccess < Struct
+      # Access level.
+      attribute :access, Types::Strict::String.enum('stanford')
+      # Download access level.
+      attribute :download, Types::Strict::String.enum('stanford')
+      # If access is "location-based", which location should have access.
+      attribute :readLocation, Types::Strict::String.optional.enum('').meta(omittable: true)
+      attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/title.rb

@@ -7,27 +7,27 @@ module Cocina
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # String or integer value of the descriptive element.
-      attribute :value, Types::Nominal::Any.optional.meta(omittable: true)
+      attribute :value, Types::Nominal::Any.meta(omittable: true)
       # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.optional.meta(omittable: true)
+      attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.optional.meta(omittable: true)
+      attribute :status, Types::Strict::String.meta(omittable: true)
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.optional.meta(omittable: true)
+      attribute :code, Types::Strict::String.meta(omittable: true)
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
+      attribute :uri, Types::Strict::String.meta(omittable: true)
       attribute :standard, Standard.optional.meta(omittable: true)
       attribute :encoding, Standard.optional.meta(omittable: true)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
       # The preferred display label to use for the descriptive element in access systems.
-      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.optional.meta(omittable: true)
+      attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
       # URL or other pointer to the location of the value of the descriptive element.
-      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.58.1'
+    VERSION = '0.61.0'
   end
 end

data/lib/cocina/models/world_access.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class WorldAccess < Struct
+      # Access level.
+      attribute :access, Types::Strict::String.enum('world')
+      # Download access level.
+      attribute :download, Types::Strict::String.enum('none', 'stanford', 'world')
+      # If access is "location-based", which location should have access.
+      attribute :readLocation, Types::Strict::String.optional.enum('').meta(omittable: true)
+      attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
+    end
+  end
+end

data/openapi.yml

@@ -94,41 +94,16 @@ paths:
 components:
   schemas:
     Access:
-      description: Access metadata for collections
       type: object
-      additionalProperties: false
-      properties:
-        access:
-          description: Access level
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'citation-only'
-            - 'dark'
-          default: 'dark'
-        copyright:
-          description: The human readable copyright statement that applies
-          example: Copyright World Trade Organization
-          type: string
-        readLocation:
-          description: If access is "location-based", which location should have access.
-          type: string
-          enum:
-            - 'spec'
-            - 'music'
-            - 'ars'
-            - 'art'
-            - 'hoover'
-            - 'm&m'
-        useAndReproductionStatement:
-          description: The human readable use and reproduction statement that applies
-          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-          type: string
-        license:
-          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-          type: string
+      oneOf:
+        # Being first, makes DarkAccess the default.
+        - $ref: '#/components/schemas/DarkAccess'
+        - $ref: '#/components/schemas/CitationOnlyAccess'
+        - $ref: '#/components/schemas/ControlledDigitalLendingAccess'
+        - $ref: '#/components/schemas/LocationBasedAccess'
+        - $ref: '#/components/schemas/LocationBasedDownloadAccess'
+        - $ref: '#/components/schemas/StanfordAccess'
+        - $ref: '#/components/schemas/WorldAccess'
     AccessRole:
       description: Access role conferred by an AdminPolicy to objects within it. (used by Argo)
       type: object
@@ -201,7 +176,6 @@ components:
           type: string
           enum:
             - 'http://cocina.sul.stanford.edu/models/admin_policy.jsonld'
-          example: item
         externalIdentifier:
           $ref: '#/components/schemas/Druid'
         label:
@@ -275,6 +249,7 @@ components:
           description: The human readable copyright statement that applies
           example: Copyright World Trade Organization
           type: string
+          nullable: true
         download:
           description: >
             Download access level. This is used in the transition from Fedora as
@@ -294,6 +269,7 @@ components:
             readLocation at registration that is copied down to all the files.
 
           type: string
+          nullable: true
           enum:
             - 'spec'
             - 'music'
@@ -305,9 +281,11 @@ components:
           description: The human readable use and reproduction statement that applies
           example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
           type: string
+          nullable: true
         license:
           description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
           type: string
+          nullable: true
     AppliesTo:
       description: Property model for indicating the parts, aspects, or versions of the resource to which a
         descriptive element is applicable.
@@ -322,13 +300,19 @@ components:
       description: 'A barcode'
       oneOf:
         - $ref: '#/components/schemas/BusinessBarcode'
+        - $ref: '#/components/schemas/LaneMedicalBarcode'
         - $ref: '#/components/schemas/CatkeyBarcode'
         - $ref: '#/components/schemas/StandardBarcode'
     BusinessBarcode:
       description: The barcode associated with a business library DRO object, prefixed with 2050
       type: string
       pattern: '^2050[0-9]{7}$'
-      example: 20503740296
+      example: '20503740296'
+    LaneMedicalBarcode:
+      description: The barcode associated with a Lane Medical Library DRO object, prefixed with 245
+      type: string
+      pattern: '^245[0-9]{8}$'
+      example: '24503259768'
     CatalogLink:
       type: object
       additionalProperties: false
@@ -343,12 +327,39 @@ components:
         catalogRecordId:
           description: Record identifier that is unique within the context of the linked record's catalog.
           type: string
-          example: 11403803
+          example: '11403803'
     CatkeyBarcode:
       description: The barcode associated with a DRO object based on catkey, prefixed with 36105
       type: string
       pattern: '^[0-9]+-[0-9]+$'
-      example: 6772719-1001
+      example: '6772719-1001'
+    CitationOnlyAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - citation-only
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - 'none'
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          nullable: true
+          enum:
+            - null
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
+      required:
+        - access
+        - download
     Collection:
       description: A group of Digital Repository Objects that indicate some type of conceptual grouping within the domain that is worth reusing across the system.
       type: object
@@ -363,7 +374,6 @@ components:
             - 'http://cocina.sul.stanford.edu/models/user-collection.jsonld'
             - 'http://cocina.sul.stanford.edu/models/exhibit.jsonld'
             - 'http://cocina.sul.stanford.edu/models/series.jsonld'
-          example: item
         externalIdentifier:
           $ref: '#/components/schemas/Druid'
         label:
@@ -373,7 +383,7 @@ components:
           description: Version for the Collection within SDR.
           type: integer
         access:
-          $ref: '#/components/schemas/Access'
+          $ref: '#/components/schemas/CollectionAccess'
         administrative:
           $ref: '#/components/schemas/Administrative'
         description:
@@ -386,16 +396,40 @@ components:
         - type
         - version
         - access
+    CollectionAccess:
+      description: Access metadata for collections
+      type: object
+      additionalProperties: false
+      properties:
+        access:
+          description: Access level
+          type: string
+          enum:
+            - 'world'
+            - 'dark'
+          default: 'dark'
+        copyright:
+          description: The human readable copyright statement that applies
+          example: Copyright World Trade Organization
+          type: string
+          nullable: true
+        useAndReproductionStatement:
+          description: The human readable use and reproduction statement that applies
+          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+          type: string
+        license:
+          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+          type: string
     CollectionIdentification:
       type: object
       additionalProperties: false
       properties:
-        sourceId:
-          $ref: '#/components/schemas/SourceId'
         catalogLinks:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+        sourceId:
+          $ref: '#/components/schemas/SourceId'
     Contributor:
       description: Property model for describing agents contributing in some way to
         the creation and history of the resource.
@@ -438,6 +472,60 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveParallelContributor"
+    ControlledDigitalLendingAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - stanford
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - none
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          nullable: true
+          enum:
+            - null
+        controlledDigitalLending:
+          description: Available for controlled digital lending.
+          type: boolean
+          default: false
+      required:
+        - access
+        - download
+        - controlledDigitalLending
+    DarkAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          default: 'dark'
+          enum:
+            - dark
+        download:
+          description: Download access level.
+          type: string
+          default: 'none'
+          enum:
+            - 'none'
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          nullable: true
+          default: null
+          enum:
+            - null
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
     Description:
       type: object
       additionalProperties: false
@@ -492,9 +580,7 @@ components:
           items:
             $ref: "#/components/schemas/DescriptiveValue"
         purl:
-          description: Stanford persistent URL associated with the resource.
-          type: string
-          format: uri
+          $ref: "#/components/schemas/Purl"
         access:
           $ref: "#/components/schemas/DescriptiveAccessMetadata"
         relatedResource:
@@ -789,6 +875,11 @@ components:
               $ref: '#/components/schemas/Standard'
               # description: An alphabet or other notation used to represent a
               #   language or other symbolic system of the descriptive element value.
+    DOI:
+      type: string
+      description: Digital Object Identifier (https://www.doi.org)
+      pattern: '^10\.25740\/druid:[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$'
+      example: '10.25740/druid:bc123df4567'
     DRO:
       description: Domain-defined abstraction of a 'work'. Digital Repository Objects' abstraction is describable for our domain’s purposes, i.e. for management needs within our system.
       type: object
@@ -813,7 +904,6 @@ components:
             - 'http://cocina.sul.stanford.edu/models/track.jsonld'
             - 'http://cocina.sul.stanford.edu/models/webarchive-binary.jsonld'
             - 'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'
-          example: item
         externalIdentifier:
           $ref: '#/components/schemas/Druid'
         label:
@@ -844,60 +934,55 @@ components:
     DROAccess:
       type: object
       additionalProperties: false
-      properties:
-        access:
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'citation-only'
-            - 'dark'
-          default: 'dark'
-        controlledDigitalLending:
-          description: Available for controlled digital lending.
-          type: boolean
-          default: false
-        copyright:
-          description: The human readable copyright statement that applies
-          example: Copyright World Trade Organization
-          type: string
-        embargo:
-          $ref: '#/components/schemas/Embargo'
-        download:
-          description: >
-            Download access level. This is used in the transition from Fedora as
-            a way to set a default download level at registration that is copied
-            down to all the files.
-
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'none'
-          default: 'none'
-        readLocation:
-          description: >
-            If access is "location-based", which location should have access.
-            This is used in the transition from Fedora as a way to set a default
-            readLocation at registration that is copied down to all the files.
-
-          type: string
-          enum:
-            - 'spec'
-            - 'music'
-            - 'ars'
-            - 'art'
-            - 'hoover'
-            - 'm&m'
-        useAndReproductionStatement:
-          description: The human readable use and reproduction statement that applies
-          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-          type: string
-        license:
-          description: The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-          type: string
+      allOf:
+        - $ref: "#/components/schemas/Access"
+        - type: object
+          properties:
+            copyright:
+              description: The human readable copyright statement that applies
+              example: Copyright World Trade Organization
+              type: string
+              nullable: true
+            embargo:
+              $ref: '#/components/schemas/Embargo'
+            useAndReproductionStatement:
+              description: The human readable use and reproduction statement that applies
+              example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+              type: string
+            license:
+              description: The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+              type: string
+              enum:
+                - 'https://www.gnu.org/licenses/agpl.txt'
+                - 'https://www.apache.org/licenses/LICENSE-2.0'
+                - 'https://opensource.org/licenses/BSD-2-Clause'
+                - 'https://opensource.org/licenses/BSD-3-Clause'
+                - 'https://creativecommons.org/licenses/by/4.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc/4.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nd/4.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-sa/4.0/legalcode'
+                - 'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
+                - 'https://opensource.org/licenses/cddl1'
+                - 'https://www.eclipse.org/legal/epl-2.0'
+                - 'https://www.gnu.org/licenses/gpl-3.0-standalone.html'
+                - 'https://www.isc.org/downloads/software-support-policy/isc-license/'
+                - 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html'
+                - 'https://opensource.org/licenses/MIT'
+                - 'https://www.mozilla.org/MPL/2.0/'
+                - 'https://opendatacommons.org/licenses/by/1-0/'
+                - 'http://opendatacommons.org/licenses/odbl/1.0/' # Non cannonical, but in some of our data
+                - 'https://opendatacommons.org/licenses/odbl/1-0/'
+                - 'https://creativecommons.org/publicdomain/mark/1.0/'
+                - 'https://opendatacommons.org/licenses/pddl/1-0/'
+                - 'https://creativecommons.org/licenses/by/3.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-sa/3.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nd/3.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc/3.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode'
+                - 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode'
+                - 'http://cocina.sul.stanford.edu/licenses/none' # Only used in some legacy ETDs and not actually permitted per the Project Chimera docs.
     DROStructural:
       description: Structural metadata
       type: object
@@ -928,28 +1013,21 @@ components:
     Embargo:
       type: object
       additionalProperties: false
-      properties:
-        releaseDate:
-          description: Date when the Collection is released from an embargo.
-          type: string
-          format: date-time
-          example: '2029-06-22T07:00:00.000+00:00'
-        access:
-          description: Access level that applies when embargo expires.
-          type: string
-          enum:
-            - world
-            - stanford
-            - location-based
-            - citation-only
-            - dark
-        useAndReproductionStatement:
-          description: The human readable use and reproduction statement that applies when the embargo expires.
-          example: These materials are in the public domain.
-          type: string
-      required:
-        - releaseDate
-        - access
+      allOf:
+        - $ref: "#/components/schemas/Access"
+        - type: object
+          properties:
+            releaseDate:
+              description: Date when the Collection is released from an embargo.
+              type: string
+              format: date-time
+              example: '2029-06-22T07:00:00.000+00:00'
+            useAndReproductionStatement:
+              description: The human readable use and reproduction statement that applies when the embargo expires.
+              example: These materials are in the public domain.
+              type: string
+          required:
+            - releaseDate
     Event:
       description: Property model for describing events in the history of the resource.
       type: object
@@ -1052,40 +1130,14 @@ components:
       description: Access metadata for files
       type: object
       additionalProperties: false
-      properties:
-        access:
-          description: Access level
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'citation-only'
-            - 'dark'
-          default: 'dark'
-        controlledDigitalLending:
-          description: Available for controlled digital lending.
-          type: boolean
-          default: false
-        download:
-          description: Download access level for a file
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'none'
-          default: 'none'
-        readLocation:
-          description: If access is "location-based", which location should have access.
-          type: string
-          enum:
-            - 'spec'
-            - 'music'
-            - 'ars'
-            - 'art'
-            - 'hoover'
-            - 'm&m'
+      oneOf:
+        # Being first, makes DarkAccess the default.
+        - $ref: '#/components/schemas/DarkAccess'
+        - $ref: '#/components/schemas/ControlledDigitalLendingAccess'
+        - $ref: '#/components/schemas/LocationBasedAccess'
+        - $ref: '#/components/schemas/LocationBasedDownloadAccess'
+        - $ref: '#/components/schemas/StanfordAccess'
+        - $ref: '#/components/schemas/WorldAccess'
     FileAdministrative:
       type: object
       additionalProperties: false
@@ -1166,14 +1218,16 @@ components:
       type: object
       additionalProperties: false
       properties:
-        sourceId:
-          $ref: '#/components/schemas/SourceId'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
         catalogLinks:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
-        barcode:
-          $ref: '#/components/schemas/Barcode'
+        doi:
+          $ref: '#/components/schemas/DOI'
+        sourceId:
+          $ref: '#/components/schemas/SourceId'
     Language:
       description: Languages, scripts, symbolic systems, and notations used in all
         or part of a resource or its descriptive metadata.
@@ -1243,6 +1297,72 @@ components:
         valueLanguage:
           # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
           $ref: "#/components/schemas/DescriptiveValueLanguage"
+    LocationBasedAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - location-based
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - location-based
+            - none
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          enum:
+            - 'spec'
+            - 'music'
+            - 'ars'
+            - 'art'
+            - 'hoover'
+            - 'm&m'
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
+      required:
+        - access
+        - download
+        - readLocation
+    LocationBasedDownloadAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - stanford
+            - world
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - location-based
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          enum:
+            - 'spec'
+            - 'music'
+            - 'ars'
+            - 'art'
+            - 'hoover'
+            - 'm&m'
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
+      required:
+        - access
+        - download
+        - readLocation
     MessageDigest:
       description: The output of the message digest algorithm.
       type: object
@@ -1271,6 +1391,12 @@ components:
         width:
           description: Width in pixels
           type: integer
+    Purl:
+      description: Stanford persistent URL associated with the related resource. Note this is http, not https.
+      type: string
+      format: uri
+      # Canonical URI is http, even though this redirects to https.
+      pattern: '^http:\/\/'
     RelatedResource:
       description: Other resource associated with the described resource.
       type: object
@@ -1332,9 +1458,7 @@ components:
           items:
             $ref: "#/components/schemas/DescriptiveValue"
         purl:
-          description: Stanford persistent URL associated with the related resource.
-          type: string
-          format: uri
+          $ref: "#/components/schemas/Purl"
         access:
           $ref: "#/components/schemas/DescriptiveAccessMetadata"
         relatedResource:
@@ -1387,7 +1511,6 @@ components:
           type: string
           enum:
             - 'http://cocina.sul.stanford.edu/models/admin_policy.jsonld'
-          example: item
         label:
           type: string
         version:
@@ -1414,13 +1537,12 @@ components:
             - 'http://cocina.sul.stanford.edu/models/user-collection.jsonld'
             - 'http://cocina.sul.stanford.edu/models/exhibit.jsonld'
             - 'http://cocina.sul.stanford.edu/models/series.jsonld'
-          example: item
         label:
           type: string
         version:
           type: integer
         access:
-          $ref: '#/components/schemas/Access'
+          $ref: '#/components/schemas/CollectionAccess'
         administrative:
           $ref: '#/components/schemas/Administrative'
         description:
@@ -1456,7 +1578,6 @@ components:
             - 'http://cocina.sul.stanford.edu/models/track.jsonld'
             - 'http://cocina.sul.stanford.edu/models/webarchive-binary.jsonld'
             - 'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'
-          example: item
         label:
           type: string
         version:
@@ -1587,14 +1708,16 @@ components:
       type: object
       additionalProperties: false
       properties:
-        sourceId:
-          $ref: '#/components/schemas/SourceId'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
         catalogLinks:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
-        barcode:
-          $ref: '#/components/schemas/Barcode'
+        doi:
+          $ref: '#/components/schemas/DOI'
+        sourceId:
+          $ref: '#/components/schemas/SourceId'
       required:
         - sourceId
     Sequence:
@@ -1678,7 +1801,7 @@ components:
       description: The standard barcode associated with a DRO object, prefixed with 36105
       type: string
       pattern: '^36105[0-9]{9}$'
-      example: 36105010362304
+      example: '36105010362304'
     Title:
       type: object
       additionalProperties: false
@@ -1700,3 +1823,59 @@ components:
             - type: object
               required:
                 - valueAt
+    StanfordAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - stanford
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - stanford
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          nullable: true
+          enum:
+            - null
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
+      required:
+        - access
+        - download
+    WorldAccess:
+      type: object
+      properties:
+        access:
+          description: Access level.
+          type: string
+          enum:
+            - world
+        download:
+          description: Download access level.
+          type: string
+          enum:
+            - none
+            - stanford
+            - world
+        readLocation:
+          description: If access is "location-based", which location should have access.
+          type: string
+          nullable: true
+          enum:
+            - null
+        controlledDigitalLending:
+          type: boolean
+          default: false
+          enum:
+            - false
+      required:
+        - access
+        - download