cocina-models 0.40.1 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a41a02c7e3c3d58b65f4b94e4afdbc885795920eee91fa83f87374a207c0c1
-  data.tar.gz: 3c70761dd272739012387d78df18c69d114ab5a152d79283131f8d727112dcb9
+  metadata.gz: b11ea0c5efe76fc9a4a59bc70e4c60e7c25c8a97491259687ae63899c45f5e2e
+  data.tar.gz: 2edc2ee62490fbf0c0cf29942cc1820d7bdfbd28e0cddb39db8df1753e6e64b0
 SHA512:
-  metadata.gz: e7f56d6aa41f0d13d2dcf17a2aef82354b566025caf04ffff84b2857fabfcc8c703c16f3aae00cf43c4654922f7b9240ededef6366ed9b111b2b4690f5a11fd2
-  data.tar.gz: b452f06a8f0525035a0699e74345b8bd1fb7f96d5b3f9cfbd996f1f65bd99b82d7ffbd9fa71cd2a5c32e60ef8731df159833b2bae98070ddf9f40803316b3caf
+  metadata.gz: 822ff54e876a9c4384dc9f7530a2ab9bd11b86e21cf4e7d426f5975dbf98ac8f387968a45e0ea1afae57a2d5a72283b8af71a8ab0776e45c81f24f9fa26c4160
+  data.tar.gz: c88924f5de3c54a11c026864df8713eabf89693f51a3cd789c6e92d6a15618a0ba7ee725d0c742de9480de2f7fee8ece3a5c8b7ffac2e08fe381a53654ced9b0

data/.github/pull_request_template.md

@@ -1,3 +1,5 @@
+**NOTE:  Changes to openapi.yml require updating openapi.yml for sdr-api and dor-services-app and generating models - see README.**
+
 ## Why was this change made?
 
 
@@ -7,6 +9,3 @@
 
 
 ## Which documentation and/or configurations were updated?
-
-
-

data/.rubocop.yml

@@ -7,139 +7,148 @@ require:
 AllCops:
   TargetRubyVersion: 2.5
 
+# ----- Layout ------
+
 Layout/LineLength:
   Max: 114
   Exclude:
     - lib/cocina/models/*
 
-Metrics/BlockLength:
-  Exclude:
-    - cocina-models.gemspec
-    - spec/cocina/**/*
-
-Metrics/MethodLength:
-  Max: 14
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Max: 18
-  Exclude:
-    - spec/cocina/models/description_spec.rb
-    - spec/cocina/models/dro_shared_examples.rb
-
-Style/Documentation:
-  Exclude:
-    - lib/cocina/models/*
-
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
-
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
+# ----- Lint ------
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
+Lint/DuplicateElsifCondition:
   Enabled: true
-
-Lint/RaiseException:
+Lint/DuplicateRequire: # (new in 0.90)
   Enabled: true
-
-Lint/StructNewOverride:
+Lint/DuplicateRescueException:
   Enabled: true
-
-Style/AccessorGrouping:
+Lint/EmptyConditionalBody:
   Enabled: true
-
-Style/BisectedAttrAccessor:
+Lint/EmptyFile: # (new in 0.90)
   Enabled: true
-
-Style/ExponentialNotation:
+Lint/FloatComparison:
   Enabled: true
-
-Style/HashEachMethods:
+Lint/HashCompareByIdentity: # (new in 0.93)
   Enabled: true
-
-Style/HashTransformKeys:
+Lint/IdentityComparison: # (new in 0.91)
   Enabled: true
-
-Style/HashTransformValues:
+Lint/MissingSuper:
   Enabled: true
-
-Style/RedundantAssignment:
+Lint/MixedRegexpCaptureTypes:
   Enabled: true
-
-Style/RedundantFetchBlock:
+Lint/OutOfRangeRegexpRef:
   Enabled: true
-
-Style/RedundantRegexpCharacterClass:
+Lint/RaiseException:
   Enabled: true
-
-Style/RedundantRegexpEscape:
+Lint/RedundantSafeNavigation: # (new in 0.93)
   Enabled: true
-
-Style/SlicingWithRange:
+Lint/SelfAssignment:
   Enabled: true
-
-Lint/BinaryOperatorWithIdenticalOperands:
+Lint/StructNewOverride:
   Enabled: true
-
-Lint/DuplicateElsifCondition:
+Lint/TopLevelReturnWithArgument:
   Enabled: true
-
-Lint/DuplicateRescueException:
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
   Enabled: true
-
-Lint/EmptyConditionalBody:
+Lint/UnreachableLoop:
   Enabled: true
-
-Lint/FloatComparison:
+Lint/UselessMethodDefinition: # (new in 0.90)
   Enabled: true
-
-Lint/MissingSuper:
+Lint/UselessTimes: # (new in 0.91)
   Enabled: true
 
-Lint/OutOfRangeRegexpRef:
-  Enabled: true
+# ----- Metrics ------
 
-Lint/SelfAssignment:
-  Enabled: true
+Metrics/BlockLength:
+  Exclude:
+    - cocina-models.gemspec
+    - spec/cocina/**/*
 
