cocina-models 0.22.2 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d0b9a2418a1c864d36b39293f1e89935519609a9e592594494bc332c0cf601
-  data.tar.gz: 59d36afc29361ed9fb1c8d26eb4506bf60b13f697a246a482ac08ef89adaf12c
+  metadata.gz: 2dc7592c5fa321edb532d65c8fbfc414676a369eaa25220621a8f67340dc129f
+  data.tar.gz: 6390945b434de4426e2d12d1d1c046536291bafbb5897114dd1c07eb8c55202b
 SHA512:
-  metadata.gz: e0b4a1d3455d766b58fd3888b84917844a1854e1949bfc201089cfe88eb5893863f2f6d479fe33ddd62165feba1b3777bf5cb5d688f90a48ca6ec7099e92918b
-  data.tar.gz: 58d2204a1b24673dd719c51ee1b2623e48a94f6d72b47aea4a33ae1a7687d58ff13ccc3e01f47e919b30bedeb6f8f48709e03b072cde91b695683598a15b7d9e
+  metadata.gz: 8d893d0989d3bdb6aab1816a140fe0d8d68b2f46371c370e74eedceb0cb9266f0e868eddee407345e0763c0a68fba62d51db7a490c047e4c9be3e759393d1147
+  data.tar.gz: 4c3e96c91e667979dbac2992bee8d469a127401f66c1e0a76fe196310c6e8d5c407af225fbd0405ccc939787560b81ae1ecfacb0447498ca71b26928104a6f85

data/lib/cocina/models/file.rb

@@ -46,13 +46,13 @@ module Cocina
       attribute :type, Types::String.enum(*TYPES)
       attribute :label, Types::Strict::String
       attribute :filename, Types::String.optional.default(nil)
-      attribute :use, Types::String.enum('original', 'preservation', 'access').optional.default(nil)
+      attribute :use, Types::String.enum('original', 'preservation', 'access').optional.meta(omittable: true)
       attribute :size, Types::Coercible::Integer.optional.default(nil)
       attribute :hasMessageDigests, Types::Strict::Array.of(Fixity).default([].freeze)
-      attribute(:presentation, Presentation.optional.default { Presentation.new })
+      attribute(:presentation, Presentation.optional.meta(omittable: true))
       attribute :version, Types::Coercible::Integer
-      attribute(:identification, Identification.default { Identification.new })
-      attribute(:structural, Structural.default { Structural.new })
+      attribute(:identification, Identification.optional.meta(omittable: true))
+      attribute(:structural, Structural.optional.meta(omittable: true))
 
       def self.from_dynamic(dyn)
         File.new(dyn)

data/lib/cocina/models/request_dro.rb

@@ -6,6 +6,13 @@ module Cocina
     # This is same as a DRO, but without externalIdentifier (as that wouldn't have been created yet)
     # See http://sul-dlss.github.io/cocina-models/maps/DRO.json
     class RequestDRO < Struct
+      # Structural sub-schema that contains RequestFileSet (unlike the DRO which contains FileSet)
+      class Structural < Struct
+        attribute :contains, Types::Strict::Array.of(RequestFileSet).meta(omittable: true)
+        attribute :isMemberOf, Types::Strict::String.meta(omittable: true)
+        attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
+      end
+
       attribute :type, Types::String.enum(*DRO::TYPES)
       attribute :label, Types::Strict::String
       attribute :version, Types::Coercible::Integer
@@ -15,7 +22,7 @@ module Cocina
       # but I think it's actually required for every DRO
       attribute :description, Description.optional.meta(omittable: true)
       attribute(:identification, DRO::Identification.default { DRO::Identification.new })
-      attribute(:structural, DRO::Structural.default { DRO::Structural.new })
+      attribute(:structural, Structural.default { Structural.new })
 
       def self.from_dynamic(dyn)
         RequestDRO.new(dyn)

data/lib/cocina/models/request_file_set.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # A Request to create a FileSet object.
+    # This is same as a FileSet, but without externalIdentifier (as that wouldn't have been created yet)
+    # See http://sul-dlss.github.io/cocina-models/maps/FileSet.json
+    class RequestFileSet < Struct
+      attribute :type, Types::String.enum(*FileSet::TYPES)
+      attribute :label, Types::Strict::String
+      attribute :version, Types::Coercible::Integer
+      attribute(:identification, FileSet::Identification.default { FileSet::Identification.new })
+      attribute(:structural, FileSet::Structural.default { FileSet::Structural.new })
+    end
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.22.2'
+    VERSION = '0.23.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -188,6 +188,7 @@ files:
 - lib/cocina/models/request_admin_policy.rb
 - lib/cocina/models/request_collection.rb
 - lib/cocina/models/request_dro.rb
+- lib/cocina/models/request_file_set.rb
 - lib/cocina/models/sequence.rb
 - lib/cocina/models/types.rb
 - lib/cocina/models/version.rb
@@ -210,7 +211,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