cocina-models 0.51.0 → 0.54.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26933441485daf9b322a702e2e72955a2632ff9ea840ed4b700a8130361dfb2
-  data.tar.gz: 877293aa8b242869413b025634e1c44e52ea1cc9aaf856b82a8986a170fedd0c
+  metadata.gz: c3647bdfe1efdf9e51abdd4136d455eac3962cbd38a1d29fd32aa037ca9c8481
+  data.tar.gz: c5ddfe3f1eab351ac6eb0fe4b20ecb9b6597397d00600dcd1fdce2ebff4bf86b
 SHA512:
-  metadata.gz: 1e6919371f789202c7f17b5c8a6036ab68b3ce1dc4486ec8b1f62cf60a5eb3c4857b424b3a19198c74f4fcc1265e5de32a84085aaa11eaa405f41df13f7728b9
-  data.tar.gz: f287df923a3d9bdf37f7c012e5aa222197e953f9e8ed0c86c65df64a5345b402e399b9d6515fc12e5d605f0fc38d7e801393096cdb55d67c856365ef80b8ec34
+  metadata.gz: 5b6e644d13d139fcb672b66979d5ba55e8031e06fe691e0beedd3105180f948133f8c37e1d92ed496934fa4947ac4c623c2e6fa3b1474043e9fb7691e125c2d0
+  data.tar.gz: df4b09ffd691bc52f6fda5d90dd0ae99510261cd73c7017fba9aa3f665643efe8699ae0b2e55e5e30281318391079847e2059d5af29471c4dd2b23fa09477aed

data/README.md

@@ -66,3 +66,12 @@ Once the above listed gems are updated all the following services that use cocin
 If you are using this gem in an application that has an API that accepts Cocina models (e.g., SDR API, Dor-Services-App), make sure that the `openapi.yml` for the application includes the schemas that match the schemas in this `openapi.yml`.
 
 This can be accomplished by cutting and pasting these schemas. By convention, these schemas are listed first in the `openapi.yml` of the associated projects, followed by the application-specific schemas.
+
+### Usage conventions
+
+The following are the recommended naming conventions for code using Cocina models:
+
+* cocina_item: Cocina::Models::DRO instance
+* cocina_admin_policy: Cocina::Models::AdminPolicy instance
+* cocina_collection: Cocina::Models::Collection instance
+* cocina_object: Cocina::Models::DRO or Cocina::Models::AdminPolicy or Cocina::Models::Collection instance

data/lib/cocina/models/access_role.rb

@@ -4,7 +4,7 @@ module Cocina
   module Models
     class AccessRole < Struct
       # Name of role
-      attribute :name, Types::Strict::String.enum('sdr-administrator', 'sdr-viewer', 'dor-apo-manager', 'hydrus-collection-creator', 'hydrus-collection-manager', 'hydrus-collection-depositor', 'hydrus-collection-item-depositor', 'hydrus-collection-reviewer', 'hydrus-collection-viewer')
+      attribute :name, Types::Strict::String.enum('dor-apo-creator', 'dor-apo-depositor', 'dor-apo-manager', 'dor-apo-metadata', 'dor-apo-reviewer', 'dor-apo-viewer', 'sdr-administrator', 'sdr-viewer', 'hydrus-collection-creator', 'hydrus-collection-manager', 'hydrus-collection-depositor', 'hydrus-collection-item-depositor', 'hydrus-collection-reviewer', 'hydrus-collection-viewer')
       attribute :members, Types::Strict::Array.of(AccessRoleMember).default([].freeze)
     end
   end

data/lib/cocina/models/descriptive_parallel_event.rb

@@ -3,17 +3,6 @@
 module Cocina
   module Models
     class DescriptiveParallelEvent < 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)
       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)
@@ -23,6 +12,8 @@ module Cocina
       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)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/event.rb

@@ -13,6 +13,7 @@ module Cocina
       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)
+      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
       attribute :parallelEvent, Types::Strict::Array.of(DescriptiveParallelEvent).meta(omittable: true)
     end
   end

