cocina-models 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4ec4084e83d22e7d56aa26eb4f04f60c27b6e1835853d97f73f564fd69e386
-  data.tar.gz: c9b103a96e3b3136fa18faebc2ab1e16c8283f49023ed1198254b94a93905bb9
+  metadata.gz: 70d9bac2712adeb43b42781a4ed699864956854a015932bfb831da7b3d843f4d
+  data.tar.gz: 1da967ea94f5cf122b64e729b1d196c0a5d0d97236c7f95b826c4b1ca76ddc0c
 SHA512:
-  metadata.gz: 95123c04b49be5d4f30398b00668a4df1333e80380a5e37e38b08517a1a5eb5b96f0e282d9f0b4f708c9f3ee5b5f38b40491bce9796a8eee8fa8b14c0faafed4
-  data.tar.gz: 4fef296ad265d59852dd78d32d87bda354c44be1da78a9923f67093b5819695517095a5fe864e6ac35a5db9a57a6de5eb46314720ef580c0afb79033146bbbc8
+  metadata.gz: 982b9aee25afc9e9161a6ca747c156a77fb2bb1b5cd9eb70a2b6c777b70936eb40cf9f6ffbef322edd07ede4b3153fa5661fb3272e400b9f8c0c275fa57a3306
+  data.tar.gz: acbc4799a654401d44b46cbd477d66b4f8fc4937a884c34df13368bbb2250c6c7f4beecbb1d3c20aa4cb5c46f8b2f3857de993a733bed8f00ec99b7a6d6f0e49

data/.github/pull_request_template.md

@@ -3,11 +3,3 @@
 
 
 ## Was the documentation (README, wiki) updated?
-
-
-
-## Does this change affect how this gem integrates with other services?
-
-If so, please confirm:
-- [ ] change was tested on stage    and/or
-- [ ] test added to sul-dlss/infrastructure-integration-test

data/.rubocop.yml

@@ -18,4 +18,4 @@ RSpec/MultipleExpectations:
   Enabled: false
 
 RSpec/ExampleLength:
-  Max: 15
+  Max: 18

data/.rubocop_todo.yml

@@ -1,14 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-02-13 12:54:33 -0500 using RuboCop version 0.79.0.
+# on 2020-03-06 16:50:50 -0800 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 4
+Metrics/AbcSize:
+  Max: 37
+
 # Offense count: 3
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Exclude:
-    - 'spec/cocina/models/dro_spec.rb'
-    - 'spec/cocina/models/request_dro_spec.rb'
+    - 'spec/cocina/models/dro_shared_examples.rb'
+    - 'spec/cocina/models/file_set_shared_examples.rb'

data/docs/maps/DRO.json

@@ -100,6 +100,10 @@
               "description": "Access level for the DRO when released from embargo.",
               "type": "string",
               "enum": ["world", "stanford", "location-based", "citation-only", "dark"]
+            },
+            "useAndReproductionStatement": {
+              "description": "The human readable reuse and reproduction statement that applies to the DRO when released from embargo.",
+              "type": "string"
             }
           }
         },

data/docs/schema.json

@@ -586,6 +586,12 @@
                     "citation-only",
                     "dark"
                   ]
+                },
+                "useAndReproductionStatement": {
+                  "description": "The human readable reuse and reproduction statement that applies to the DRO when released from embargo.",
+                  "type": [
+                    "string"
+                  ]
                 }
               }
             },

data/docs/schema.md

@@ -28,8 +28,8 @@ A group of Digital Repository Objects that indicate some type of conceptual grou
 | **access:download** | *string* | Download level for the Collection metadata.<br/> **one of:**`"world"` or `"stanford"` or `"location-based"` or `"citation-only"` or `"dark"` | `"world"` |
 | **access:embargoReleaseDate** | *date-time* | Date when the Collection is released from an embargo, if an embargo exists. | `"2015-01-01T12:00:00Z"` |
 | **access:license** | *string* | The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.). | `"example"` |
