cocina-models 0.110.1 → 0.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ba030653ba2790a20c4d071881472d3889bb4739c3c4637bb68d11d4c320207
-  data.tar.gz: 1f5d68d708a345aaf833908dca817af1c5c8499723d7f5194e2b0097817cb3a5
+  metadata.gz: 021d53c09f577e12fbfd215fc37bec5acb2b4da9dd6c8b4803153d107c9d9e80
+  data.tar.gz: e0e1553f9e8f6e3a3a7bbb032fb6bdb9f9b41c98e71d0c46b1bbe9ef53eab23a
 SHA512:
-  metadata.gz: 796ab6c265801899f9b31ff131313d413133fbaf2829e2899dd0535a616345af723201d76aca3cecd4e9efaab5c2afa3151a5281a32cfb3adb46ece694378a13
-  data.tar.gz: 6ef1fc9300e553734fe55bc59b2cee35d80020e80b6539990ceb81d9c6f809e48449995fe6d0173ac9cf1d2a46d1aa264bfd86afa0c587999b7ae927590e84f9
+  metadata.gz: df70b91ae041970111a9a30a299a33e35057a6beaede5894e5a94cf01909072c62e441744dd2c638f05dd19b2634d7dc0fe5ffecbc0d23cfb67a5cc231baa4d3
+  data.tar.gz: 6f66fd83a7d8d41b361ef7c7c24600796272f68f41b74161e756519039ae37703e24edc7362c60cfae7c78dec95bae7d9ee2b4eaef36dcc1dc9fd4a83b15262b

data/.circleci/config.yml

@@ -4,10 +4,12 @@ orbs:
 workflows:
   build:
     jobs:
-      - ruby-rails/validate-api:
-          name: validate
       - ruby-rails/lint:
           name: lint
       - ruby-rails/test-gem:
           name: test
           context: dlss
+          before-test:
+            - run:
+                name: validate openapi
+                command: bin/validate-schema schema.json

data/.github/pull_request_template.md

@@ -1,5 +1,3 @@
-**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 +5,3 @@
 ## How was this change tested? 🤨
 
 ⚡ ⚠ If this change has cross service impact, ***run [integration tests](https://github.com/sul-dlss/infrastructure-integration-test)*** and/or test in [stage|qa] environment, in addition to specs. ⚡
-
-
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.110.1)
+    cocina-models (0.112.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -11,7 +11,6 @@ PATH
       i18n
       json_schemer (~> 2.0)
       jsonpath
-      marc (~> 1.3)
       nokogiri
       super_diff
       thor
@@ -80,8 +79,9 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.18.1)
@@ -95,19 +95,16 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    marc (1.4.0)
-      nokogiri (~> 1.0)
-      rexml
     minitest (6.0.1)
       prism (~> 1.5)
     multi_json (1.19.1)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     optimist (3.2.1)
     parallel (1.27.0)
-    parser (3.3.10.1)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -122,14 +119,13 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.1.0)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
-    rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -145,7 +141,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.84.1)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -187,7 +183,7 @@ GEM
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
     uri (1.1.1)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   arm64-darwin
@@ -211,7 +207,7 @@ CHECKSUMS
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
-  cocina-models (0.110.1)
+  cocina-models (0.112.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -232,21 +228,20 @@ CHECKSUMS
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
-  irb (1.16.0) sha256=2abe56c9ac947cdcb2f150572904ba798c1e93c890c256f8429981a7675b0806
+  irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
   json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
   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
-  marc (1.4.0) sha256=89f31a66c21f5a11e8fcf65fe06d207e121fb45ac6b23abef403f9ce912c7d10
   minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb
   multi_json (1.19.1) sha256=7aefeff8f2c854bf739931a238e4aea64592845e0c0395c8a7d2eea7fdd631b7
-  nokogiri (1.19.0-arm64-darwin) sha256=0811dfd936d5f6dd3f6d32ef790568bf29b2b7bead9ba68866847b33c9cf5810
-  nokogiri (1.19.0-x86_64-linux-gnu) sha256=f482b95c713d60031d48c44ce14562f8d2ce31e3a9e8dd0ccb131e9e5a68b58c
+  nokogiri (1.19.1-arm64-darwin) sha256=dfe2d337e6700eac47290407c289d56bcf85805d128c1b5a6434ddb79731cb9e
+  nokogiri (1.19.1-x86_64-linux-gnu) sha256=1a4902842a186b4f901078e692d12257678e6133858d0566152fe29cdb98456a
   optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
   parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.1) sha256=06f6a725d2cd91e5e7f2b7c32ba143631e1f7c8ae2fb918fc4cebec187e6a688
