cocina-models 0.54.0.beta.2 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3647bdfe1efdf9e51abdd4136d455eac3962cbd38a1d29fd32aa037ca9c8481
-  data.tar.gz: c5ddfe3f1eab351ac6eb0fe4b20ecb9b6597397d00600dcd1fdce2ebff4bf86b
+  metadata.gz: 327ee6c2265a055d884305f09a8e6ef984ef97890b133bf01c84ef11c4cb587f
+  data.tar.gz: 727bfd13e69b3aee8f6d4820dc5a212eacb64ee8cb9d5a9d016f7de3d98493fb
 SHA512:
-  metadata.gz: 5b6e644d13d139fcb672b66979d5ba55e8031e06fe691e0beedd3105180f948133f8c37e1d92ed496934fa4947ac4c623c2e6fa3b1474043e9fb7691e125c2d0
-  data.tar.gz: df4b09ffd691bc52f6fda5d90dd0ae99510261cd73c7017fba9aa3f665643efe8699ae0b2e55e5e30281318391079847e2059d5af29471c4dd2b23fa09477aed
+  metadata.gz: 9438bc21b55a4f921314bcd77245bad9d023f40fd58bdae273ff8bc41658eec4aba38a4c670a71e747ab040583f0c16426a0e7dd3383f9d73288ce52c6040f8b
+  data.tar.gz: 80b8dcd260337bc8c210ecec957435bebc0b4dfa9318e4ddd9de1a6cf15525e3202c2c21f1366f7e21372560e5a3ba304abde55930898025031d5fe5ba326149

data/lib/cocina/generator/generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+
 module Cocina
   module Generator
     # Class for generating Cocina models from openapi.

data/lib/cocina/generator/schema.rb

@@ -96,7 +96,7 @@ module Cocina
         doc.properties.map do |key, properties_doc|
           property_class_for(properties_doc).new(properties_doc,
                                                  key: key,
-                                                 required: doc.requires?(properties_doc),
+                                                 required: doc.requires?(key),
                                                  parent: self)
         end
       end

data/lib/cocina/generator/vocab.rb

@@ -33,23 +33,40 @@ module Cocina
 
       attr_reader :schemas
 
-      # rubocop:disable Style/MultilineBlockChain
+      BASE = 'http://cocina.sul.stanford.edu/models/'
+
       def vocabs
-        schemas.values.map do |schema|
-          type_property = schema.properties['type']
-          type_property.nil? ? [] : type_property.enum.to_a
-        end
-               .flatten
-               .uniq
-               .sort
-               .filter { |vocab| vocab.start_with?('http://cocina.sul.stanford.edu/models') }
+        type_properties = schemas.values.map { |schema| schema.properties['type'] }.compact
+        type_properties.map(&:enum).flat_map(&:to_a)
+                       .filter { |vocab| vocab.start_with?(BASE) }
+                       .uniq
+                       .sort
       end
-      # rubocop:enable Style/MultilineBlockChain
 
       def vocab_methods
-        # Note special handling of 3d
-        vocabs.map do |vocab|
-          name = vocab[38, vocab.size - 45].gsub('-', '_').gsub('3d', 'three_dimensional')
+        names = vocabs.each_with_object({}) do |vocab, object|
+          # Note special handling of 3d
+          namespaced = vocab.delete_prefix(BASE).delete_suffix('.jsonld')
+                            .gsub('-', '_').gsub('3d', 'three_dimensional')
+          namespace, name = namespaced.include?('/') ? namespaced.split('/') : [:root, namespaced]
+          object[namespace] ||= {}
+          object[namespace][name] = vocab
+        end
+        draw_namespaced_methods(names)
+      end
+
+      def draw_namespaced_methods(names)
+        names.flat_map do |namespace, methods|
+          [].tap do |items|
+            items << "class #{namespace.capitalize}" unless namespace == :root
+            items << draw_ruby_methods(methods)
+            items << 'end' unless namespace == :root
+          end
+        end.join("\n")
+      end
+
+      def draw_ruby_methods(methods)
+        methods.map do |name, vocab|
           <<~RUBY
             def self.#{name}
               "#{vocab}"

data/lib/cocina/models/access.rb

@@ -5,8 +5,16 @@ module Cocina
     class Access < Struct
       # Access level
       attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      # The human readable copyright statement that applies