-| **access:useAndReproductionStatement** | *string* | The human readable reuse and reproduction statement that applies to the Collection. | `"example"` |
 | **access:termsOfUse** | *string* | License or terms of use governing reuse of the Collection. Should be a text statement. | `"example"` |
+| **access:useAndReproductionStatement** | *string* | The human readable reuse and reproduction statement that applies to the Collection. | `"example"` |
 | **administrative:created** | *date-time* | When the resource in SDR was created. | `"2015-01-01T12:00:00Z"` |
 | **administrative:deleted** | *boolean* | If the resource has been deleted (but not purged). | `true` |
 | **administrative:gravestoneMessage** | *string* | Message describing why the object was deleted. | `"example"` |
@@ -83,9 +83,10 @@ Domain-defined abstraction of a 'work'. Digital Repository Objects' abstraction
 | **access:download** | *string* | Download level for the DRO metadata.<br/> **one of:**`"world"` or `"stanford"` or `"location-based"` or `"citation-only"` or `"dark"` | `"world"` |
 | **access:embargo:access** | *string* | Access level for the DRO when released from embargo.<br/> **one of:**`"world"` or `"stanford"` or `"location-based"` or `"citation-only"` or `"dark"` | `"world"` |
 | **access:embargo:releaseDate** | *date-time* | Date when the DRO is released from an embargo. | `"2015-01-01T12:00:00Z"` |
+| **access:embargo:useAndReproductionStatement** | *string* | The human readable reuse and reproduction statement that applies to the DRO when released from embargo. | `"example"` |
 | **access:license** | *string* | The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.). | `"example"` |
-| **access:useAndReproductionStatement** | *string* | The human readable reuse and reproduction statement that applies to the DRO. | `"example"` |
 | **access:termsOfUse** | *string* | License or terms of use governing reuse of the DRO. Should be a text statement. | `"example"` |
+| **access:useAndReproductionStatement** | *string* | The human readable reuse and reproduction statement that applies to the DRO. | `"example"` |
 | **access:visibility** | *integer* | Percentage of the DRO that is visibility during an embargo period | `42` |
 | **administrative:created** | *date-time* | When the resource in SDR was created. | `"2015-01-01T12:00:00Z"` |
 | **administrative:deleted** | *boolean* | If the resource has been deleted (but not purged). | `true` |
@@ -265,5 +266,3 @@ A title of a work
 | ------- | ------- | ------- | ------- |
 | **primary** | *boolean* | Is this the primary title for the object | `true` |
 | **titleFull** | *string* | The full title for the object | `"example"` |
-
-

data/lib/cocina/models/admin_policy.rb

@@ -50,9 +50,9 @@ module Cocina
         # which workflow to start when registering (used by Web Archive apos to start wasCrawlPreassemblyWF)
         attribute :registration_workflow, Types::String.optional.default(nil)
 
-        # Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
+        # TODO: Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
         # but I think it's actually required for every Admin Policy
-        attribute :hasAdminPolicy, Types::Coercible::String.optional.default(nil)
+        attribute :hasAdminPolicy, Types::Strict::String.optional.default(nil)
       end
 
       class Identification < Struct
@@ -61,25 +61,8 @@ module Cocina
       class Structural < Struct
       end
 
+      include AdminPolicyAttributes
       attribute :externalIdentifier, Types::Strict::String