+  parser (3.3.10.2) sha256=6f60c84aa4bdcedb6d1a2434b738fe8a8136807b6adc8f7f53b97da9bc4e9357
   patience_diff (1.2.0) sha256=f492094486af02fff4a80070fa6b4d0ebbcf4d42fb38bba29d095eef43f6822c
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -255,17 +250,16 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
-  rdoc (7.1.0) sha256=494899df0706c178596ca6e1d50f1b7eb285a9b2aae715be5abd742734f17363
+  rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
   regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
-  rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
   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-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
-  rubocop (1.84.1) sha256=14cc626f355141f5a2ef53c10a68d66b13bb30639b26370a76559096cc6bcc1a
+  rubocop (1.84.2) sha256=5692cea54168f3dc8cb79a6fe95c5424b7ea893c707ad7a4307b0585e88dbf5f
   rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
@@ -283,7 +277,7 @@ CHECKSUMS
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
-  zeitwerk (2.7.4) sha256=2bef90f356bdafe9a6c2bd32bcd804f83a4f9b8bc27f3600fff051eb3edcec8b
+  zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
 
 BUNDLED WITH
   4.0.6

data/README.md

@@ -7,7 +7,7 @@
 
 The cocina-models gem is a Ruby implementation of the Stanford Digital Repository (SDR) data model, which we named "Cocina." The data being modeled is oriented around digital repository objects.
 
-The data model is expressed in an OpenAPI specification that lives in this codebase. Expressing the model in such a spec allows for rich validation (using gems such as `OpenAPIParser` and `committee`). The gem provides a set of generators (see below) to generate Ruby classes from the specification, with modeling provided by dry-struct / dry-types. Together, these provide a way for consumers to validate objects against models and to manipulate those objects.
+The data model is expressed in an OpenAPI specification that lives in this codebase. Expressing the model in such a spec allows for rich validation (using gems such as `json_schemer`). The gem provides a set of generators (see below) to generate Ruby classes from the specification, with modeling provided by dry-struct / dry-types. Together, these provide a way for consumers to validate objects against models and to manipulate those objects.
 
 Note that the data model encodes properties as camelCase, which the team believes to be consistent with other HTTP APIs and the original design of the Cocina data model. While using camelCase in Ruby code may look and feel wrong, we did explore automagic conversion between camelCase in the model and snake_case in the Ruby context. We ultimately concluded that we have enough representations of the data model in enough codebases to reasonably worry about data inconsistency problems, none of which we need in our work on SDR.
 
@@ -20,9 +20,9 @@ Set the PURL url base:
 Cocina::Models::Mapping::Purl.base_url = Settings.release.purl_base_url
 ```
 
-## Generate models from openapi.yml
+## Generate models from schema.json
 
-Note that only a small subset of openapi is supported. If you are using a new openapi feature or pattern, verify that the model will be generated as expected.
+Note that only a small subset of JSON Schema is supported. If you are using a new JSON Schema feature or pattern, verify that the model will be generated as expected.
 
 ### All
 ```
@@ -46,14 +46,16 @@ exe/generator generate_descriptive_docs
 
 ## Testing
 
-The generator is tested via its output when run against `openapi.yml`, viz., the Cocina model classes. Thus, `generate` should be run after any changes to `openapi.yml`.
+The generator is tested via its output when run against `schema.json`, viz., the Cocina model classes. Thus, `generate` should be run after any changes to `schema.json`.
 
-Beyond what is necessary to test the generator, the Cocina model classes are not tested, i.e., they are assumed to be as specified in `openapi.yml`.
+Beyond what is necessary to test the generator, the Cocina model classes are not tested, i.e., they are assumed to be as specified in `schema.json`.
 
 ## Testing validation changes
 
 If there is a possibility that a model, mapping, or validation change will conflict with some existing objects then [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) should be used for testing. This must be run on the `sdr-infra` VM since it requires deploying a branch of cocina-models.
 
+For background on object validation, as it relates to migrating versions, see: https://github.com/sul-dlss/dor-services-app/wiki/Migrating-Cocina
+
 1. Create a cocina-models branch containing the proposed change and push to GitHub.
 2. On the `sdr-infra` VM, while logged in as the `deploy` user, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
 3. Select the appropriate environment vars below - they are set to values in puppet.  (first 2 lines are the same;  last two lines use different variables)