+      # example: Copyright World Trade Organization
+      attribute :copyright, Types::Strict::String.meta(omittable: true)
       # If access is "location-based", which location should have access.
       attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
+      # 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).
+      attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
+      # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      attribute :license, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/admin_policy_administrative.rb

@@ -3,14 +3,19 @@
 module Cocina
   module Models
     class AdminPolicyAdministrative < Struct
+      # This is an XML expression of the default access (see defaultAccess)
       attribute :defaultObjectRights, Types::Strict::String.default('<?xml version="1.0" encoding="UTF-8"?><rightsMetadata><access type="discover"><machine><world/></machine></access><access type="read"><machine><world/></machine></access><use><human type="useAndReproduction"/><human type="creativeCommons"/><machine type="creativeCommons" uri=""/><human type="openDataCommons"/><machine type="openDataCommons" uri=""/></use><copyright><human/></copyright></rightsMetadata>').meta(omittable: true)
+      attribute :defaultAccess, AdminPolicyDefaultAccess.optional.meta(omittable: true)
       attribute :registrationWorkflow, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
       # An additional workflow to start for objects managed by this admin policy once the end-accession workflow step is complete
       # example: wasCrawlPreassemblyWF
       attribute :disseminationWorkflow, Types::Strict::String.meta(omittable: true)
       attribute :collectionsForRegistration, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
-      attribute :roles, Types::Strict::Array.of(AccessRole).meta(omittable: true)
+      # example: druid:bc123df4567
       attribute :hasAdminPolicy, Types::Strict::String
+      # example: druid:bc123df4567
+      attribute :referencesAgreement, Types::Strict::String.meta(omittable: true)
+      attribute :roles, Types::Strict::Array.of(AccessRole).meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/admin_policy_default_access.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class AdminPolicyDefaultAccess < Struct
+      attribute :access, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      # Available for controlled digital lending.
+      attribute :controlledDigitalLending, Types::Strict::Bool.meta(omittable: true)
+      # The human readable copyright statement that applies
+      # example: Copyright World Trade Organization
+      attribute :copyright, Types::Strict::String.meta(omittable: true)
+      # 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.
+
+      attribute :download, Types::Strict::String.enum('world', 'stanford', 'location-based', 'none').meta(omittable: true)
+      # 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.
+
+      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
+      # 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).
+      attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
+      # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      attribute :license, Types::Strict::String.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/business_barcode.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    BusinessBarcode = Types::String.constrained(
+      format: /^2050[0-9]{7}$/i
+    )
+  end
+end

data/lib/cocina/models/catkey_barcode.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    CatkeyBarcode = Types::String.constrained(
+      format: /^[0-9]+-[0-9]+$/i
+    )
+  end
+end

data/lib/cocina/models/contributor.rb

@@ -13,6 +13,7 @@ module Cocina
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # URL or other pointer to the location of the contributor information.
       attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :parallelContributor, Types::Strict::Array.of(DescriptiveParallelContributor).meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/descriptive_parallel_contributor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveParallelContributor < Struct
+      attribute :name, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # Entity type of the contributor (person, organization, etc.).
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
+      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :role, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # URL or other pointer to the location of the contributor information.
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/dro_access.rb

@@ -19,6 +19,8 @@ module Cocina
       # 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).
       attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
+      # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      attribute :license, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/file_set.rb

@@ -5,7 +5,22 @@ module Cocina
     class FileSet < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/fileset.jsonld'].freeze
+      TYPES = ['http://cocina.sul.stanford.edu/models/resources/audio.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/document.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/image.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/media.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/object.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/page.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/preview.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/3d.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/video.jsonld'].freeze
 
       # The content type of the Fileset.
       attribute :type, Types::Strict::String.enum(*FileSet::TYPES)

data/lib/cocina/models/identification.rb

@@ -8,6 +8,8 @@ module Cocina
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
       attribute :sourceId, Types::Strict::String.meta(omittable: true)
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+      # A barcode
+      attribute :barcode, Types::Nominal::Any.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/request_file_set.rb

@@ -5,7 +5,22 @@ module Cocina
     class RequestFileSet < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/fileset.jsonld'].freeze
