cocina-models 0.39.0 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b596e537652f3adbdf99641f88e6cdd90a06a8fd60e4554c41124dcec66984e9
-  data.tar.gz: fe1a342bdd92e4400ace4e1ee9f1fa0a2145186870c5adfc32ac5fb5a77bf366
+  metadata.gz: 358d3bd8de0ea4eb5a53c7d841d874cf30c54234d5289fb7902139e8b2148333
+  data.tar.gz: a39777306a95b77ef53c8204e5771a41fffad213ea1256162bdeafd12ea581ca
 SHA512:
-  metadata.gz: f9b8910c593bcf0295cd290b2c843a93b143c9f6359d1b8d72aa9f62789731ae885bc1a24747228fd9f78adc84c75249b3732114da0b94a9fa74cb77e646acec
-  data.tar.gz: c386a293ffd53005c3afb81248b6ab7c273b3f94b36fd3f93f9db45c35c8c720fd9c478bbefb9ad8f56bf7a9391c7eb7e2092610bd2c63c1615c4bdca45ad215
+  metadata.gz: 7a4fb933796d5e5c9586dbe35e7b29c3a9b3f692925d762b1c9da8be950796fb7107d9675df48c0a5d82dfc0a8f57ba9cb5366e9fbcdcb85177830ab5c653b03
+  data.tar.gz: b15a6ce89a1dd86bf799388eda65a45b5e8a202a8f778d7cdf353aa2b721485794448f755111551d85ebf42fb1cfb011ef91505e64235a1e54490b152941495c

data/.rubocop.yml

@@ -143,3 +143,34 @@ Style/SingleArgumentDig:
 
 Style/StringConcatenation:
   Enabled: true
+
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+Lint/HashCompareByIdentity: # (new in 0.93)
+  Enabled: true
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+Lint/RedundantSafeNavigation: # (new in 0.93)
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+Style/ClassEqualityComparison: # (new in 0.93)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,18 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-06 16:50:50 -0800 using RuboCop version 0.74.0.
+# on 2020-09-08 19:05:09 UTC using RuboCop version 0.89.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-Metrics/AbcSize:
-  Max: 37
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
+Lint/SafeNavigationChain:
+  Exclude:
+    - 'lib/cocina/generator/schema_base.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 8
 
-# Offense count: 3
-# Configuration parameters: Max.
-RSpec/ExampleLength:
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'spec/cocina/models/dro_shared_examples.rb'
-    - 'spec/cocina/models/file_set_shared_examples.rb'
+    - 'lib/cocina/generator/schema_base.rb'

data/README.md

@@ -42,6 +42,19 @@ which pushes the gem to rubygems.org.  Next write up the release notes: https://
 
 Finally, you must release versions of [sdr-client](https://github.com/sul-dlss/sdr-client) and [dor-services-client](https://github.com/sul-dlss/dor-services-client/) pinned to this version because [Argo](https://github.com/sul-dlss/argo) depends on both of those. When [dor-services-app](https://github.com/sul-dlss/dor-services-app) is updated to use the new models (via the auto-update script), the clients must be updated at the same time or there is risk of models produced by dor-services-app not being acceptable to the clients.
 
+### Dependent Services
+
+Once the above listed gems are updated all the following services that use cocina-models should be updated and released at the same time:
+
+* sul-dlss/sdr-api
+* sul-dlss/dor-services-app
+* sul-dlss/google-books
+* 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/generator/schema_base.rb

@@ -54,7 +54,11 @@ module Cocina
         when 'boolean'
           'Strict::Bool'
         else
-          raise "#{schema_doc.type} not supported"
+          if doc.one_of&.map(&:type).all? { |o| %w[integer string].include?(o) }
+            'Nominal::Any'
+          else
+            raise "#{schema_doc.type} not supported"
+          end
         end
       end
 

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_basic_value.rb

@@ -5,8 +5,8 @@ module Cocina
     class DescriptiveBasicValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.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.
@@ -17,12 +17,14 @@ 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)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
     end
   end
 end

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

@@ -5,8 +5,8 @@ module Cocina
     class DescriptiveValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.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.
@@ -17,12 +17,14 @@ 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)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/descriptive_value_language.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveValueLanguage < Struct
+      # Code representing the standard or encoding.
+      attribute :code, Types::Strict::String.meta(omittable: true)
+      # URI for the standard or encoding.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      # 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
+  end
+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,28 +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 value of the descriptive element.
-      attribute :value, Types::Strict::String.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 :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 contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
+      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/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,13 @@ 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)
+      # 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,11 +2,11 @@
 
 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 value of the descriptive element.
-      attribute :value, Types::Strict::String.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.
@@ -17,12 +17,14 @@ 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)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.39.0'
+    VERSION = '0.42.1'
   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
@@ -270,6 +261,7 @@ components:
           description: Status of the contributor relative to other parallel contributors
             (e.g. the primary author among a group of contributors).
           type: string
+          # type: integer (uncomment when issue #154 resolved)
         role:
           description: Relationships of the contributor to the resource or to an event
             in its history.
@@ -295,7 +287,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 +301,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.
@@ -433,7 +430,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
@@ -441,6 +441,7 @@ components:
               description: Status of the descriptive element value relative to other instances
                 of the element.
               type: string
+              # type: integer (uncomment when issue #154 is resolved)
             code:
               description: Code value of the descriptive element.
               type: string
@@ -454,6 +455,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:
@@ -467,6 +473,22 @@ components:
               type: array
               items:
                 $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
@@ -492,7 +514,19 @@ components:
       allOf:
         - $ref: "#/components/schemas/DescriptiveBasicValue"
         - $ref: "#/components/schemas/AppliesTo"
-    DescriptiveValueRequired:
+    DescriptiveValueLanguage:
+      description: Language of the descriptive element value
+      type: object
+      additionalProperties: false
+      allOf:
+        - $ref: "#/components/schemas/Standard"
+        - type: object
+          properties:
+            valueScript:
+              $ref: '#/components/schemas/Standard'
+              # description: An alphabet or other notation used to represent a
+              #   language or other symbolic system of the descriptive element value.
+    Title:
       type: object
       additionalProperties: false
       allOf:
@@ -504,6 +538,9 @@ components:
             - type: object
               required:
                 - structuredValue
+            - type: object
+              required:
+                - parallelValue
     DRO:
       description: Domain-defined abstraction of a 'work'. Digital Repository Objects' abstraction is describable for our domain’s purposes, i.e. for management needs within our system.
       type: object
@@ -674,6 +711,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
@@ -689,6 +729,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
@@ -851,20 +896,66 @@ components:
             $ref: '#/components/schemas/CatalogLink'
     Language:
       description: Languages, scripts, symbolic systems, and notations used in all
-        or part of a resource.
+        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)
+            (e.g. the primary author among a group of contributors).
+          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
@@ -901,6 +992,13 @@ 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
+          # type: integer (uncomment when issue #154 resolved)
+        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
@@ -919,7 +1017,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"
@@ -939,6 +1037,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
@@ -950,6 +1051,9 @@ components:
           format: uri
         access:
           $ref: "#/components/schemas/DescriptiveAccessMetadata"
+        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
@@ -1217,9 +1321,23 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        version:
+          description: The version of the value source.
+          type: string
+    SourceId:
+      type: string
+      pattern: '^.+:.+$'
+      description: >
+        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'
     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:
@@ -1238,16 +1356,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"
-    SourceId:
-      type: string
-      pattern: '^.+:.+$'
-      description: >
-        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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -267,10 +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_required.rb
+- lib/cocina/models/descriptive_value_language.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
@@ -301,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
@@ -323,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Data models for the SDR