data/lib/cocina/models/file_administrative.rb

@@ -3,6 +3,7 @@
 module Cocina
   module Models
     class FileAdministrative < Struct
+      attribute :publish, Types::Strict::Bool.default(false)
       attribute :sdrPreserve, Types::Strict::Bool.default(true)
       attribute :shelve, Types::Strict::Bool.default(false)
     end

data/lib/cocina/models/validator.rb

@@ -7,7 +7,8 @@ module Cocina
       def self.validate(clazz, attributes)
         method_name = clazz.name.split('::').last
         request_operation = root.request_operation(:post, "/validate/#{method_name}")
-        request_operation.validate_request_body('application/json', attributes)
+        # JSON.parse forces serialization of objects like DateTime.
+        request_operation.validate_request_body('application/json', JSON.parse(attributes.to_json))
       rescue OpenAPIParser::OpenAPIError => e
         raise ValidationError, e.message
       end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.51.0'
+    VERSION = '0.54.0.beta.2'
   end
 end

data/openapi.yml

@@ -127,9 +127,14 @@ components:
           description: Name of role
           type: string
           enum:
+            - 'dor-apo-creator'
+            - 'dor-apo-depositor'
+            - 'dor-apo-manager'
+            - 'dor-apo-metadata'
+            - 'dor-apo-reviewer'
+            - 'dor-apo-viewer'
             - 'sdr-administrator'
             - 'sdr-viewer'
-            - 'dor-apo-manager'
             - 'hydrus-collection-creator'
             - 'hydrus-collection-manager'
             - 'hydrus-collection-depositor'
@@ -581,7 +586,6 @@ components:
       type: object
       additionalProperties: false
       allOf:
-        - $ref: "#/components/schemas/DescriptiveValueLanguage"
         - $ref: "#/components/schemas/DescriptiveStructuredValue"
         - type: object
           additionalProperties: false
@@ -617,6 +621,9 @@ components:
               type: array
               items:
                 $ref: "#/components/schemas/DescriptiveValue"
+            valueLanguage:
+              # description: Language of the descriptive element value
+              $ref: "#/components/schemas/DescriptiveValueLanguage"
     DescriptiveParallelValue:
       description: Value model for multiple representations of the same information (e.g. in different languages).
       type: object
@@ -654,27 +661,6 @@ components:
               $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:
-        - $ref: "#/components/schemas/DescriptiveValue"
-        - anyOf:
-            - type: object
-              required:
-                - value
-            - type: object
-              required:
-                - structuredValue
-            - 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
@@ -873,6 +859,9 @@ components:
               type: array
               items:
                 $ref: "#/components/schemas/DescriptiveValue"
+            valueLanguage:
+              # description: Language of the descriptive element value
+              $ref: "#/components/schemas/DescriptiveValueLanguage"
             parallelEvent:
               description: For multiple representations of information about the same event (e.g. in different languages)
               type: array
@@ -970,6 +959,9 @@ components:
       type: object
       additionalProperties: false
       properties:
+        publish:
+          type: boolean
+          default: false
         sdrPreserve:
           type: boolean
           default: true
@@ -977,6 +969,7 @@ components:
           type: boolean
           default: false
       required:
+        - publish
         - sdrPreserve
         - shelve
     FileSet:
@@ -1516,3 +1509,24 @@ components:
           type: string
         source:
           $ref: "#/components/schemas/Source"
+    Title:
+      type: object
+      additionalProperties: false
+      allOf:
+        - $ref: "#/components/schemas/DescriptiveValue"
+        - anyOf:
+            - type: object
+              required:
+                - value
+            - type: object
+              required:
+                - structuredValue
+            - type: object
+              required:
+                - parallelValue
+            - type: object
+              required:
+                - groupedValue
+            - type: object
+              required:
+                - valueAt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.54.0.beta.2
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,7 +314,7 @@ files:
 homepage: https://github.com/sul-dlss/cocina-models
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -325,12 +325,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: Data models for the SDR
 test_files: []