+      TYPES = ['http://cocina.sul.stanford.edu/models/resources/audio.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/document.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/image.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/media.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/object.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/page.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/preview.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/3d.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/video.jsonld'].freeze
 
       attribute :type, Types::Strict::String.enum(*RequestFileSet::TYPES)
       attribute :label, Types::Strict::String

data/lib/cocina/models/request_identification.rb

@@ -8,6 +8,8 @@ module Cocina
       # 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.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/standard_barcode.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    StandardBarcode = Types::String.constrained(
+      format: /^36105[0-9]{9}$/i
+    )
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.54.0.beta.2'
+    VERSION = '0.57.0'
   end
 end

data/lib/cocina/models/vocab.rb

@@ -40,10 +40,6 @@ module Cocina
         'http://cocina.sul.stanford.edu/models/file.jsonld'
       end
 
-      def self.fileset
-        'http://cocina.sul.stanford.edu/models/fileset.jsonld'
-      end
-
       def self.geo
         'http://cocina.sul.stanford.edu/models/geo.jsonld'
       end
@@ -95,6 +91,72 @@ module Cocina
       def self.webarchive_seed
         'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'
       end
+
+      class Resources
+        def self.three_dimensional
+          'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+        end
+
+        def self.attachment
+          'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+        end
+
+        def self.audio
+          'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+        end
+
+        def self.document
+          'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+        end
+
+        def self.file
+          'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+        end
+
+        def self.image
+          'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+        end
+
+        def self.main_augmented
+          'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+        end
+
+        def self.main_original
+          'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+        end
+
+        def self.media
+          'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+        end
+
+        def self.object
+          'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+        end
+
+        def self.page
+          'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+        end
+
+        def self.permissions
+          'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+        end
+
+        def self.preview
+          'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+        end
+
+        def self.supplement
+          'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+        end
+
+        def self.thumb
+          'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+        end
+
+        def self.video
+          'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
+        end
+      end
     end
   end
 end

data/openapi.yml

@@ -108,6 +108,10 @@ components:
             - '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
@@ -118,6 +122,13 @@ components:
             - '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
     AccessRole:
       description: Access role conferred by an AdminPolicy to objects within it. (used by Argo)
       type: object
@@ -214,7 +225,11 @@ components:
       properties:
         defaultObjectRights:
           type: string
+          description: This is an XML expression of the default access (see defaultAccess)
+          deprecated: true
           default: <?xml version="1.0" encoding="UTF-8"?><rightsMetadata><access type="discover"><machine><world/></machine></access><access type="read"><machine><world/></machine></access><use><human type="useAndReproduction"/><human type="creativeCommons"/><machine type="creativeCommons" uri=""/><human type="openDataCommons"/><machine type="openDataCommons" uri=""/></use><copyright><human/></copyright></rightsMetadata>
+        defaultAccess:
+          $ref: '#/components/schemas/AdminPolicyDefaultAccess'
         registrationWorkflow:
           description: When you register an item with this admin policy, these are the workflows that are available.
           type: array
@@ -229,15 +244,70 @@ components:
           type: array
           items:
             type: string
+        hasAdminPolicy:
+          $ref: '#/components/schemas/Druid'
+        referencesAgreement:
+          $ref: '#/components/schemas/Druid'
         roles:
           description: The access roles conferred by this AdminPolicy (used by Argo)
           type: array
           items:
             $ref: '#/components/schemas/AccessRole'
-        hasAdminPolicy:
-          type: string
       required:
         - hasAdminPolicy
+    AdminPolicyDefaultAccess:
+      description: 'Provides the default access settings for an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.'
+      type: object
+      additionalProperties: false
+      properties:
+        access:
+          type: string
+          enum:
+            - 'world'
+            - 'stanford'
+            - 'location-based'
+            - 'citation-only'
+            - 'dark'
+        controlledDigitalLending:
+          description: Available for controlled digital lending.
+          type: boolean
+        copyright:
+          description: The human readable copyright statement that applies
+          example: Copyright World Trade Organization
+          type: string
+        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'
+        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 Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+          type: string
     AppliesTo:
       description: Property model for indicating the parts, aspects, or versions of the resource to which a
         descriptive element is applicable.
@@ -248,6 +318,17 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveBasicValue"
+    Barcode:
+      description: 'A barcode'
+      oneOf:
+        - $ref: '#/components/schemas/BusinessBarcode'
+        - $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
     CatalogLink:
       type: object
       additionalProperties: false
