cocina-models 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae254699614b4355dea34dab3e0ef324123b21d30d592c24ceffbad5fed3515e
-  data.tar.gz: da8eecbff7bec360ed56445d61fc558b4a18684df9f0f92bc4a98668e2d16dac
+  metadata.gz: 10987f18b2d6489790ca3edbcead8ff6aa2fedfbca1bcb18d5606b8112c88f7e
+  data.tar.gz: 1431af2debd70299b4574997d842f0107ce356b44b67123deedf237b08f669b9
 SHA512:
-  metadata.gz: 4c6c2e1beb7cd1b28d73bee2641be223497e18764bbffae9953fde54995336ae970be70e8d1ac31fa96f131ad9c17a02b2a5ef7b9e9beb098ecf9925899333ad
-  data.tar.gz: 53246fecec8a7e4516aa3fef318dddfa644158678f4894d1eeb1285d0c247b6a2bdafd68a491ae18b19e41fa5a195bc2f078ba303adb9f83f37b26c4121585cf
+  metadata.gz: ff3ba29a4e6ca6a23bb55bdb12a2a4ef26852468155d812e9572a07b0711e6e22e549fbd186985e62b3b6e90deb501d938db62cf73c61823c80759a5d2b40fcc
+  data.tar.gz: a480849d853c21828d5830f6227d9e169a1f9cefac484038ebd6d0f0d661d9c40e44e217e15cd62f80a9efcfad2a51ad8c009fbe6048040475c21a5f4485228e

data/.rubocop.yml

@@ -22,6 +22,10 @@ RSpec/MultipleExpectations:
 
 RSpec/ExampleLength:
   Max: 18
+  Exclude:
+    - spec/cocina/models/description_spec.rb
+    - spec/cocina/models/dro_shared_examples.rb
+
 
 Style/Documentation:
   Exclude:

data/README.md

@@ -7,12 +7,14 @@
 
 This is a Ruby implementation of the SDR data model (named "COCINA"). The data being modeled includes digital repository objects.
 
