cocina-models 0.44.0 → 0.47.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b11ea0c5efe76fc9a4a59bc70e4c60e7c25c8a97491259687ae63899c45f5e2e
-  data.tar.gz: 2edc2ee62490fbf0c0cf29942cc1820d7bdfbd28e0cddb39db8df1753e6e64b0
+  metadata.gz: cf7d1d0d676c42b4331df2079f9b8cdede0bc8b92c85478700dadc15ba972d92
+  data.tar.gz: df0756d9ab7cc3dd3b999c0427a18859df2470476069a347468a4805bf8f88b8
 SHA512:
-  metadata.gz: 822ff54e876a9c4384dc9f7530a2ab9bd11b86e21cf4e7d426f5975dbf98ac8f387968a45e0ea1afae57a2d5a72283b8af71a8ab0776e45c81f24f9fa26c4160
-  data.tar.gz: c88924f5de3c54a11c026864df8713eabf89693f51a3cd789c6e92d6a15618a0ba7ee725d0c742de9480de2f7fee8ece3a5c8b7ffac2e08fe381a53654ced9b0
+  metadata.gz: ebd2278320311858eed8ee824f64336f2bade54bbb711de95e36cb2148f94307585b530ce770d4626fa75cc09285b563b3bc9583bd322e3782b66a5417eaef06
+  data.tar.gz: 724f8d92f5978f2a395b954dc4c7004a85f4198f43595244a900e7638b6860a0270b03d766bc6a61fb2b0d596cdbc2fc0a15b9dab667ca61b4fff5ca8273d0ec

data/README.md

@@ -2,7 +2,7 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/test_coverage)](https://codeclimate.com/github/sul-dlss/cocina-models/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/maintainability)](https://codeclimate.com/github/sul-dlss/cocina-models/maintainability)
 [![Gem Version](https://badge.fury.io/rb/cocina-models.svg)](https://badge.fury.io/rb/cocina-models)
-[![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/master/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/master/openapi.yml)
+[![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml)
 
 # Cocina::Models
 
@@ -42,6 +42,10 @@ 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.
 
+### Communicate
+
+Send a note to `#dlss-infra-chg-mgmt` on Slack to let people know what is changing and when.
+
 ### 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:
@@ -55,6 +59,7 @@ Once the above listed gems are updated all the following services that use cocin
 * sul-dlss/hydrus
 * sul-dlss/happy-heron
 * sul-dlss/infrastructure-integration-test
+* sul-dlss/dor_indexing_app
 
 ## Using this gem
 

data/cocina-models.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'dry-struct', '~> 1.0'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'committee'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.87'
-  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rubocop', '~> 0.93'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.44'
   spec.add_development_dependency 'simplecov', '~> 0.17.0'
 end

data/docs/index.html

@@ -14,7 +14,7 @@
     </style>
   </head>
   <body>
-    <redoc spec-url='https://raw.githubusercontent.com/sul-dlss/cocina-models/master/openapi.yml'></redoc>
+    <redoc spec-url='https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml'></redoc>
     <script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"> </script>
   </body>
 </html>

data/lib/cocina/models/contributor.rb

@@ -11,6 +11,8 @@ module Cocina
       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)
     end
   end
 end

data/lib/cocina/models/description.rb

@@ -18,6 +18,8 @@ module Cocina
       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)
 
       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_admin_metadata.rb

@@ -7,7 +7,7 @@ module Cocina
       attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
       attribute :language, Types::Strict::Array.of(Language).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      attribute :standard, Standard.optional.meta(omittable: true)
+      attribute :metadataStandard, Types::Strict::Array.of(Standard).meta(omittable: true)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/descriptive_basic_value.rb

@@ -5,6 +5,7 @@ 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)
+      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)
       # Type of value provided by the descriptive element.
@@ -25,6 +26,8 @@ module Cocina
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      # URL or other pointer to the location of the value of the descriptive element.
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/descriptive_grouped_value.rb

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

data/lib/cocina/models/descriptive_value.rb

@@ -5,6 +5,7 @@ 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)
+      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)
       # Type of value provided by the descriptive element.
@@ -25,6 +26,8 @@ module Cocina
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      # URL or other pointer to the location of the value of the descriptive element.
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/language.rb

@@ -9,6 +9,7 @@ module Cocina
       # The preferred display label to use for the descriptive element in access systems.
       attribute :displayLabel, Types::Strict::String.meta(omittable: true)
       attribute :encoding, Standard.optional.meta(omittable: true)
+      attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).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
@@ -23,6 +24,8 @@ module Cocina
       attribute :uri, Types::Strict::String.meta(omittable: true)
       # Value of the descriptive element.
       attribute :value, Types::Strict::String.meta(omittable: true)