@@ -263,6 +344,11 @@ components:
           description: Record identifier that is unique within the context of the linked record's catalog.
           type: string
           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
     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
@@ -347,6 +433,11 @@ components:
         valueAt:
           description: URL or other pointer to the location of the contributor information.
           type: string
+        parallelContributor:
+          description: For multiple representations of information about the same contributor (e.g. in different languages).
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveParallelContributor"
     Description:
       type: object
       additionalProperties: false
@@ -581,6 +672,43 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+    DescriptiveParallelContributor:
+      description: Value model for multiple representations of information about the same contributor (e.g. in different languages).
+      type: object
+      additionalProperties: false
+      properties:
+        name:
+          description: Names associated with a contributor.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        type:
+          description: Entity type of the contributor (person, organization, etc.).
+          type: string
+        status:
+          description: Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
+          type: string
+        role:
+          description: Relationships of the contributor to the resource or to an event in its history.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        identifier:
+          description: Identifiers and URIs associated with the contributor entity.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        note:
+          description: Other information associated with the contributor.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        valueAt:
+          description: URL or other pointer to the location of the contributor information.
+          type: string
+        valueLanguage:
+          # description: Language of the descriptive element value
+          $ref: "#/components/schemas/DescriptiveValueLanguage"
     DescriptiveParallelEvent:
       description: Value model for multiple representations of information about the same event (e.g. in different languages).
       type: object
@@ -767,6 +895,9 @@ 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
+        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
     DROStructural:
       description: Structural metadata
       type: object
@@ -981,7 +1112,22 @@ components:
           description: The content type of the Fileset.
           type: string
           enum:
-            - 'http://cocina.sul.stanford.edu/models/fileset.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
         externalIdentifier:
           type: string
         label:
@@ -1026,6 +1172,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
     Language:
       description: Languages, scripts, symbolic systems, and notations used in all
         or part of a resource or its descriptive metadata.
@@ -1398,7 +1546,22 @@ components:
         type:
           type: string
           enum:
-            - 'http://cocina.sul.stanford.edu/models/fileset.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
         label:
           type: string
         version:
@@ -1430,6 +1593,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
       required:
         - sourceId
     Sequence:
@@ -1509,6 +1674,11 @@ components:
           type: string
         source:
           $ref: "#/components/schemas/Source"
+    StandardBarcode:
+      description: The standard barcode associated with a DRO object, prefixed with 36105
+      type: string
+      pattern: '^36105[0-9]{9}$'
+      example: 36105010362304
     Title:
       type: object
       additionalProperties: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.54.0.beta.2
+  version: 0.57.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -258,9 +258,12 @@ files:
 - lib/cocina/models/access_role_member.rb
 - lib/cocina/models/admin_policy.rb
 - lib/cocina/models/admin_policy_administrative.rb
+- lib/cocina/models/admin_policy_default_access.rb
 - lib/cocina/models/administrative.rb
 - lib/cocina/models/applies_to.rb
+- lib/cocina/models/business_barcode.rb
 - lib/cocina/models/catalog_link.rb
+- lib/cocina/models/catkey_barcode.rb
 - lib/cocina/models/checkable.rb
 - lib/cocina/models/collection.rb
 - lib/cocina/models/collection_identification.rb
@@ -271,6 +274,7 @@ files:
 - lib/cocina/models/descriptive_basic_value.rb
 - lib/cocina/models/descriptive_geographic_metadata.rb
 - lib/cocina/models/descriptive_grouped_value.rb
+- lib/cocina/models/descriptive_parallel_contributor.rb
 - lib/cocina/models/descriptive_parallel_event.rb
 - lib/cocina/models/descriptive_parallel_value.rb
 - lib/cocina/models/descriptive_structured_value.rb
@@ -306,6 +310,7 @@ files:
 - lib/cocina/models/source.rb
 - lib/cocina/models/source_id.rb
 - lib/cocina/models/standard.rb
+- lib/cocina/models/standard_barcode.rb
 - lib/cocina/models/title.rb
 - lib/cocina/models/validator.rb
 - lib/cocina/models/version.rb
@@ -325,11 +330,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: Data models for the SDR