-It provides a way for consumers to validate objects against models using dry-struct and dry-types gems.
+Validation is performed by openapi (using OpenAPIParser). Modeling is provided by dry-struct and dry-types. Together, these provide a way for consumers to validate objects against models and to manipulate thos objects.
 
 This is a work in progress that will ultimately implement the full [COCINA data model](http://sul-dlss.github.io/cocina-models/). See also [architecture documentation](https://sul-dlss.github.io/taco-truck/COCINA.html#cocina-data-models--shapes).
 
 ## Generate models from openapi.yml
 
+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.
+
 ### All
 ```
 exe/generator generate

data/lib/cocina/generator/schema.rb

@@ -5,12 +5,7 @@ module Cocina
     # Class for generating from an openapi schema
     class Schema < SchemaBase
       def schema_properties
-        @schema_properties ||= schema_doc.properties.map do |key, properties_doc|
-          property_class_for(properties_doc).new(properties_doc,
-                                                 key: key,
-                                                 required: schema_doc.requires?(properties_doc),
-                                                 parent: self)
-        end
+        @schema_properties ||= (properties + all_of_properties).uniq(&:key)
       end
 
       def generate
@@ -54,7 +49,7 @@ module Cocina
 
       def types
         type_properties_doc = schema_doc.properties['type']
-        return '' if type_properties_doc.nil?
+        return '' if type_properties_doc.nil? || type_properties_doc.enum.nil?
 
         types_list = type_properties_doc.enum.map { |item| "'#{item}'" }.join(",\n ")
 
@@ -70,7 +65,7 @@ module Cocina
 
         <<~RUBY
           def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-            Validator.validate(self, attributes.with_indifferent_access) if validate
+            Validator.validate(self, attributes.with_indifferent_access) if validate && name
             super(attributes, safe, &block)
                 end
         RUBY
@@ -79,6 +74,32 @@ module Cocina
       def validatable?
         !schema_doc.node_context.document.paths["/validate/#{schema_doc.name}"].nil?
       end
+
+      def properties
+        schema_properties_for(schema_doc)
+      end
+
+      def all_of_properties
+        all_of_properties_for(schema_doc)
+      end
+
+      def all_of_properties_for(doc)
+        return [] if doc.all_of.nil?
+
+        doc.all_of.map do |all_of_schema|
+          # All of for this + recurse
+          schema_properties_for(all_of_schema) + all_of_properties_for(all_of_schema)
+        end.flatten
+      end
+
+      def schema_properties_for(doc)
+        doc.properties.map do |key, properties_doc|
+          property_class_for(properties_doc).new(properties_doc,
+                                                 key: key,
+                                                 required: doc.requires?(properties_doc),
+                                                 parent: self)
+        end
+      end
     end
   end
 end

data/lib/cocina/generator/schema_array.rb

@@ -5,7 +5,7 @@ module Cocina
     # Class for generating from an openapi array
     class SchemaArray < SchemaBase
       def generate
-        "attribute :#{name.camelize(:lower)}, Types::Strict::Array.of(#{schema_doc.items.name})#{omittable}"
+        "attribute :#{name.camelize(:lower)}, Types::Strict::Array.of(#{array_of_type})#{omittable}"
       end
 
       def omittable
@@ -15,6 +15,10 @@ module Cocina
           '.meta(omittable: true)'
         end
       end
+
+      def array_of_type
+        schema_doc.items.name || "Types::#{dry_datatype(schema_doc.items)}"
+      end
     end
   end
 end

data/lib/cocina/generator/schema_base.rb

@@ -44,6 +44,28 @@ module Cocina
 
         "# example: #{schema_doc.example}\n"
       end
+
+      def dry_datatype(doc)
+        case doc.type
+        when 'integer'
+          'Strict::Integer'
+        when 'string'
+          string_dry_datatype(doc)
+        when 'boolean'
+          'Strict::Bool'
+        else
+          raise "#{schema_doc.type} not supported"
+        end
+      end
+
+      def string_dry_datatype(doc)
+        case doc.format
+        when 'date-time'
+          'Params::DateTime'
+        else
+          'Strict::String'
+        end
+      end
     end
   end
 end

data/lib/cocina/generator/schema_value.rb

@@ -6,34 +6,12 @@ module Cocina
     class SchemaValue < SchemaBase
       # rubocop:disable Metrics/LineLength
       def generate
-        "#{description}#{example}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype}#{default}#{enum}#{omittable}"
+        "#{description}#{example}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype(schema_doc)}#{default}#{enum}#{omittable}"
       end
       # rubocop:enable Metrics/LineLength
 
       private
 
-      def dry_datatype
-        case schema_doc.type
-        when 'integer'
-          'Strict::Integer'
-        when 'string'
-          string_dry_datatype
-        when 'boolean'
-          'Strict::Bool'
-        else
-          raise "#{schema_doc.type} not supported"
-        end
-      end
-
-      def string_dry_datatype
-        case schema_doc.format
-        when 'date-time'
-          'Params::DateTime'
-        else
-          'Strict::String'
-        end
-      end
-
       def enum
         return '' unless schema_doc.enum
 

data/lib/cocina/models.rb

@@ -78,7 +78,7 @@ module Cocina
               else
                 raise UnknownTypeError, "Unknown type: '#{dyn.fetch('type')}'"
               end
-      clazz.new(dyn, validate: validate)
+      clazz.new(dyn, false, validate)
     end
 
     # @param [Hash] dyn a ruby hash representation of the JSON serialization of a request for a Collection or DRO
@@ -98,7 +98,7 @@ module Cocina
               else
                 raise UnknownTypeError, "Unknown type: '#{dyn.fetch('type')}'"
               end
-      clazz.new(dyn, validate: validate)
+      clazz.new(dyn, false, validate)
     end
   end
 end

data/lib/cocina/models/admin_policy.rb

@@ -17,7 +17,7 @@ module Cocina
       attribute :description, Description.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/applies_to.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class AppliesTo < Struct
+      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/collection.rb

@@ -26,7 +26,7 @@ module Cocina
       attribute :identification, CollectionIdentification.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/contributor.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class Contributor < Struct
+      attribute :name, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # Entity type of the contributor (person, organization, etc.).
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the contributor relative to other parallel contributors.
+      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :role, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/description.rb

@@ -3,7 +3,23 @@
 module Cocina
   module Models
     class Description < Struct
-      attribute :title, Types::Strict::Array.of(Title).default([].freeze)
+      attribute :title, Types::Strict::Array.of(DescriptiveValueRequired).default([].freeze)
+      attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
+      attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
+      attribute :form, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :language, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      # Stanford persistent URL associated with the resource.
+      attribute :purl, Types::Strict::String.meta(omittable: true)
+      attribute :url, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :marcEncodedData, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
+
+      def self.new(attributes = default_attributes, safe = false, validate = true, &block)
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
+        super(attributes, safe, &block)
+      end
     end
   end
 end

data/lib/cocina/models/descriptive_admin_metadata.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveAdminMetadata < Struct
+      attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
+      attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
+      attribute :language, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_basic_value.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveBasicValue < Struct
+      # String value of the descriptive element.
+      attribute :value, Types::Strict::String.meta(omittable: true)
+      # Type of value provided by the descriptive element.
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the descriptive element relative to other instances of the element.
+      attribute :status, Types::Strict::String.meta(omittable: true)
+      # Code value of the descriptive element.
+      attribute :code, Types::Strict::String.meta(omittable: true)
+      # URI value of the descriptive element.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :standard, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :encoding, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :source, Source.optional.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_structured_value.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveStructuredValue < Struct
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_value.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveValue < Struct
+      # String value of the descriptive element.
+      attribute :value, Types::Strict::String.meta(omittable: true)
+      # Type of value provided by the descriptive element.
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the descriptive element relative to other instances of the element.
+      attribute :status, Types::Strict::String.meta(omittable: true)
+      # Code value of the descriptive element.
+      attribute :code, Types::Strict::String.meta(omittable: true)
+      # URI value of the descriptive element.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :standard, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :encoding, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :source, Source.optional.meta(omittable: true)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/descriptive_value_required.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class DescriptiveValueRequired < Struct
+      # String value of the descriptive element.
+      attribute :value, Types::Strict::String.meta(omittable: true)
+      # Type of value provided by the descriptive element.
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Status of the descriptive element relative to other instances of the element.
+      attribute :status, Types::Strict::String.meta(omittable: true)
+      # Code value of the descriptive element.
+      attribute :code, Types::Strict::String.meta(omittable: true)
+      # URI value of the descriptive element.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :standard, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :encoding, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
+      attribute :source, Source.optional.meta(omittable: true)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/dro.rb

@@ -38,7 +38,7 @@ module Cocina
       attribute :geographic, Geographic.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/event.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class Event < Struct
+      # Description of the event (creation, publication, etc.).
+      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :date, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
+      attribute :location, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/request_admin_policy.rb

@@ -15,7 +15,7 @@ module Cocina
       attribute :description, Description.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/request_collection.rb

@@ -21,7 +21,7 @@ module Cocina
       attribute :identification, CollectionIdentification.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/request_dro.rb

@@ -33,7 +33,7 @@ module Cocina
       attribute :geographic, Geographic.optional.meta(omittable: true)
 
       def self.new(attributes = default_attributes, safe = false, validate = true, &block)
-        Validator.validate(self, attributes.with_indifferent_access) if validate
+        Validator.validate(self, attributes.with_indifferent_access) if validate && name
         super(attributes, safe, &block)
       end
     end

data/lib/cocina/models/source.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class Source < Struct
+      # Code representing the value source.
+      attribute :code, Types::Strict::String.meta(omittable: true)
+      # URI for the value source.
+      attribute :uri, Types::Strict::String.meta(omittable: true)
+      # String describing the value source.
+      attribute :value, Types::Strict::String.meta(omittable: true)
+    end
+  end
+end

data/lib/cocina/models/validator.rb

@@ -4,12 +4,6 @@ module Cocina
   module Models
     # Perform validation against openapi
     class Validator
-      # rubocop:disable Style/ClassVars
-      def self.root
-        @@root ||=  OpenAPIParser.parse(YAML.load_file('openapi.yml'))
-      end
-      # rubocop:enable Style/ClassVars
-
       def self.validate(clazz, attributes)
         method_name = clazz.name.split('::').last
         request_operation = root.request_operation(:post, "/validate/#{method_name}")
@@ -17,6 +11,18 @@ module Cocina
       rescue OpenAPIParser::OpenAPIError => e
         raise ValidationError, e.message
       end
+
+      # rubocop:disable Style/ClassVars
+      def self.root
+        @@root ||= OpenAPIParser.parse(YAML.load_file(openapi_path))
+      end
+      # rubocop:enable Style/ClassVars
+      private_class_method :root
+
+      def self.openapi_path
+        ::File.expand_path('../../../openapi.yml', __dir__)
+      end
+      private_class_method :openapi_path
     end
   end
 end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.30.0'
+    VERSION = '0.31.0'
   end
 end

data/openapi.yml

@@ -79,7 +79,18 @@ paths:
       responses:
         '200':
           description: noop
-
+  /validate/Description:
+    post:
+      summary: Validate a Description
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Description'
+      responses:
+        '200':
+          description: noop
 components:
   schemas:
     Access:
@@ -144,6 +155,15 @@ components:
           type: string
         hasAdminPolicy:
           type: string
+    AppliesTo:
+      description: Property model for indicating the parts, aspects, or versions of the resource to which a
+        descriptive element is applicable.
+      type: object
+      properties:
+        appliesTo:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveBasicValue"
     CatalogLink:
       type: object
       required:
@@ -201,14 +221,164 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+    Contributor:
+      description: Property model for describing agents contributing in some way to
+        the creation and history of the resource
+      type: object
+      properties:
+        name:
+          description: Names associated with a contributor.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        type:
+          description: Entity type of the contributor (person, organization, etc.).
+          type: string
+        status:
+          description: Status of the contributor relative to other parallel contributors.
+          type: string
+        role:
+          description: Relationships of the contributor to the resource or to an event
+            in its history.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+    DescriptiveAdminMetadata:
+      description: Information about this description of the resource.
+      type: object
+      properties:
+        contributor:
+          type: array
+          items:
+            $ref: "#/components/schemas/Contributor"
+        event:
+          type: array
+          items:
+            $ref: "#/components/schemas/Event"
+        language:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        note:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+    DescriptiveBasicValue:
+      description: Value model for descriptive elements without recursive properties.
+      type: object
+      properties:
+        value:
+          description: String value of the descriptive element.
+          type: string
+        type:
+          description: Type of value provided by the descriptive element.
+          type: string
+        status:
+          description: Status of the descriptive element relative to other instances
+            of the element.
+          type: string
+        code:
+          description: Code value of the descriptive element.
+          type: string
+        uri:
+          description: URI value of the descriptive element.
+          type: string
+          format: uri
+        standard:
+          description: Descriptive or content standard to which the value conforms.
+          type: array
+          items:
+            type: string
+        encoding:
+          description: Encoding schema, standard, or syntax to which the value conforms.
+          type: array
+          items:
+            type: string
+        source:
+          $ref: "#/components/schemas/Source"
+    DescriptiveStructuredValue:
+      description: Value model for descriptive elements structured as typed values.
+      type: object
+      properties:
+        structuredValue:
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveBasicValue"
+    DescriptiveValue:
+      description: Default value model for descriptive elements.
+      type: object
+      allOf:
+        - $ref: "#/components/schemas/DescriptiveBasicValue"
+        - $ref: "#/components/schemas/DescriptiveStructuredValue"
+        - $ref: "#/components/schemas/AppliesTo"
+    DescriptiveValueRequired:
+      type: object
+      allOf:
+        - $ref: "#/components/schemas/DescriptiveValue"
+        - anyOf:
+            - type: object
+              required:
+                - value
+            - type: object
+            - required:
+                - structuredValue
     Description:
-      description: Descriptive metadata
       type: object
       properties:
         title:
+          description: Titles of the resource.
+          type: array
+          minItems: 1
+          items:
+            $ref: "#/components/schemas/DescriptiveValueRequired"
+        contributor:
+          description: Agents contributing in some way to the creation and history of the
+            resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/Contributor"
+        event:
+          description: Events in the history of the resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/Event"
+        form:
+          description: Characteristics of the resource's physical, digital, and intellectual
+            form and genre.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        language:
+          description: Languages, scripts, and notations used in all or part of a resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        note:
+          description: Additional information relevant to a resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        identifier:
+          description: Unique strings associated with the resource.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        purl:
+          description: Stanford persistent URL associated with the resource.
+          type: string
+          format: uri
+        url:
+          description: URLs where the resource may be accessed in full or part.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        marcEncodedData:
+          description: Data about the resource represented in MARC fixed fields and codes.
           type: array
           items:
-            $ref: '#/components/schemas/Title'
+            $ref: "#/components/schemas/DescriptiveValue"
+        adminMetadata:
+          $ref: "#/components/schemas/DescriptiveAdminMetadata"
       required:
         - title
     DRO:
@@ -330,6 +500,35 @@ components:
       required:
         - releaseDate
         - access
+    Event:
+      description: Property model for describing events in the history of the resource.
+      type: object
+      properties:
+        type:
+          description: Description of the event (creation, publication, etc.).
+          type: string
+        date:
+          description: Dates associated with the event.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        contributor:
+          description: Contributors associated with the event.
+          type: array
+          items:
+            $ref: "#/components/schemas/Contributor"
+        location:
+          description: Locations associated with the event.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        note:
+          description: Other information about the event.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+      allOf:
+        - $ref: "#/components/schemas/DescriptiveStructuredValue"
     File:
       description: Binaries that are the basis of what our domain manages. Binaries here do not include metadata files generated for the domain's own management purposes.
       type: object
@@ -680,16 +879,18 @@ components:
           enum:
             - right-to-left
             - left-to-right
-    Title:
-      description: The title of the object.
+    Source:
+      description: Property model for indicating the vocabulary, authority, or other
+        origin for a term, code, or identifier.
       type: object
       properties:
-        primary:
-          description: Is this the primary title for the object
-          type: boolean
-        titleFull:
-          description: The full title for the object
+        code:
+          description: Code representing the value source.
+          type: string
+        uri:
+          description: URI for the value source.
+          type: string
+          format: uri
+        value:
+          description: String describing the value source.
           type: string
-      required:
-        - primary
-        - titleFull

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -260,15 +260,23 @@ files:
 - lib/cocina/models/admin_policy.rb
 - lib/cocina/models/admin_policy_administrative.rb
 - lib/cocina/models/administrative.rb
+- lib/cocina/models/applies_to.rb
 - lib/cocina/models/catalog_link.rb
 - lib/cocina/models/checkable.rb
 - lib/cocina/models/collection.rb
 - lib/cocina/models/collection_identification.rb
+- lib/cocina/models/contributor.rb
 - lib/cocina/models/description.rb
+- lib/cocina/models/descriptive_admin_metadata.rb
+- lib/cocina/models/descriptive_basic_value.rb
+- lib/cocina/models/descriptive_structured_value.rb
+- lib/cocina/models/descriptive_value.rb
+- lib/cocina/models/descriptive_value_required.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
 - lib/cocina/models/embargo.rb
+- lib/cocina/models/event.rb
 - lib/cocina/models/file.rb
 - lib/cocina/models/file_administrative.rb
 - lib/cocina/models/file_set.rb
@@ -286,7 +294,7 @@ files:
 - lib/cocina/models/request_file_set.rb
 - lib/cocina/models/request_file_set_structural.rb
 - lib/cocina/models/sequence.rb
-- lib/cocina/models/title.rb
+- lib/cocina/models/source.rb
 - lib/cocina/models/validator.rb
 - lib/cocina/models/version.rb
 - lib/cocina/models/vocab.rb

data/lib/cocina/models/title.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Cocina
-  module Models
-    class Title < Struct
-      # Is this the primary title for the object
-      attribute :primary, Types::Strict::Bool.default(false)
-      # The full title for the object
-      attribute :titleFull, Types::Strict::String
-    end
-  end
-end