@@ -87,6 +89,13 @@ export DATABASE_PASSWORD=$DOR_SERVICES_DB_PROD_PWD
 export RUBYOPT='-W:no-deprecated -W:no-experimental'
 RAILS_ENV=production bin/validate-cocina -p 8
 ```
+
+To run against head_version and latest_closed_version (when the object is open) only, use the `-l` option for `latest_versions_only`
+```
+export RUBYOPT='-W:no-deprecated -W:no-experimental'
+RAILS_ENV=production bin/validate-cocina -p 8 -l
+```
+
 5. Check `validate-cocina.csv` for validation errors.
 
 ## Running Reports in DSA
@@ -95,7 +104,7 @@ See https://github.com/sul-dlss/dor-services-app/blob/main/README.md#running-rep
 
 
 ## Releasing a patch change
-A patch change is a change that (1) does not affect the data model; (2) does not alter the openapi.yml; and more broadly (3) does not matter if some applications have the change and others do not.
+A patch change is a change that (1) does not affect the data model; (2) does not alter the schema.json; and more broadly (3) does not matter if some applications have the change and others do not.
 
 A patch change can be released as part of regular dependency updates or selectively released for individual applications.
 
@@ -146,13 +155,11 @@ This list of services is known to include:
 
 **NOTE**: You can skip step 3A if there have not been any changes to the `cocina-models` OpenAPI spec since the prior release.
 
-The cocina-models gem is used in applications that have an API specification that accepts Cocina models. Make sure that the `openapi.yml` for these two applications includes the `openapi.yml` schema changes made in cocina-models.
-
-Copy and paste the cocina-models schemas to each project's `openapi.yml`. By convention, these schemas are listed first, followed by the application-specific schemas.
+The cocina-models gem is used in applications that have an API specification that accepts Cocina models.
 
 #### Step 3B: Bump gems and create the PRs
 
-If you updated the `openapi.yml` in step 3A, use the same PR for step 3B. Why? When [dor-services-app](https://github.com/sul-dlss/dor-services-app), for example, is updated to use the new models (via the auto-update script), these clients should be updated at the same time or there is risk of models produced by dor-services-app not being acceptable to the clients.
+If you updated the `schema.json` in step 3A, use the same PR for step 3B. Why? When [dor-services-app](https://github.com/sul-dlss/dor-services-app), for example, is updated to use the new models (via the auto-update script), these clients should be updated at the same time or there is risk of models produced by dor-services-app not being acceptable to the clients.
 
 1. Perform `bundle update --conservative cocina-models dor-services-client` in the  services above and make PRs for those repos if they don't already exist. You may first need to update how these gems are pinned in the `Gemfile` in order to bump them.
 2. Note that sdr-client is not currently used in these applications, but if it were, would also need to be bumped to the latest release.

data/bin/validate-schema

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'cocina/models'
+
+filepath = ARGV[0]
+exit(1) unless JSONSchemer.valid_schema?(Pathname.new(filepath))

data/cocina-models.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'i18n' # for validating BCP 47 language tags, according to RFC 4646
   spec.add_dependency 'jsonpath' # used for date/time validation
   spec.add_dependency 'json_schemer', '~> 2.0'
-  spec.add_dependency 'marc', '~> 1.3'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'super_diff'
   spec.add_dependency 'thor'

data/lib/cocina/generator/generator.rb

@@ -8,7 +8,7 @@ module Cocina
     class Generator < Thor # rubocop:disable Metrics/ClassLength
       include Thor::Actions
 
-      class_option :openapi, desc: 'Path of openapi.yml', default: 'openapi.yml'
+      class_option :schema, desc: 'Path of schema.json', default: 'schema.json'
       class_option :output, desc: 'Path for output', default: 'lib/cocina/models'
 
       def self.source_root
@@ -96,9 +96,9 @@ module Cocina
       end
 
       def schemas
-        @schemas ||= Cocina::OpenApiWrapper.parse(YAML.load_file(options[:openapi]), strict_reference_validation: true)
-                                           .components
-                                           .schemas
+        file_content = File.read(options[:schema])
+        data = JSON.parse(file_content)
+        @schemas ||= Cocina::JsonSchemaWrapper.parse(data, strict_reference_validation: true).schemas
       end
 
       def schema_for(schema_name, lite: false)

data/lib/cocina/generator/schema.rb

@@ -8,6 +8,9 @@ module Cocina
         @schema_properties ||= (properties + all_of_properties + one_of_properties).uniq(&:key)
       end
 
+      VALIDATE_TYPES = %w[DRO RequestDRO DROWithMetadata Collection RequestCollection CollectionWithMetadata AdminPolicy
+                          RequestAdminPolicy AdminPolicyWithMetadata Description RequestDescription].freeze
+
       def generate
         <<~RUBY
           # frozen_string_literal: true
@@ -71,7 +74,7 @@ module Cocina
       end
 
       def validatable?
-        !schema_doc.root.paths.path["/validate/#{schema_doc.name}"].nil? && !lite
+        VALIDATE_TYPES.include?(name) && !lite
       end
 
       def properties

data/lib/cocina/generator/schema_base.rb

@@ -40,6 +40,8 @@ module Cocina
       def quote(item)
         return item unless schema_doc.type == 'string'
 
+        return 'nil' if item.nil?
+
         "'#{item}'"
       end
 

data/lib/cocina/{open_api_wrapper.rb → json_schema_wrapper.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Cocina
-  # Wrapper for OpenAPI support using json_schemer
-  class OpenApiWrapper
+  # Wrapper for JSON Schema support using json_schemer
+  class JsonSchemaWrapper
     class OpenApiError < StandardError; end
     class MissingReferenceError < OpenApiError; end
 
@@ -18,33 +18,18 @@ module Cocina
       new(spec_hash, strict_reference_validation:)
     end
 
-    def components
-      @components ||= ComponentsWrapper.new(self)
-    end
-
     attr_reader :schemas, :spec
 
     private
 
     def initialize_schemas
-      return unless @spec.dig('components', 'schemas')
+      return unless @spec.key?('$defs')
 
-      spec['components']['schemas'].each do |name, schema|
+      spec.fetch('$defs').each do |name, schema|
         @schemas[name] = SchemaWrapper.new(schema, name, self)
       end
     end
 
-    # Wrapper for components section
-    class ComponentsWrapper
-      def initialize(parent)
-        @parent = parent
-      end
-
-      def schemas
-        @parent.schemas
-      end
-    end
-
     # Wrapper for individual schemas
     class SchemaWrapper
       attr_reader :name
@@ -65,7 +50,7 @@ module Cocina
         @schema_def['oneOf'].map do |schema|
           if schema['$ref']
             ref_name = schema['$ref'].split('/').last
-            SchemaWrapper.new(@parent.spec.dig('components', 'schemas', ref_name), ref_name, @parent)
+            SchemaWrapper.new(@parent.spec.dig('$defs', ref_name), ref_name, @parent)
           else
             SchemaWrapper.new(schema, nil, @parent)
           end
@@ -78,7 +63,7 @@ module Cocina
         @schema_def['allOf'].map do |schema|
           if schema['$ref']
             ref_name = schema['$ref'].split('/').last
-            SchemaWrapper.new(@parent.spec.dig('components', 'schemas', ref_name), ref_name, @parent)
+            SchemaWrapper.new(@parent.spec.dig('$defs', ref_name), ref_name, @parent)
           else
             SchemaWrapper.new(schema, nil, @parent)
           end
@@ -89,7 +74,7 @@ module Cocina
         @schema_def['properties']&.transform_values do |schema|
           if schema['$ref']
             ref_name = schema['$ref'].split('/').last
-            SchemaWrapper.new(@parent.spec.dig('components', 'schemas', ref_name), ref_name, @parent)
+            SchemaWrapper.new(@parent.spec.dig('$defs', ref_name), ref_name, @parent)
           else
             SchemaWrapper.new(schema, nil, @parent)
           end
@@ -137,7 +122,7 @@ module Cocina
 
         if @schema_def['items']['$ref']
           ref_name = @schema_def['items']['$ref'].split('/').last
-          SchemaWrapper.new(@parent.spec.dig('components', 'schemas', ref_name), ref_name, @parent)
+          SchemaWrapper.new(@parent.spec.dig('$defs', ref_name), ref_name, @parent)
         else
           SchemaWrapper.new(@schema_def['items'], Generator::SchemaArray::GENERIC_ITEMS_NAME, @parent)
         end

data/lib/cocina/models/admin_policy_access_template.rb

@@ -17,7 +17,7 @@ module Cocina
       attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
-      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+      attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute? :view, Types::Strict::String.optional.default('dark')

data/lib/cocina/models/citation_only_access.rb

@@ -10,7 +10,7 @@ module Cocina
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
       # Not used for this access type, must be null.
-      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :location, Types::Strict::String.optional.enum(nil)
       attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end
   end

data/lib/cocina/models/collection_access.rb

@@ -17,7 +17,7 @@ module Cocina
       attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
-      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+      attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
     end
   end
 end

data/lib/cocina/models/controlled_digital_lending_access.rb

@@ -8,7 +8,7 @@ module Cocina
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
       # Not used for this access type, must be null.
-      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :location, Types::Strict::String.optional.enum(nil)
       # Available for controlled digital lending.
       attribute? :controlledDigitalLending, Types::Strict::Bool.default(false)
     end

data/lib/cocina/models/dark_access.rb

@@ -8,7 +8,7 @@ module Cocina
       # Download access level.
       attribute? :download, Types::Strict::String.default('none').enum('none')
       # Not used for this access type, must be null.
-      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :location, Types::Strict::String.optional.enum(nil)
       attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end
   end

data/lib/cocina/models/dro_access.rb

@@ -26,7 +26,7 @@ module Cocina
       attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
-      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+      attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
     end
   end
 end

data/lib/cocina/models/file.rb

@@ -27,7 +27,7 @@ module Cocina
       # BCP 47 language tag: https://www.rfc-editor.org/rfc/rfc4646.txt -- other applications
       # (like media players) expect language codes of this format, see e.g. https://videojs.com/guides/text-tracks/#srclang
       attribute? :languageTag, LanguageTag.optional
-      # Use for the File (e.g. "transcription" for OCR).
+      # Use for the File (e.g. 'transcription' for OCR).
       attribute? :use, FileUse.optional
       # Indicates if the text (OCR/captioning) was generated by SDR.
       attribute? :sdrGeneratedText, Types::Strict::Bool.default(false)

data/lib/cocina/models/file_use.rb

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    # Use for the File (e.g. "transcription" for OCR).
+    # Use for the File (e.g. 'transcription' for OCR).
     FileUse = Types::String
   end
 end

data/lib/cocina/models/license.rb

@@ -4,6 +4,6 @@ module Cocina
   module Models
     # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
     # CC, RightsStatement.org URI, etc.).
-    License = Types::String.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+    License = Types::String.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
   end
 end

data/lib/cocina/models/location_based_access.rb

@@ -7,7 +7,7 @@ module Cocina
       attribute :view, Types::Strict::String.enum('location-based')
       # Download access level.
       attribute :download, Types::Strict::String.enum('location-based', 'none')
-      # If access or download is "location-based", which location should have access.
+      # If access or download is 'location-based', which location should have access.
       attribute :location, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
       attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end

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

@@ -77,7 +77,7 @@ module Cocina
 
           def language_applies_to
             value = language_element['objectPart']
-            [value: value] if value.present?
+            [{value: value}] if value.present?
           end
 
           def language_source_for(code_language_term, text_language_term)

data/lib/cocina/models/request_file.rb

@@ -17,7 +17,7 @@ module Cocina
       # (like media players) expect language codes of this format, see e.g. https://videojs.com/guides/text-tracks/#srclang
       attribute? :languageTag, LanguageTag.optional
       attribute? :externalIdentifier, Types::Strict::String
-      # Use for the File (e.g. "transcription" for OCR).
+      # Use for the File (e.g. 'transcription' for OCR).
       attribute? :use, FileUse.optional
       # Indicates if the text (OCR/captioning) was generated by SDR.
       attribute? :sdrGeneratedText, Types::Strict::Bool.default(false)

data/lib/cocina/models/stanford_access.rb

@@ -8,7 +8,7 @@ module Cocina
       # Download access level.
       attribute :download, Types::Strict::String.enum('stanford')
       # Not used for this access type, must be null.
-      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :location, Types::Strict::String.optional.enum(nil)
       attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end
   end

data/lib/cocina/models/validators/json_schema_validator.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Perform validation against JSON schema
+      class JsonSchemaValidator
+        def self.validate(clazz, attributes)
+          return unless clazz.name
+
+          method_name = clazz.name.split('::').last
+
+          attributes['cocinaVersion'] = Cocina::Models::VERSION if %w[DRO RequestDRO AdminPolicy RequestAdminPolicy Collection RequestCollection DROWithMetadata].include? method_name
+
+          errors = openapi.ref("#/components/schemas/#{method_name}").validate(attributes.as_json).to_a
+          return unless errors.any?
+
+          raise ValidationError, "When validating #{method_name}: " + errors.map { |e| e['error'] }.uniq.join(', ')
+        end
+
+        # @return [Hash] a hash representation of the openapi document
+        def self.document
+          @document ||= YAML.load_file(openapi_path)
+        end
+
+        # @return [JSONSchemer::OpenAPI]
+        def self.openapi
+          @openapi ||= JSONSchemer.openapi(YAML.load_file(openapi_path))
+        end
+        private_class_method :openapi
+
+        def self.openapi_path
+          ::File.expand_path('../../../../openapi.yml', __dir__)
+        end
+        private_class_method :openapi_path
+      end
+    end
+  end
+end