-Lint/TopLevelReturnWithArgument:
-  Enabled: true
+Metrics/MethodLength:
+  Max: 14
 
-Lint/UnreachableLoop:
+# ----- RSpec ------
+
+RSpec/ExampleLength:
+  Max: 18
+  Exclude:
+    - spec/cocina/models/description_spec.rb
+    - spec/cocina/models/dro_shared_examples.rb
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/StubbedMock: # (new in 1.44)
   Enabled: true
 
+# ----- Style ------
+
+Style/Documentation:
+  Exclude:
+    - lib/cocina/models/*
+
+Style/AccessorGrouping:
+  Enabled: true
 Style/ArrayCoercion:
   Enabled: true
-
+Style/BisectedAttrAccessor:
+  Enabled: true
 Style/CaseLikeIf:
   Enabled: true
-
+Style/ClassEqualityComparison: # (new in 0.93)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
 Style/ExplicitBlockArgument:
   Enabled: true
-
+Style/ExponentialNotation:
+  Enabled: true
 Style/GlobalStdStream:
   Enabled: true
-
 Style/HashAsLastArrayItem:
   Enabled: true
-
+Style/HashEachMethods:
+  Enabled: true
 Style/HashLikeCase:
   Enabled: true
-
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
 Style/OptionalBooleanParameter:
   Enabled: false
-
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
 Style/RedundantFileExtensionInRequire:
   Enabled: true
-
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
 Style/SingleArgumentDig:
   Enabled: true
-
+Style/SlicingWithRange:
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
 Style/StringConcatenation:
   Enabled: true

data/README.md

@@ -52,6 +52,9 @@ Once the above listed gems are updated all the following services that use cocin
 * sul-dlss/common-accessioning
 * sul-dlss/argo
 * sul-dlss/pre-assembly
+* sul-dlss/hydrus
+* sul-dlss/happy-heron
+* sul-dlss/infrastructure-integration-test
 
 ## Using this gem
 

data/lib/cocina/generator/generator.rb

@@ -45,7 +45,7 @@ module Cocina
         FileUtils.rm_f(filepath)
 
         create_file filepath, vocab.generate
-        run("rubocop -a #{filepath}")
+        run("rubocop -a #{filepath} > /dev/null")
       end
 
       private
@@ -71,7 +71,7 @@ module Cocina
         FileUtils.rm_f(filepath)
 
         create_file filepath, schema.generate
-        run("rubocop -a #{filepath}")
+        run("rubocop -a #{filepath} > /dev/null")
       end
 
       def clean_output

data/lib/cocina/models/access.rb

@@ -5,8 +5,6 @@ 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)
-      # Download access level for a file
-      attribute :download, Types::Strict::String.default('none').enum('world', 'stanford', 'location-based', 'none').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)
     end

data/lib/cocina/models/description.rb

@@ -3,10 +3,11 @@
 module Cocina
   module Models
     class Description < Struct
-      attribute :title, Types::Strict::Array.of(DescriptiveValueRequired).default([].freeze)
+      attribute :title, Types::Strict::Array.of(Title).default([].freeze)
       attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
       attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
       attribute :form, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :geographic, Types::Strict::Array.of(DescriptiveGeographicMetadata).meta(omittable: true)
       attribute :language, Types::Strict::Array.of(Language).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)

data/lib/cocina/models/descriptive_access_metadata.rb

@@ -5,6 +5,7 @@ module Cocina
     class DescriptiveAccessMetadata < Struct
       attribute :url, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :physicalLocation, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :digitalLocation, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :accessContact, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :digitalRepository, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)

data/lib/cocina/models/descriptive_basic_value.rb

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

data/lib/cocina/models/descriptive_geographic_metadata.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveGeographicMetadata < Struct
+      attribute :form, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :subject, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_value.rb

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

data/lib/cocina/models/descriptive_value_language.rb

@@ -10,6 +10,8 @@ module Cocina
       # String describing the standard or encoding.
       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.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
       attribute :valueScript, Standard.optional.meta(omittable: true)
     end

data/lib/cocina/models/event.rb

@@ -6,9 +6,12 @@ module Cocina
       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)
+      # The preferred display label to use for the event in access systems.
+      attribute :displayLabel, Types::Strict::String.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)
+      attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/language.rb

@@ -3,29 +3,27 @@
 module Cocina
   module Models
     class Language < Struct
-      attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String or integer value of the descriptive element.
-      attribute :value, Types::Nominal::Any.meta(omittable: true)
-      # Type of value provided by the descriptive element.
-      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.meta(omittable: true)
+      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
       # Code value of the descriptive element.
       attribute :code, Types::Strict::String.meta(omittable: true)
-      # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
-      attribute :standard, Standard.optional.meta(omittable: true)
-      attribute :encoding, Standard.optional.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)
-      # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute :encoding, Standard.optional.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+      attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # present for mapping to additional schemas in the future and for consistency but not otherwise used
+      attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :script, DescriptiveValue.optional.meta(omittable: true)
+      attribute :source, Source.optional.meta(omittable: true)
+      # Status of the language relative to other parallel language elements (e.g. the primary language)
+      attribute :status, Types::Strict::String.enum('primary').meta(omittable: true)
+      attribute :standard, Standard.optional.meta(omittable: true)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # URI value of the descriptive element.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      # Value of the descriptive element.
+      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/message_digest.rb

@@ -10,7 +10,7 @@ module Cocina
 
       # The algorithm that was used
       attribute :type, Types::Strict::String.enum(*MessageDigest::TYPES)
-      # The digest value Base64 encoded
+      # The digest value hexidecimal encoded
       attribute :digest, Types::Strict::String
     end
   end

data/lib/cocina/models/related_resource.rb

@@ -5,6 +5,10 @@ module Cocina
     class RelatedResource < Struct
       # The relationship of the related resource to the described resource.
       attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the related resource relative to other related resources.
+      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.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)
@@ -12,10 +16,15 @@ module Cocina
       attribute :language, Types::Strict::Array.of(Language).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       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.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.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/source.rb

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

data/lib/cocina/models/standard.rb

@@ -10,6 +10,8 @@ module Cocina
       # String describing the standard or encoding.
       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.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/{descriptive_value_required.rb → title.rb}

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    class DescriptiveValueRequired < Struct
+    class Title < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # String or integer value of the descriptive element.
@@ -17,6 +17,7 @@ module Cocina
       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.meta(omittable: true)

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.40.1'
+    VERSION = '0.44.0'
   end
 end

data/openapi.yml

@@ -108,15 +108,6 @@ components:
             - 'citation-only'
             - 'dark'
           default: 'dark'
-        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
@@ -295,7 +286,7 @@ components:
           type: array
           minItems: 1
           items:
-            $ref: "#/components/schemas/DescriptiveValueRequired"
+            $ref: "#/components/schemas/Title"
         contributor:
           description: Agents contributing in some way to the creation and history of the
             resource.
@@ -309,10 +300,15 @@ components:
             $ref: "#/components/schemas/Event"
         form:
           description: Characteristics of the resource's physical, digital, and intellectual
-            form and genre.
+            form and genre, and of its process of creation.
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        geographic:
+          description: Geographic description for items with coordinates or bounding boxes.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveGeographicMetadata"
         language:
           description: Languages, scripts, symbolic systems, and notations used in all or
             part of a resource.
@@ -369,6 +365,11 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        digitalLocation:
+          description: Location of a digital version of the resource, such as a file path for a born digital resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
         accessContact:
           description: The library, organization, or person responsible for access to the resource.
           type: array
@@ -433,7 +434,10 @@ components:
               description: String or integer value of the descriptive element.
               oneOf:
               - type: string
-              - type: integer
+              # Title note (nonsorting character count) was supposed to be able to accept an integer value,
+              # but this triggered a bug in committee:
+              # https://github.com/interagent/committee/issues/286
+              # - type: integer
             type:
               description: Type of value provided by the descriptive element.
               type: string
@@ -454,6 +458,11 @@ components:
             encoding:
               # description: Encoding schema, standard, or syntax to which the value conforms.
               $ref: "#/components/schemas/Standard"
+            identifier:
+              description: Identifiers and URIs associated with the descriptive element.
+              type: array
+              items:
+                  $ref: "#/components/schemas/DescriptiveValue"
             source:
               $ref: "#/components/schemas/Source"
             displayLabel:
@@ -469,6 +478,20 @@ components:
                 $ref: "#/components/schemas/DescriptiveValue"
             valueLanguage:
               $ref: "#/components/schemas/DescriptiveValueLanguage"
+    DescriptiveGeographicMetadata:
+      description: Value model for mods geographic extension metadata
+      type: object
+      additionalProperties: false
+      properties:
+        form:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        subject:
+          description: Terms associated with the intellectual content of the related resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
     DescriptiveParallelValue:
       description: Value model for multiple representations of the same information (e.g. in different languages).
       type: object
@@ -506,7 +529,7 @@ 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.
-    DescriptiveValueRequired:
+    Title:
       type: object
       additionalProperties: false
       allOf:
@@ -691,6 +714,9 @@ components:
             type:
               description: Description of the event (creation, publication, etc.).
               type: string
+            displayLabel:
+              description: The preferred display label to use for the event in access systems.
+              type: string
             date:
               description: Dates associated with the event.
               type: array
@@ -706,6 +732,11 @@ components:
               type: array
               items:
                 $ref: "#/components/schemas/DescriptiveValue"
+            identifier:
+              description: Identifiers and URIs associated with the event.
+              type: array
+              items:
+                $ref: "#/components/schemas/DescriptiveValue"
             note:
               description: Other information about the event.
               type: array
@@ -871,17 +902,62 @@ components:
         or part of a resource or its descriptive metadata.
       type: object
       additionalProperties: false
-      allOf:
-        - $ref: '#/components/schemas/DescriptiveValue'
-        - type: object
-          # additionalProperties breaks the validator, presumably because it can't
-          # conform to other schemas (allOf) and not have additionalProperties
-          # additionalProperties: false
-          properties:
-            script:
-              $ref: '#/components/schemas/DescriptiveValue'
-              # description: An alphabet or other notation used to represent a
-              #   language or other symbolic system associated with the resource.
+      properties:
+        appliesTo:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveBasicValue"
+        code:
+          description: Code value of the descriptive element.
+          type: string
+        displayLabel:
+          description: The preferred display label to use for the descriptive element in access systems.
+          type: string
+        encoding:
+          # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          $ref: "#/components/schemas/Standard"
+        note:
+          description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        parallelValue:
+          description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        qualifier:
+          type: string
+          description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+        script:
+          $ref: '#/components/schemas/DescriptiveValue'
+          # description: An alphabet or other notation used to represent a
+          #   language or other symbolic system associated with the resource.
+        source:
+          $ref: "#/components/schemas/Source"
+        status:
+          description: Status of the language relative to other parallel language elements (e.g. the primary language)
+          type: string
+          enum:
+            - primary
+        standard:
+          # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          $ref: "#/components/schemas/Standard"
+        structuredValue:
+          description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        uri:
+          description: URI value of the descriptive element.
+          type: string
+          format: uri
+        value:
+          description: Value of the descriptive element.
+          type: string
+        valueLanguage:
+          # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          $ref: "#/components/schemas/DescriptiveValueLanguage"
     MessageDigest:
       description: The output of the message digest algorithm.
       type: object
@@ -894,7 +970,7 @@ components:
             - md5
             - sha1
         digest:
-          description: The digest value Base64 encoded
+          description: The digest value hexidecimal encoded
           type: string
       required:
         - type
@@ -918,6 +994,12 @@ components:
         type:
           description: The relationship of the related resource to the described resource.
           type: string
+        status:
+          description: Status of the related resource relative to other related resources.
+          type: string
+        displayLabel:
+          description: The preferred display label to use for the related resource in access systems.
+          type: string
         title:
           description: Titles of the related resource.
           type: array
@@ -936,7 +1018,7 @@ components:
             $ref: "#/components/schemas/Event"
         form:
           description: Characteristics of the related resource's physical, digital, and intellectual
-            form and genre.
+            form and genre, and of its process of creation.
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
@@ -956,6 +1038,9 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        standard:
+          # description: Descriptive or content standards to which the value conforms.
+          $ref: "#/components/schemas/Standard"
         subject:
           description: Terms associated with the intellectual content of the related resource.
           type: array
@@ -967,6 +1052,16 @@ components:
           format: uri
         access:
           $ref: "#/components/schemas/DescriptiveAccessMetadata"
+        relatedResource:
+          description: Other resources associated with the related resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/RelatedResource"
+        adminMetadata:
+          $ref: "#/components/schemas/DescriptiveAdminMetadata"
+        version:
+          description: The version of the related resource.
+          type: string
     ReleaseTag:
       description: A tag that indicates the item or collection should be released.
       type: object
@@ -1234,6 +1329,9 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        version:
+          description: The version of the value source.
+          type: string
     SourceId:
       type: string
       pattern: '^.+:.+$'
@@ -1247,7 +1345,7 @@ components:
       example: 'sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026'
     Standard:
       description: Property model for indicating the encoding, standard, or syntax
-        to which a value conforms.
+        to which a value conforms (e.g. RDA).
       type: object
       additionalProperties: false
       properties:
@@ -1266,5 +1364,8 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        version:
+          description: The version of the standard or encoding.
+          type: string
         source:
           $ref: "#/components/schemas/Source"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.40.1
+  version: 0.44.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -267,11 +267,11 @@ files:
 - lib/cocina/models/descriptive_access_metadata.rb
 - lib/cocina/models/descriptive_admin_metadata.rb
 - lib/cocina/models/descriptive_basic_value.rb
+- lib/cocina/models/descriptive_geographic_metadata.rb
 - lib/cocina/models/descriptive_parallel_value.rb
 - lib/cocina/models/descriptive_structured_value.rb
 - lib/cocina/models/descriptive_value.rb
 - lib/cocina/models/descriptive_value_language.rb
-- lib/cocina/models/descriptive_value_required.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
@@ -302,6 +302,7 @@ files:
 - lib/cocina/models/source.rb
 - lib/cocina/models/source_id.rb
 - lib/cocina/models/standard.rb
+- lib/cocina/models/title.rb
 - lib/cocina/models/validator.rb
 - lib/cocina/models/version.rb
 - lib/cocina/models/vocab.rb