+      # URL or other pointer to the location of the language information.
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/related_resource.rb

@@ -25,6 +25,8 @@ module Cocina
       attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
       # The version of the related resource.
       attribute :version, Types::Strict::String.meta(omittable: true)
+      # URL or other pointer to the location of the related resource information.
+      attribute :valueAt, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/title.rb

@@ -5,6 +5,7 @@ module Cocina
     class Title < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       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)
       # Type of value provided by the descriptive element.
@@ -25,6 +26,8 @@ module Cocina
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      # URL or other pointer to the location of the value of the descriptive element.
+      attribute :valueAt, Types::Strict::String.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.44.0'
+    VERSION = '0.47.2'
   end
 end

data/openapi.yml

@@ -277,6 +277,9 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+        valueAt:
+          description: URL or other pointer to the location of the contributor information.
+          type: string
     Description:
       type: object
       additionalProperties: false
@@ -348,6 +351,9 @@ components:
             $ref: "#/components/schemas/DescriptiveValue"
         adminMetadata:
           $ref: "#/components/schemas/DescriptiveAdminMetadata"
+        valueAt:
+          description: URL or other pointer to the location of the resource description.
+          type: string
       required:
         - title
     DescriptiveAccessMetadata:
@@ -411,9 +417,11 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
-        standard:
-          # description: Descriptive or content standard to which this resource description conforms.
-          $ref: "#/components/schemas/Standard"
+        metadataStandard:
+          description: Descriptive or content standard(s) to which this resource description conforms.
+          type: array
+          items:
+            $ref: "#/components/schemas/Standard"
         identifier:
           description: Identifiers associated with this resource description.
           type: array
@@ -422,13 +430,15 @@ components:
     DescriptiveBasicValue:
       description: Basic value model for descriptive elements.
       type: object
-      # additionalProperties breaks the validator, unclear as to why.
+      # additionalProperties breaks the validator for allOf, unclear as to why.
       # additionalProperties: false
       allOf:
         - $ref: "#/components/schemas/DescriptiveStructuredValue"
         - $ref: "#/components/schemas/DescriptiveParallelValue"
+        - $ref: "#/components/schemas/DescriptiveGroupedValue"
         - type: object
-          additionalProperties: false
+          # additionalProperties breaks the validator for DescriptiveValue, unclear as to why.
+          # additionalProperties: false
           properties:
             value:
               description: String or integer value of the descriptive element.
@@ -478,6 +488,9 @@ components:
                 $ref: "#/components/schemas/DescriptiveValue"
             valueLanguage:
               $ref: "#/components/schemas/DescriptiveValueLanguage"
+            valueAt:
+              description: URL or other pointer to the location of the value of the descriptive element.
+              type: string
     DescriptiveGeographicMetadata:
       description: Value model for mods geographic extension metadata
       type: object
@@ -492,6 +505,15 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+    DescriptiveGroupedValue:
+      description: Value model for a set of descriptive elements grouped together in an unstructured way.
+      type: object
+      additionalProperties: false
+      properties:
+        groupedValue:
+          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
@@ -544,6 +566,12 @@ components:
             - type: object
               required:
                 - parallelValue
+            - type: object
+              required:
+                - groupedValue
+            - type: object
+              required:
+                - valueAt
     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
@@ -916,6 +944,11 @@ components:
         encoding:
           # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
           $ref: "#/components/schemas/Standard"
+        groupedValue:
+          description: present for mapping to additional schemas in the future and for consistency but not otherwise used
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
         note:
           description: present for mapping to additional schemas in the future and for consistency but not otherwise used
           type: array
@@ -955,6 +988,9 @@ components:
         value:
           description: Value of the descriptive element.
           type: string
+        valueAt:
+          description: URL or other pointer to the location of the language information.
+          type: string
         valueLanguage:
           # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
           $ref: "#/components/schemas/DescriptiveValueLanguage"
@@ -1062,6 +1098,9 @@ components:
         version:
           description: The version of the related resource.
           type: string
+        valueAt:
+          description: URL or other pointer to the location of the related resource information.
+          type: string
     ReleaseTag:
       description: A tag that indicates the item or collection should be released.
       type: object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.47.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: '0.93'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: '0.93'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.44'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.44'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,7 @@ files:
 - 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_grouped_value.rb
 - lib/cocina/models/descriptive_parallel_value.rb
 - lib/cocina/models/descriptive_structured_value.rb
 - lib/cocina/models/descriptive_value.rb
@@ -316,7 +317,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -325,7 +326,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