-      attribute :type, Types::String.enum(*TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:access, Access.default { Access.new })
-      attribute(:administrative, Administrative.default { Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute(:identification, Identification.default { Identification.new })
-      attribute(:structural, Structural.default { Structural.new })
-
-      def self.from_dynamic(dyn)
-        AdminPolicy.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
     end
   end
 end

data/lib/cocina/models/admin_policy_attributes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # attributes common to both AdminPolicy and RequestAdminPolicy
+    module AdminPolicyAttributes
+      def self.included(obj)
+        obj.attribute(:access, AdminPolicy::Access.default { AdminPolicy::Access.new })
+        obj.attribute(:administrative, AdminPolicy::Administrative.default { AdminPolicy::Administrative.new })
+        # TODO: Allowing description to be omittable for now (until rolled out to consumers),
+        # but I think it's actually required for every admin policy
+        obj.attribute :description, Description.optional.meta(omittable: true)
+        obj.attribute(:identification, AdminPolicy::Identification.default { AdminPolicy::Identification.new })
+        obj.attribute :label, Types::Strict::String
+        obj.attribute(:structural, AdminPolicy::Structural.default { AdminPolicy::Structural.new })
+        obj.attribute :type, Types::String.enum(*AdminPolicy::TYPES)
+        obj.attribute :version, Types::Strict::Integer
+      end
+    end
+  end
+end

data/lib/cocina/models/collection.rb

@@ -2,16 +2,17 @@
 
 module Cocina
   module Models
-    # A digital repository collection.  See http://sul-dlss.github.io/cocina-models/maps/Collection.json
+    # A digital repository collection.
+    # See http://sul-dlss.github.io/cocina-models/maps/Collection.json
     class Collection < Struct
       include Checkable
 
       TYPES = [
         Vocab.collection,
         Vocab.curated_collection,
-        Vocab.user_collection,
         Vocab.exhibit,
-        Vocab.series
+        Vocab.series,
+        Vocab.user_collection
       ].freeze
 
       # Subschema for access concerns
@@ -23,9 +24,9 @@ module Cocina
       # Subschema for administrative concerns
       class Administrative < Struct
         attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).default([].freeze)
-        # Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
-        # but I think it's actually required for every DRO
-        attribute :hasAdminPolicy, Types::Coercible::String.optional.default(nil)
+        # TODO: Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
+        # but I think it's actually required for every Collection
+        attribute :hasAdminPolicy, Types::Strict::String.optional.default(nil)
       end
 
       # Identification sub-schema for the Collection
@@ -36,25 +37,8 @@ module Cocina
       class Structural < Struct
       end
 
+      include CollectionAttributes
       attribute :externalIdentifier, Types::Strict::String
-      attribute :type, Types::String.enum(*TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:access, Access.default { Access.new })
-      attribute(:administrative, Administrative.default { Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute(:identification, Identification.default { Identification.new })
-      attribute(:structural, Structural.default { Structural.new })
-
-      def self.from_dynamic(dyn)
-        Collection.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
     end
   end
 end

data/lib/cocina/models/collection_attributes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # attributes common to both Collection and RequestCollection
+    # See http://sul-dlss.github.io/cocina-models/maps/Collection.json
+    module CollectionAttributes
+      def self.included(obj)
+        obj.attribute(:access, Collection::Access.default { Collection::Access.new })
+        obj.attribute(:administrative, Collection::Administrative.default { Collection::Administrative.new })
+        # TODO: Allowing description to be omittable for now (until rolled out to consumers),
+        # but I think it's actually required for every Collection
+        obj.attribute :description, Description.optional.meta(omittable: true)
+        obj.attribute(:identification, Collection::Identification.default { Collection::Identification.new })
+        obj.attribute :label, Types::Strict::String
+        obj.attribute(:structural, Collection::Structural.default { Collection::Structural.new })
+        obj.attribute :type, Types::String.enum(*Collection::TYPES)
+        obj.attribute :version, Types::Strict::Integer
+      end
+    end
+  end
+end

data/lib/cocina/models/dro.rb

@@ -2,7 +2,8 @@
 
 module Cocina
   module Models
-    # A digital repository object.  See http://sul-dlss.github.io/cocina-models/maps/DRO.json
+    # A digital repository object.
+    # See http://sul-dlss.github.io/cocina-models/maps/DRO.json
     class DRO < Struct
       include Checkable
 
@@ -31,21 +32,22 @@ module Cocina
           attribute :releaseDate, Types::Params::DateTime
           attribute :access, Types::String.default('dark')
                                           .enum('world', 'stanford', 'location-based', 'citation-only', 'dark')
+          attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
         end
 
-        attribute :embargo, Embargo.optional.meta(omittable: true)
         attribute :access, Types::String.default('dark')
                                         .enum('world', 'stanford', 'location-based', 'citation-only', 'dark')
         attribute :copyright, Types::Strict::String.meta(omittable: true)
+        attribute :embargo, Embargo.optional.meta(omittable: true)
         attribute :useAndReproductionStatement, Types::Strict::String.meta(omittable: true)
       end
 
       # Subschema for administrative concerns
       class Administrative < Struct
-        attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).meta(omittable: true).default([].freeze)
-        # Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
+        # TODO: Allowing hasAdminPolicy to be omittable for now (until rolled out to consumers),
         # but I think it's actually required for every DRO
-        attribute :hasAdminPolicy, Types::Coercible::String.optional.default(nil)
+        attribute :hasAdminPolicy, Types::Strict::String.optional.default(nil)
+        attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).meta(omittable: true).default([].freeze)
       end
 
       # Identification sub-schema for the DRO
@@ -54,7 +56,12 @@ module Cocina
         attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
       end
 
-      # Structural sub-schema for the DRO
+      # Geographic sub-schema for the DRO
+      class Geographic < Struct
+        attribute :iso19139, Types::Strict::String
+      end
+
+      # Structural sub-schema for the DRO (uses FileSet, unlike RequestDRO which uses RequestFileSet)
       class Structural < Struct
         attribute :contains, Types::Strict::Array.of(FileSet).meta(omittable: true)
         attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
@@ -62,32 +69,10 @@ module Cocina
         attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
       end
 
-      # Geographic sub-schema for the DRO
-      class Geographic < Struct
-        attribute :iso19139, Types::Strict::String
-      end
-
+      include DroAttributes
       attribute :externalIdentifier, Types::Strict::String
-      attribute :type, Types::String.enum(*TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:access, Access.default { Access.new })
-      attribute(:administrative, Administrative.default { Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute :geographic, Geographic.optional.meta(omittable: true)
-      attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, Structural.default { Structural.new })
 
-      def self.from_dynamic(dyn)
-        DRO.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
-
       def image?
         type == Vocab.image
       end

data/lib/cocina/models/dro_attributes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # attributes common to both DRO and RequestDRO
+    # See http://sul-dlss.github.io/cocina-models/maps/DRO.json
+    module DroAttributes
+      def self.included(obj)
+        obj.attribute(:access, DRO::Access.default { DRO::Access.new })
+        obj.attribute(:administrative, DRO::Administrative.default { DRO::Administrative.new })
+        # TODO: Allowing description to be omittable for now (until rolled out to consumers),
+        # but I think it's actually required for every DRO
+        obj.attribute :description, Description.optional.meta(omittable: true)
+        obj.attribute :geographic, DRO::Geographic.optional.meta(omittable: true)
+        obj.attribute(:identification, DRO::Identification.default { DRO::Identification.new })
+        obj.attribute :label, Types::Strict::String
+        obj.attribute :type, Types::String.enum(*DRO::TYPES)
+        obj.attribute :version, Types::Strict::Integer
+      end
+    end
+  end
+end

data/lib/cocina/models/file.rb

@@ -2,7 +2,8 @@
 
 module Cocina
   module Models
-    # Metadata for a file.  See http://sul-dlss.github.io/cocina-models/maps/File.json
+    # Metadata for a file.
+    # See http://sul-dlss.github.io/cocina-models/maps/File.json
     class File < Struct
       include Checkable
 
@@ -18,50 +19,30 @@ module Cocina
 
       # Represents the administration of the file
       class Administrative < Struct
-        attribute :sdrPreserve, Types::Params::Bool.optional.default(false)
-        attribute :shelve, Types::Params::Bool.optional.default(false)
+        attribute :sdrPreserve, Types::Strict::Bool.optional.default(false)
+        attribute :shelve, Types::Strict::Bool.optional.default(false)
       end
 
-      class Identification < Struct
-      end
-
-      class Structural < Struct
-      end
-
-      # Represents a digest value for a file
+      # Represents a digest (checksum) value for a file
       class Fixity < Struct
         attribute :type, Types::String.enum('md5', 'sha1')
         attribute :digest, Types::Strict::String
       end
 
+      class Identification < Struct
+      end
+
       # Represents some technical aspect of the file
       class Presentation < Struct
-        attribute :height, Types::Coercible::Integer.optional.default(nil)
-        attribute :width, Types::Coercible::Integer.optional.default(nil)
+        attribute :height, Types::Strict::Integer.optional.default(nil)
+        attribute :width, Types::Strict::Integer.optional.default(nil)
       end
 
-      attribute(:access, Access.optional.default { Access.new })
-      attribute(:administrative, Administrative.default { Administrative.new })
-      attribute :externalIdentifier, Types::Strict::String
-      attribute :type, Types::String.enum(*TYPES)
-      attribute :label, Types::Strict::String
-      attribute :filename, Types::String.optional.default(nil)
-      attribute :use, Types::String.enum('transcription').optional.meta(omittable: true)
-      attribute :size, Types::Coercible::Integer.optional.default(nil)
-      attribute :hasMessageDigests, Types::Strict::Array.of(Fixity).default([].freeze)
-      attribute :hasMimeType, Types::String.optional.meta(omittable: true)
-      attribute :presentation, Presentation.optional.meta(omittable: true)
-      attribute :version, Types::Coercible::Integer
-      attribute :identification, Identification.optional.meta(omittable: true)
-      attribute :structural, Structural.optional.meta(omittable: true)
-
-      def self.from_dynamic(dyn)
-        File.new(dyn)
+      class Structural < Struct
       end
 
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
+      include FileAttributes
+      attribute :externalIdentifier, Types::Strict::String
     end
   end
 end

data/lib/cocina/models/file_attributes.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # attributes common to both File and RequestFile
+    # See http://sul-dlss.github.io/cocina-models/maps/File.json
+    module FileAttributes
+      def self.included(obj)
+        obj.attribute(:access, File::Access.optional.default { File::Access.new })
+        obj.attribute(:administrative, File::Administrative.default { File::Administrative.new })
+        obj.attribute :label, Types::Strict::String
+        obj.attribute :filename, Types::String.optional.default(nil)
+        obj.attribute :identification, File::Identification.optional.meta(omittable: true)
+        obj.attribute :hasMessageDigests, Types::Strict::Array.of(File::Fixity).default([].freeze)
+        obj.attribute :hasMimeType, Types::String.optional.meta(omittable: true)
+        obj.attribute :presentation, File::Presentation.optional.meta(omittable: true)
+        obj.attribute :size, Types::Strict::Integer.optional.default(nil)
+        obj.attribute :structural, File::Structural.optional.meta(omittable: true)
+        obj.attribute :type, Types::String.enum(*File::TYPES)
+        obj.attribute :use, Types::String.enum('transcription').optional.meta(omittable: true)
+        obj.attribute :version, Types::Strict::Integer
+      end
+    end
+  end
+end

data/lib/cocina/models/file_set.rb

@@ -2,7 +2,8 @@
 
 module Cocina
   module Models
-    # Metadata for a File Set.  See http://sul-dlss.github.io/cocina-models/maps/Fileset.json
+    # Metadata for a file set.
+    # See http://sul-dlss.github.io/cocina-models/maps/Fileset.json
     class FileSet < Struct
       include Checkable
 
@@ -13,25 +14,14 @@ module Cocina
       class Identification < Struct
       end
 
-      # Structural sub-schema for the FileSet
+      # Structural sub-schema that contains File (unlike the one in RequestFileSet which contains RequestFile)
       class Structural < Struct
         attribute :contains, Types::Strict::Array.of(Cocina::Models::File).meta(omittable: true)
       end
 
+      include FileSetAttributes
       attribute :externalIdentifier, Types::Strict::String
-      attribute :type, Types::String.enum(*TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, Structural.default { Structural.new })
-
-      def self.from_dynamic(dyn)
-        FileSet.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
     end
   end
 end

data/lib/cocina/models/file_set_attributes.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # attributes common to both FileSet and RequestFileSet
+    # See http://sul-dlss.github.io/cocina-models/maps/Fileset.json
+    module FileSetAttributes
+      def self.included(obj)
+        obj.attribute(:identification, FileSet::Identification.default { FileSet::Identification.new })
+        obj.attribute :label, Types::Strict::String
+        obj.attribute :type, Types::String.enum(*FileSet::TYPES)
+        obj.attribute :version, Types::Strict::Integer
+      end
+    end
+  end
+end

data/lib/cocina/models/release_tag.rb

@@ -9,11 +9,7 @@ module Cocina
       # we use 'when' other places, but that's reserved word, so 'date' it is!
       attribute :date, Types::Params::DateTime
       attribute :who, Types::Strict::String
-      attribute :release, Types::Params::Bool
-
-      def self.from_dynamic(dyn)
-        ReleaseTag.new(dyn)
-      end
+      attribute :release, Types::Strict::Bool
     end
   end
 end

data/lib/cocina/models/request_admin_policy.rb

@@ -2,27 +2,10 @@
 
 module Cocina
   module Models
-    # An request to create an AdminPolicy object.
-    # This is the same as AdminPolicy, except it doesn't have externalIdentifier.
+    # A request to create an AdminPolicy object.
+    # This is the same as an AdminPolicy, but without externalIdentifier (as that wouldn't have been created yet).
     class RequestAdminPolicy < Struct
-      attribute :type, Types::String.enum(*AdminPolicy::TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:access, AdminPolicy::Access.default { AdminPolicy::Access.new })
-      attribute(:administrative, AdminPolicy::Administrative.default { AdminPolicy::Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute(:identification, AdminPolicy::Identification.default { AdminPolicy::Identification.new })
-      attribute(:structural, AdminPolicy::Structural.default { AdminPolicy::Structural.new })
-
-      def self.from_dynamic(dyn)
-        RequestAdminPolicy.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
+      include AdminPolicyAttributes
     end
   end
 end

data/lib/cocina/models/request_collection.rb

@@ -3,27 +3,10 @@
 module Cocina
   module Models
     # A request to create a digital repository collection.
-    # This is the same as Collection, except it doesn't have externalIdentifier.
+    # This is the same as a Collection, but without externalIdentifier (as that wouldn't have been created yet).
     # See http://sul-dlss.github.io/cocina-models/maps/Collection.json
     class RequestCollection < Struct
-      attribute :type, Types::String.enum(*Collection::TYPES)
-      attribute :label, Types::Strict::String
-      attribute :version, Types::Coercible::Integer
-      attribute(:access, Collection::Access.default { Collection::Access.new })
-      attribute(:administrative, Collection::Administrative.default { Collection::Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute(:identification, Collection::Identification.default { Collection::Identification.new })
-      attribute(:structural, Collection::Structural.default { Collection::Structural.new })
-
-      def self.from_dynamic(dyn)
-        RequestCollection.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
+      include CollectionAttributes
     end
   end
 end

data/lib/cocina/models/request_dro.rb

@@ -2,8 +2,8 @@
 
 module Cocina
   module Models
-    # A Request to create a digital repository object. (to create) object.
-    # This is same as a DRO, but without externalIdentifier (as that wouldn't have been created yet)
+    # A request to create a digital repository object.
+    # This is the 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)
@@ -13,25 +13,8 @@ module Cocina
         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
-      attribute(:access, DRO::Access.default { DRO::Access.new })
-      attribute(:administrative, DRO::Administrative.default { DRO::Administrative.new })
-      # Allowing description to be omittable for now (until rolled out to consumers),
-      # but I think it's actually required for every DRO
-      attribute :description, Description.optional.meta(omittable: true)
-      attribute :geographic, DRO::Geographic.optional.meta(omittable: true)
-      attribute(:identification, DRO::Identification.default { DRO::Identification.new })
+      include DroAttributes
       attribute(:structural, Structural.default { Structural.new })
-
-      def self.from_dynamic(dyn)
-        RequestDRO.new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
     end
   end
 end

data/lib/cocina/models/request_file.rb

@@ -2,31 +2,11 @@
 
 module Cocina
   module Models
-    # A request to create a file.
-    # This is same as a File, but without externalIdentifier (as that wouldn't have been created yet)
+    # a request to create a File object.
+    # This is the same as a File, but without externalIdentifier (as that wouldn't have been created yet)
     # See http://sul-dlss.github.io/cocina-models/maps/File.json
     class RequestFile < Struct
-      attribute(:access, File::Access.optional.default { File::Access.new })
-      attribute(:administrative, File::Administrative.default { File::Administrative.new })
-      attribute :type, Types::String.enum(*File::TYPES)
-      attribute :label, Types::Strict::String
-      attribute :filename, Types::String.optional.default(nil)
-      attribute :use, Types::String.enum('transcription').optional.meta(omittable: true)
-      attribute :size, Types::Coercible::Integer.optional.default(nil)
-      attribute :hasMessageDigests, Types::Strict::Array.of(File::Fixity).default([].freeze)
-      attribute :hasMimeType, Types::String.optional.meta(omittable: true)
-      attribute :presentation, File::Presentation.optional.meta(omittable: true)
-      attribute :version, Types::Coercible::Integer
-      attribute :identification, File::Identification.optional.meta(omittable: true)
-      attribute :structural, File::Structural.optional.meta(omittable: true)
-
-      def self.from_dynamic(dyn)
-        new(dyn)
-      end
-
-      def self.from_json(json)
-        from_dynamic(JSON.parse(json))
-      end
+      include FileAttributes
     end
   end
 end

data/lib/cocina/models/request_file_set.rb

@@ -2,18 +2,16 @@
 
 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)
+    # A request to create a FileSet object.
+    # This is the 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
-      # Structural sub-schema that contains RequestFile (unlike the FileSet which contains File)
+      # Structural sub-schema that contains RequestFile (unlike the one in FileSet which contains File)
       class Structural < Struct
         attribute :contains, Types::Strict::Array.of(RequestFile).meta(omittable: true)
       end
-      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 })
+
+      include FileSetAttributes
       attribute(:structural, Structural.default { Structural.new })
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.26.0'
+    VERSION = '0.27.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -177,13 +177,18 @@ files:
 - docs/schema.md
 - lib/cocina/models.rb
 - lib/cocina/models/admin_policy.rb
+- lib/cocina/models/admin_policy_attributes.rb
 - lib/cocina/models/catalog_link.rb
 - lib/cocina/models/checkable.rb
 - lib/cocina/models/collection.rb
+- lib/cocina/models/collection_attributes.rb
 - lib/cocina/models/description.rb
 - lib/cocina/models/dro.rb
+- lib/cocina/models/dro_attributes.rb
 - lib/cocina/models/file.rb
+- lib/cocina/models/file_attributes.rb
 - lib/cocina/models/file_set.rb
+- lib/cocina/models/file_set_attributes.rb
 - lib/cocina/models/release_tag.rb
 - lib/cocina/models/request_admin_policy.rb
 - lib/cocina/models/request_collection.rb