cocina-models 0.54.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aef820c19c5713ea051cebe2b29f458413bda243c7906f4e75e29f655c21119
-  data.tar.gz: 43a183c9e4b8e7a993e5ed04b1379d3ffa40b0831a2a471cc63a048698799a26
+  metadata.gz: 11f8ca2b0924a901afd8988d67184b44b91ad061ca2cdf7965042b8c1282f2e2
+  data.tar.gz: 82423f38ede08c6f0046a08abaaa87a1c4ddad1926c8dc56050788cb7a75ad55
 SHA512:
-  metadata.gz: 1fb48a8bc9573cb59fb8c9c36246aad1ddaa2afc4dc122c793b97c5d4fe5ee364f1a75c65b43ac5845f1ee4ce633a2739d17bd2d3e7ac15dfd88642c4911272c
-  data.tar.gz: b5e4db39b12e7e300d2a45b8be2a06a2683cedaf9ea98aafe7716e36552a1432650c9f1c71438d07dc123f993290909eb3dbb71597cfda78005a91c064b09247
+  metadata.gz: 982da9783c7e8c86a32c68d7946f1dfa695ab6ce9b5a2bf84d1ade358d7f0855072553ef4fe6fda35c685d39cc464402258572547ce5d06258c1f53fe9c780de
+  data.tar.gz: 269a9c9e3460d46edf2aaa085535ec626195666adad478173e1ab0e86643a0be7539c5bfdf9db47db6e5ab4a65042bd39c7a938c0f0b6d0d21b6596df64a3d43

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

@@ -21,12 +21,22 @@ module Cocina
         key || schema_doc.name
       end
 
+      # Allows non-required values to not be provided. This allows smaller
+      # requests as not every field needs to be present.
       def omittable
         return '' if required
 
         '.meta(omittable: true)'
       end
 
+      # Allows non-required values to be set to nil. This is useful when doing
+      # an update and you want to clear out a value.
+      def optional
+        return '' if required
+
+        '.optional'
+      end
+
       def quote(item)
         return item unless schema_doc.type == 'string'
 

data/lib/cocina/generator/schema_value.rb

@@ -6,7 +6,8 @@ module Cocina
     class SchemaValue < SchemaBase
       # rubocop:disable Layout/LineLength
       def generate
-        "#{description}#{example}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype(schema_doc)}#{default}#{enum}#{omittable}"
+        # optional has to come before default or the default value that gets set will be nil.
+        "#{description}#{example}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}#{omittable}"
       end
       # rubocop:enable Layout/LineLength
 

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

@@ -4,9 +4,17 @@ module Cocina
   module Models
     class Access < Struct
       # Access level
-      attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      attribute :access, Types::Strict::String.optional.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)
+      attribute :readLocation, Types::Strict::String.optional.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.optional.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.optional.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
-      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)
+      # 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>').optional.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 :disseminationWorkflow, Types::Strict::String.optional.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.optional.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').optional.meta(omittable: true)
+      # Available for controlled digital lending.
+      attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
+      # The human readable copyright statement that applies
+      # example: Copyright World Trade Organization
+      attribute :copyright, Types::Strict::String.optional.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').optional.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').optional.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.optional.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.optional.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/administrative.rb

@@ -8,7 +8,7 @@ module Cocina
       attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).meta(omittable: true)
       # Administrative or Internal project this resource is a part of
       # example: Google Books
-      attribute :partOfProject, Types::Strict::String.meta(omittable: true)
+      attribute :partOfProject, Types::Strict::String.optional.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/collection_identification.rb

@@ -6,7 +6,7 @@ module Cocina
       # 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.meta(omittable: true)
+      attribute :sourceId, Types::Strict::String.optional.meta(omittable: true)
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
     end
   end

data/lib/cocina/models/contributor.rb

@@ -5,14 +5,15 @@ module Cocina
     class Contributor < 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)
+      attribute :type, Types::Strict::String.optional.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 :status, Types::Strict::String.optional.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 :valueAt, Types::Strict::String.optional.meta(omittable: true)
+      attribute :parallelContributor, Types::Strict::Array.of(DescriptiveParallelContributor).meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/description.rb

@@ -13,13 +13,13 @@ module Cocina
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :subject, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # Stanford persistent URL associated with the resource.
-      attribute :purl, Types::Strict::String.meta(omittable: true)
+      attribute :purl, Types::Strict::String.optional.meta(omittable: true)
       attribute :access, DescriptiveAccessMetadata.optional.meta(omittable: true)
       attribute :relatedResource, Types::Strict::Array.of(RelatedResource).meta(omittable: true)
       attribute :marcEncodedData, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
       # URL or other pointer to the location of the resource description.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
         Validator.validate(self, attributes.with_indifferent_access) if validate && name

data/lib/cocina/models/descriptive_basic_value.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.meta(omittable: true)
+      attribute :value, Types::Nominal::Any.optional.meta(omittable: true)
       # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :status, Types::Strict::String.optional.meta(omittable: true)
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.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.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute :qualifier, Types::Strict::String.optional.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.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.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.optional.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.optional.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.optional.meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_parallel_event.rb

@@ -5,9 +5,9 @@ module Cocina
     class DescriptiveParallelEvent < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # Description of the event (creation, publication, etc.).
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # The preferred display label to use for the event in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       attribute :date, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
       attribute :location, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)

data/lib/cocina/models/descriptive_value.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.meta(omittable: true)
+      attribute :value, Types::Nominal::Any.optional.meta(omittable: true)
       # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :status, Types::Strict::String.optional.meta(omittable: true)
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.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.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute :qualifier, Types::Strict::String.optional.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.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/descriptive_value_language.rb

@@ -4,14 +4,14 @@ module Cocina
   module Models
     class DescriptiveValueLanguage < Struct
       # Code representing the standard or encoding.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI for the standard or encoding.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
       # String describing the standard or encoding.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute :value, Types::Strict::String.optional.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.meta(omittable: true)
+      attribute :version, Types::Strict::String.optional.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
       attribute :valueScript, Standard.optional.meta(omittable: true)
     end

data/lib/cocina/models/dro_access.rb

@@ -3,22 +3,24 @@
 module Cocina
   module Models
     class DROAccess < Struct
-      attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').optional.meta(omittable: true)
       # Available for controlled digital lending.
-      attribute :controlledDigitalLending, Types::Strict::Bool.meta(omittable: true)
+      attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute :copyright, Types::Strict::String.meta(omittable: true)
+      attribute :copyright, Types::Strict::String.optional.meta(omittable: true)
       attribute :embargo, Embargo.optional.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.default('none').enum('world', 'stanford', 'location-based', 'none').meta(omittable: true)
+      attribute :download, Types::Strict::String.default('none').enum('world', 'stanford', 'location-based', 'none').optional.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)
+      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').optional.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)
+      attribute :useAndReproductionStatement, Types::Strict::String.optional.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.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/dro_structural.rb

@@ -7,7 +7,7 @@ module Cocina
       attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
       attribute :isMemberOf, Types::Strict::Array.of(Druid).meta(omittable: true)
       # Agreement that covers the deposit of the DRO into SDR.
-      attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
+      attribute :hasAgreement, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/embargo.rb

@@ -10,7 +10,7 @@ module Cocina
       attribute :access, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark')
       # The human readable use and reproduction statement that applies when the embargo expires.
       # example: These materials are in the public domain.
-      attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
+      attribute :useAndReproductionStatement, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end