cocina-models 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def07c3b758899fb7dafda2ab26d7376318137895cb1335ab22404ab939e6e15
-  data.tar.gz: cb8f57478510d3f40a9241e944484437889dbf4b0b09e992696da7b9d1e595c1
+  metadata.gz: 14a49c375a660bd05882ee93aeaf458dddb883e88ea55ed4e80bb48b2458446b
+  data.tar.gz: ef9426b29aedcfc6cbc1cb55118de413f7bd64f9df9234f5203d2f67eee19583
 SHA512:
-  metadata.gz: 1de2f3d0703139311d8f58f1ec24b5b579b330c0461c645ebe76d153930ab91850d694a2b7a138a8ee6c63ee8ba5562f6c24ff044a7dd0bf40355eb1007afd51
-  data.tar.gz: ecdfd2b784a0e42c30e348d08dbe7a6f092c369d7830dd86b11c2ff8185fef4238068fdc4b5e7fe8af90d1d9477e17436d03fde5058855d97819a7270ebc304e
+  metadata.gz: 25aed0abff20bc69292031adf1eee12b4b6ca528525ad9898e0baf464ec1e99c6c0e518a7585fdab4dc63651175da88e5f179dfdb1ef35e79ba1d1087cf1efbc
+  data.tar.gz: babf7508c4aab20689bfd7d7618711b51a254405bd111117dd9a758b6dc556f571af9f90fb50929f515698a22a35c36275a26641ee5c93a3d51faa658a92481a

data/.rubocop.yml

@@ -83,6 +83,7 @@ Metrics/MethodLength:
   Max: 14
   Exclude:
     - 'spec/cocina/models/file_access_spec.rb'
+    - 'spec/cocina/models/dro_access_spec.rb'
 
 # ----- RSpec ------
 

data/cocina-models.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'
   spec.add_dependency 'openapi3_parser' # Parsing openapi doc
-  spec.add_dependency 'openapi_parser' # Validating openapi requests
+  spec.add_dependency 'openapi_parser', '~> 1.0' # Validating openapi requests
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk', '~> 2.1'
 

data/lib/cocina/models/admin_policy_administrative.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     class AdminPolicyAdministrative < Struct
-      attribute :defaultAccess, AdminPolicyDefaultAccess.optional.meta(omittable: true)
+      attribute(:defaultAccess, AdminPolicyDefaultAccess.default { AdminPolicyDefaultAccess.new })
       attribute :registrationWorkflow, Types::Strict::Array.of(Types::Strict::String).default([].freeze)
       # An additional workflow to start for objects managed by this admin policy once the end-accession workflow step is complete
       # example: wasCrawlPreassemblyWF

data/lib/cocina/models/administrative.rb

@@ -8,7 +8,7 @@ module Cocina
       attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).default([].freeze)
       # Administrative or Internal project this resource is a part of
       # example: Google Books
-      attribute :partOfProject, Types::Strict::String.meta(omittable: true)
+      attribute :partOfProject, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/collection.rb

@@ -26,7 +26,7 @@ module Cocina
       attribute :version, Types::Strict::Integer
       attribute(:access, CollectionAccess.default { CollectionAccess.new })
       attribute :administrative, Administrative.optional.meta(omittable: true)
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute(:description, Description.default { Description.new })
       attribute :identification, CollectionIdentification.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/dro.rb

@@ -36,7 +36,7 @@ module Cocina
       attribute :version, Types::Strict::Integer
       attribute(:access, DROAccess.default { DROAccess.new })
       attribute(:administrative, Administrative.default { Administrative.new })
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute(:description, Description.default { Description.new })
       attribute :identification, Identification.optional.meta(omittable: true)
       attribute :structural, DROStructural.optional.meta(omittable: true)
       attribute :geographic, Geographic.optional.meta(omittable: true)

data/lib/cocina/models/request_admin_policy.rb

@@ -14,7 +14,7 @@ module Cocina
       attribute :cocinaVersion, Types::Strict::String.default(Cocina::Models::VERSION)
       attribute :type, Types::Strict::String.enum(*RequestAdminPolicy::TYPES)
       attribute :label, Types::Strict::String
-      attribute :version, Types::Strict::Integer
+      attribute :version, Types::Strict::Integer.default(1).enum(1)
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
       attribute :description, RequestDescription.optional.meta(omittable: true)
     end

data/lib/cocina/models/request_collection.rb

@@ -18,7 +18,7 @@ module Cocina
       attribute :cocinaVersion, Types::Strict::String.default(Cocina::Models::VERSION)
       attribute :type, Types::Strict::String.enum(*RequestCollection::TYPES)
       attribute :label, Types::Strict::String
-      attribute :version, Types::Strict::Integer
+      attribute :version, Types::Strict::Integer.default(1).enum(1)
       attribute(:access, CollectionAccess.default { CollectionAccess.new })
       attribute(:administrative, Administrative.default { Administrative.new })
       attribute :description, RequestDescription.optional.meta(omittable: true)

data/lib/cocina/models/request_dro.rb

@@ -28,7 +28,7 @@ module Cocina
       attribute :cocinaVersion, Types::Strict::String.default(Cocina::Models::VERSION)
       attribute :type, Types::Strict::String.enum(*RequestDRO::TYPES)
       attribute :label, Types::Strict::String
-      attribute :version, Types::Strict::Integer
+      attribute :version, Types::Strict::Integer.default(1).enum(1)
       attribute :access, DROAccess.optional.meta(omittable: true)
       attribute(:administrative, Administrative.default { Administrative.new })
       attribute :description, RequestDescription.optional.meta(omittable: true)

data/lib/cocina/models/validator.rb

@@ -35,7 +35,7 @@ module Cocina
 
       # rubocop:disable Style/ClassVars
       def self.root
-        @@root ||= OpenAPIParser.parse(YAML.load_file(openapi_path))
+        @@root ||= OpenAPIParser.parse(YAML.load_file(openapi_path), strict_reference_validation: true)
       end
       # rubocop:enable Style/ClassVars
       private_class_method :root

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.66.0'
+    VERSION = '0.67.0'
   end
 end

data/openapi.yml

@@ -178,6 +178,7 @@ components:
           description: Administrative or Internal project this resource is a part of
           example: Google Books
           type: string
+          nullable: true
       required:
         - hasAdminPolicy
     AdminPolicy:
@@ -240,6 +241,7 @@ components:
       required:
         - hasAdminPolicy
         - hasAgreement
+        - defaultAccess
     AdminPolicyDefaultAccess:
       description: 'Provides the default access settings for an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.'
       type: object
@@ -410,6 +412,7 @@ components:
           $ref: '#/components/schemas/CollectionIdentification'
       required:
         - cocinaVersion
+        - description
         - externalIdentifier
         - label
         - type
@@ -890,6 +893,7 @@ components:
         - cocinaVersion
         - access
         - administrative
+        - description
         - externalIdentifier
         - label
         - type
@@ -1480,6 +1484,9 @@ components:
           type: string
         version:
           type: integer
+          default: 1
+          enum:
+            - 1
         administrative:
           $ref: '#/components/schemas/AdminPolicyAdministrative'
         description:
@@ -1509,6 +1516,9 @@ components:
           type: string
         version:
           type: integer
+          default: 1
+          enum:
+            - 1
         access:
           $ref: '#/components/schemas/CollectionAccess'
         administrative:
@@ -1626,6 +1636,9 @@ components:
           type: string
         version:
           type: integer
+          default: 1
+          enum:
+            - 1
         access:
           $ref: '#/components/schemas/DROAccess'
         administrative:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,16 +70,16 @@ dependencies:
   name: openapi_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement