cocina-models 0.112.1 → 0.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0f9a69413b8b16af1c991c94b54a42b6093ac2dccb78dcfd1fc161df2e8f42
-  data.tar.gz: 7a5674e97c75fe7eea96fcd227be1deb1ab42c35317f838a0e48bc24faf724ae
+  metadata.gz: '09669a342a43a6be309144d1d71748372251fdb37ad96c480e7ce88127749ec5'
+  data.tar.gz: 99e35e0634f65f03e545dfabc40d95cb6a638c1f0f0e05ffbf14315738ac895c
 SHA512:
-  metadata.gz: 8736faf24b0d074167b7c874edb81f2ed6ad53f51b224b2609a992ffbdafcd237bc8d807f0c8a89c3233564e531755caca3e1bbddf42e44c39858fd1fd1d85eb
-  data.tar.gz: e183d4290660c8f0de527beb8eccbf271925148957637a77d11bd345e22804fd6cb7e60da3e2100ff205a86874f0a672ad4ef60b6a0c63ad3d5854338455b955
+  metadata.gz: 29c840e670181b57df7d29573da1cc019cd6a34300f43548a762f0d394736af09822bb61e85acd7eefa6426e37996fbe5869c4b58c8aa7e9176a201af14f91ec
+  data.tar.gz: 00f39759126179cd79f5cda1a1cabf93b3da2ba19ef0ecd90fa1f1c10735b31ff966e9496e93cac69fb35255b0dc1c1e45176d70f743630005eb883384e38132

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.112.1)
+    cocina-models (0.113.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -32,6 +32,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     attr_extras (7.1.0)
     base64 (0.3.0)
@@ -73,7 +75,7 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (6.0.1)
+    erb (6.0.2)
     hana (1.3.7)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
@@ -85,6 +87,9 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.18.1)
+    json-schema (6.1.0)
+      addressable (~> 2.8)
+      bigdecimal (>= 3.1, < 5)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -95,7 +100,10 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (6.0.1)
+    mcp (0.7.1)
+      json-schema (>= 4.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     multi_json (1.19.1)
     nokogiri (1.19.1-arm64-darwin)
@@ -116,6 +124,7 @@ GEM
     psych (5.3.1)
       date
       stringio
+    public_suffix (7.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -135,16 +144,17 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.84.2)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -203,11 +213,12 @@ DEPENDENCIES
 
 CHECKSUMS
   activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
+  addressable (2.8.9) sha256=cc154fcbe689711808a43601dee7b980238ce54368d23e127421753e46895485
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
-  cocina-models (0.112.1)
+  cocina-models (0.113.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -223,19 +234,21 @@ CHECKSUMS
   dry-types (1.9.1) sha256=baebeecdb9f8395d6c9d227b62011279440943e3ef2468fe8ccc1ba11467f178
   edtf (3.2.0) sha256=a15a0ee274e49c8047a3ebb5d61d793ba44f7f8ffbf0595392c467e3ea8d2447
   equivalent-xml (0.6.0) sha256=8919761efa848ad0846369ff8be1f646b17e5061698c4867b09829000cc3f487
-  erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5
+  erb (6.0.2) sha256=9fe6264d44f79422c87490a1558479bd0e7dad4dd0e317656e67ea3077b5242b
   hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
   json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  json-schema (6.1.0) sha256=6bf70a2cfb6dfd5a06da28093fa8190f324c88eabd36a7f47097f227321dc702
   json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
   jsonpath (1.1.5) sha256=29f70467193a2dc93ab864ec3d3326d54267961acc623f487340eb9c34931dbe
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
-  minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb
+  mcp (0.7.1) sha256=fa967895d6952bad0d981ea907731d8528d2c246d2079d56a9c8bae83d14f1c7
+  minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d
   multi_json (1.19.1) sha256=7aefeff8f2c854bf739931a238e4aea64592845e0c0395c8a7d2eea7fdd631b7
   nokogiri (1.19.1-arm64-darwin) sha256=dfe2d337e6700eac47290407c289d56bcf85805d128c1b5a6434ddb79731cb9e
   nokogiri (1.19.1-x86_64-linux-gnu) sha256=1a4902842a186b4f901078e692d12257678e6133858d0566152fe29cdb98456a
@@ -247,6 +260,7 @@ CHECKSUMS
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
   psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
+  public_suffix (7.0.2) sha256=9114090c8e4e7135c1fd0e7acfea33afaab38101884320c65aaa0ffb8e26a857
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
@@ -256,10 +270,10 @@ CHECKSUMS
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
   rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
   rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
-  rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
-  rubocop (1.84.2) sha256=5692cea54168f3dc8cb79a6fe95c5424b7ea893c707ad7a4307b0585e88dbf5f
+  rubocop (1.85.0) sha256=317407feb681a07d54f64d2f9e1d6b6af1ce7678e51cd658e3ad8bd66da48c01
   rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
@@ -280,4 +294,4 @@ CHECKSUMS
   zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
 
 BUNDLED WITH
-  4.0.6
+  4.0.7

data/README.md

@@ -1,7 +1,6 @@
 [![CircleCI](https://circleci.com/gh/sul-dlss/cocina-models.svg?style=svg)](https://circleci.com/gh/sul-dlss/cocina-models)
 [![Test Coverage](https://codecov.io/github/sul-dlss/cocina-models/graph/badge.svg?token=FG1SRYCME2)](https://codecov.io/github/sul-dlss/cocina-models)
 [![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/main/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml)
 
 # Cocina::Models
 
@@ -13,6 +12,10 @@ Note that the data model encodes properties as camelCase, which the team believe
 
 For more about the model for description see https://consul.stanford.edu/display/DIGMETADATA/Digital+Object+Metadata+Documentation#DigitalObjectMetadataDocumentation-Cocinamodel
 
+## Schema
+
+The [schema.json](schema.json) can also be viewed via JSON HERO: https://jsonhero.io/j/rynNH3NLBhcf and DOR Services App's openapi.yml: https://sul-dlss.github.io/dor-services-app/
+
 ## Configuration
 
 Set the PURL url base:

data/description_types.yml

@@ -432,6 +432,8 @@ identifier:
   - value: "West Mat #"
   - value: Wikidata
     code: wikidata
+  - value: International Article Number
+  - value: ProQuest Module ID
 note:
   - value: abstract
     description: A short overview of a research article or other work.

data/docs/description_types.md

@@ -415,6 +415,8 @@ _Path: identifier.type_
   * videorecording identifier
   * West Mat #
   * Wikidata
+  * International Article Number
+  * ProQuest Module ID
 # Note types
 _Path: note.type_
   * abstract

data/lib/cocina/models/descriptive_basic_value.rb

@@ -31,7 +31,7 @@ module Cocina
       # code, or identifier.
       attribute? :source, Source.optional
       # The preferred display label to use for the descriptive element in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # A term providing information about the circumstances of the statement (e.g., approximate
       # dates).
       attribute? :qualifier, Types::Strict::String

data/lib/cocina/models/descriptive_parallel_event.rb

@@ -9,7 +9,7 @@ module Cocina
       # Description of the event (creation, publication, etc.).
       attribute? :type, Types::Strict::String
       # The preferred display label to use for the event in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # Dates associated with the event.
       attribute :date, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Contributors associated with the event.

data/lib/cocina/models/descriptive_value.rb

@@ -30,7 +30,7 @@ module Cocina
       # code, or identifier.
       attribute? :source, Source.optional
       # The preferred display label to use for the descriptive element in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # A term providing information about the circumstances of the statement (e.g., approximate
       # dates).
       attribute? :qualifier, Types::Strict::String

data/lib/cocina/models/event.rb

@@ -8,7 +8,7 @@ module Cocina
       # Description of the event (creation, publication, etc.).
       attribute? :type, Types::Strict::String
       # The preferred display label to use for the event in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # Dates associated with the event.
       attribute :date, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Contributors associated with the event.

data/lib/cocina/models/language.rb

@@ -9,7 +9,7 @@ module Cocina
       # Code value of the descriptive element.
       attribute? :code, Types::Strict::String
       # The preferred display label to use for the descriptive element in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional

data/lib/cocina/models/mapping/from_mods/description.rb

@@ -52,7 +52,7 @@ module Cocina
                   .values
                   .select { |nodes| nodes.size > 1 }
                   .each do |nodes|
-                    notifier.warn('Unpaired altRepGroup') if altrepgroup_error?(nodes)
+              notifier.warn('Unpaired altRepGroup') if altrepgroup_error?(nodes)
             end
           end
 

data/lib/cocina/models/mapping/from_mods/form.rb

@@ -201,12 +201,6 @@ module Cocina
                          },
                          type: 'resource type',
                          value: 'Dissertation'
-                       }, {
-                         source: {
-                           value: 'Stanford self-deposit resource types'
-                         },
-                         type: 'resource type',
-                         structuredValue: [{ type: 'subtype', value: 'Academic thesis' }]
                        })
           end
 

data/lib/cocina/models/mapping/to_mods/contributor.rb

@@ -30,12 +30,12 @@ module Cocina
           def write
             Array(contributors)
               .reject do |contributor|
-                NameTitleGroup.in_name_title_group?(contributor: contributor,
-                                                    titles: titles)
+              NameTitleGroup.in_name_title_group?(contributor: contributor,
+                                                  titles: titles)
             end
               .each do |contributor|
-                NameWriter.write(xml: xml, contributor: contributor,
-                                 id_generator: id_generator)
+              NameWriter.write(xml: xml, contributor: contributor,
+                               id_generator: id_generator)
             end
           end
 

data/lib/cocina/models/related_resource.rb

@@ -12,7 +12,7 @@ module Cocina
       # Status of the related resource relative to other related resources.
       attribute? :status, Types::Strict::String
       # The preferred display label to use for the related resource in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # Titles of the related resource.
       attribute :title, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Agents contributing in some way to the creation and history of the related resource.

data/lib/cocina/models/title.rb

@@ -29,7 +29,7 @@ module Cocina
       # code, or identifier.
       attribute? :source, Source.optional
       # The preferred display label to use for the descriptive element in access systems.
-      attribute? :displayLabel, Types::Strict::String
+      attribute? :displayLabel, Types::Strict::String.optional
       # A term providing information about the circumstances of the statement (e.g., approximate
       # dates).
       attribute? :qualifier, Types::Strict::String

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.112.1'
+    VERSION = '0.113.0'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -84,7 +84,7 @@ module Cocina
         build_request_dro_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
-            props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
+          props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
         end
       end
 
@@ -138,7 +138,7 @@ module Cocina
         build_request_collection_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
-            props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
+          props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
         end
       end
 
@@ -198,7 +198,7 @@ module Cocina
         build_request_admin_policy_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
-            props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
+          props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
         end
       end
 

data/schema.json

@@ -848,7 +848,7 @@
             },
             "displayLabel": {
               "description": "The preferred display label to use for the descriptive element in access systems.",
-              "type": "string"
+              "type": ["string", "null"]
             },
             "qualifier": {
               "description": "A term providing information about the circumstances of the statement (e.g., approximate dates).",
@@ -969,7 +969,7 @@
             },
             "displayLabel": {
               "description": "The preferred display label to use for the event in access systems.",
-              "type": "string"
+              "type": ["string", "null"]
             },
             "date": {
               "description": "Dates associated with the event.",
@@ -1110,7 +1110,7 @@
             },
             "displayLabel": {
               "description": "The preferred display label to use for the event in access systems.",
-              "type": "string"
+              "type": ["string", "null"]
             },
             "date": {
               "description": "Dates associated with the event.",
@@ -1434,7 +1434,7 @@
         },
         "displayLabel": {
           "description": "The preferred display label to use for the descriptive element in access systems.",
-          "type": "string"
+          "type": ["string", "null"]
         },
         "encoding": {
           "$ref": "#/$defs/Standard"
@@ -1733,7 +1733,7 @@
         },
         "displayLabel": {
           "description": "The preferred display label to use for the related resource in access systems.",
-          "type": "string"
+          "type": ["string", "null"]
         },
         "title": {
           "description": "Titles of the related resource.",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.112.1
+  version: 0.113.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -321,7 +321,6 @@ files:
 - description_types.yml
 - docs/cocina-base.jsonld
 - docs/description_types.md
-- docs/index.html
 - exe/generator
 - lib/cocina/generator.rb
 - lib/cocina/generator/datatype.rb
@@ -532,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Data models for the SDR
 test_files: []

data/docs/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>API documentation</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-
-    <style>
-      body {
-        margin: 0;
-        padding: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <redoc spec-url='https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml'></redoc>
-    <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"> </script>
-  </body>
-</html>