cocina-models 0.75.0 → 0.78.0

data/lib/cocina/generator/generator.rb

@@ -54,29 +54,22 @@ module Cocina
 
           <<~MARKDOWN
             #{'#' * (field.count('.') + 1)} #{header_markdown}
-            _Path: #{field}_
+            _Path: #{field}.type_
             #{types_markdown}
           MARKDOWN
-        end.join("\n")
+        end.join
 
         remove_file 'docs/description_types.md'
-        create_file 'docs/description_types.md', h1_markdown + markdown
+        create_file 'docs/description_types.md', markdown
       end
 
       private
 
-      def h1_markdown
-        <<~MARKDOWN
-          # Description types
-
-        MARKDOWN
-      end
-
       def field_markdown_from(field)
         header = field.split('.')
                       .grep_v(/groupedValue|structuredValue/)
                       .join(' ')
-                      .capitalize
+                      .upcase_first
 
         header_suffix = if field.ends_with?('structuredValue')
                           'part types for structured value'
@@ -91,7 +84,9 @@ module Cocina
       def types_markdown_from(types)
         types.map do |type|
           "  * #{type['value']}".tap do |type_value|
-            type_value << ": #{type['description']}" if type['description']
+            type_value << "\n    * #{type['description']}" if type['description']
+            type_value << "\n    * Deprecated." if type['status'] == 'deprecated'
+            type_value << " Preferred usage: #{type['use']}" if type['use']
           end
         end.join("\n")
       end

data/lib/cocina/generator/schema.rb

@@ -101,9 +101,7 @@ module Cocina
         return [] if doc.one_of.nil?
 
         # All properties must be objects.
-        unless doc.one_of.all? { |schema| schema.type == 'object' }
-          raise 'All properties for oneOf must be objects'
-        end
+        raise 'All properties for oneOf must be objects' unless doc.one_of.all? { |schema| schema.type == 'object' }
 
         doc.one_of.flat_map do |one_of_doc|
           one_of_doc.properties.map do |key, properties_doc|

data/lib/cocina/generator/schema_base.rb

@@ -23,14 +23,6 @@ module Cocina
         key || schema_doc.name
       end
 
-      # Allows non-required values to not be provided. This allows smaller
-      # requests as not every field needs to be present.
-      def omittable
-        return '' if required && !relaxed
-
-        '.meta(omittable: true)'
-      end
-
       # Allows nillable values to be set to nil. This is useful when doing
       # an update and you want to clear out a value.
       def optional

data/lib/cocina/generator/schema_ref.rb

@@ -8,7 +8,7 @@ module Cocina
         if required && !relaxed
           "attribute(:#{name.camelize(:lower)}, #{schema_doc.name}.default { #{schema_doc.name}.new })"
         else
-          "attribute :#{name.camelize(:lower)}, #{schema_doc.name}.optional.meta(omittable: true)"
+          "attribute? :#{name.camelize(:lower)}, #{schema_doc.name}.optional"
         end
       end
     end

data/lib/cocina/generator/schema_value.rb

@@ -4,15 +4,25 @@ module Cocina
   module Generator
     # Class for generating from an openapi value
     class SchemaValue < SchemaBase
-      # rubocop:disable Layout/LineLength
       def generate
         # optional has to come before default or the default value that gets set will be nil.
-        "#{description}#{example}#{relaxed_comment}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}#{omittable}"
+        if required && !relaxed
+          "#{preamble}attribute :#{name.camelize(:lower)}, #{type}"
+        else
+          "#{preamble}attribute? :#{name.camelize(:lower)}, #{type}"
+        end
       end
-      # rubocop:enable Layout/LineLength
 
       private
 
+      def type
+        "Types::#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}"
+      end
+
+      def preamble
+        "#{description}#{example}#{relaxed_comment}"
+      end
+
       def enum
         return '' if !schema_doc.enum || relaxed
 
@@ -32,7 +42,7 @@ module Cocina
         # If type is boolean and default is false, erroneously getting a nil.
         # Assuming that if required, then default is false.
         default = schema_doc.default
-        default = false if default.nil? && schema_doc.type == 'boolean' && required
+        default = false if default.nil? && schema_doc.type == 'boolean'
 
         return '' if default.nil?
 

data/lib/cocina/models/access.rb

@@ -5,15 +5,15 @@ module Cocina
     class Access < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute? :view, Types::Strict::String.optional.default('dark')
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
+      attribute? :download, Types::Strict::String.optional.default('none')
       # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :location, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/admin_policy.rb

@@ -18,7 +18,7 @@ module Cocina
       attribute :label, Types::Strict::String
       attribute :version, Types::Strict::Integer
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute? :description, Description.optional
     end
   end
 end

data/lib/cocina/models/admin_policy_access_template.rb

@@ -3,23 +3,23 @@
 module Cocina
   module Models
     class AdminPolicyAccessTemplate < Struct
-      attribute :view, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      attribute? :view, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark')
       # Available for controlled digital lending.
-      attribute :controlledDigitalLending, Types::Strict::Bool.meta(omittable: true)
+      attribute? :controlledDigitalLending, Types::Strict::Bool.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute :copyright, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :copyright, Types::Strict::String.optional
       # Download access level. This is used in the transition from Fedora as a way to set a default download level at registration that is copied down to all the files.
 
-      attribute :download, Types::Strict::String.enum('world', 'stanford', 'location-based', 'none').meta(omittable: true)
+      attribute? :download, Types::Strict::String.enum('world', 'stanford', 'location-based', 'none')
       # If access or download is "location-based", this indicates which location should have access. This is used in the transition from Fedora as a way to set a default location at registration that is copied down to all the files.
 
-      attribute :location, Types::Strict::String.optional.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute :useAndReproductionStatement, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :useAndReproductionStatement, Types::Strict::String.optional
       # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute :license, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :license, Types::Strict::String.optional
     end
   end
 end

data/lib/cocina/models/admin_policy_administrative.rb

@@ -7,7 +7,7 @@ module Cocina
       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
-      attribute :disseminationWorkflow, Types::Strict::String.meta(omittable: true)
+      attribute? :disseminationWorkflow, Types::Strict::String
       attribute :collectionsForRegistration, Types::Strict::Array.of(Types::Strict::String).default([].freeze)
       # example: druid:bc123df4567
       attribute :hasAdminPolicy, Types::Strict::String

data/lib/cocina/models/admin_policy_with_metadata.rb

@@ -18,11 +18,11 @@ module Cocina
       attribute :label, Types::Strict::String
       attribute :version, Types::Strict::Integer
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute? :description, Description.optional
       # When the object was created.
-      attribute :created, Types::Params::DateTime.meta(omittable: true)
+      attribute? :created, Types::Params::DateTime
       # When the object was modified.
-      attribute :modified, Types::Params::DateTime.meta(omittable: true)
+      attribute? :modified, Types::Params::DateTime
       # Key for optimistic locking. The contents of the key is not specified.
       attribute :lock, Types::Strict::String
     end

data/lib/cocina/models/builders/name_title_group_builder.rb

@@ -81,7 +81,6 @@ module Cocina
         # @params [Cocina::Models::DescriptiveValue] desc_value
         # @return [Array<Cocina::Models::DescriptiveValue>] where we are only interested in
         #   hashes containing (either :value or :structuredValue)
-        # rubocop:disable Metrics/AbcSize
         def self.value_slices(desc_value)
           slices = []
           desc_value_slice = desc_value.to_h.slice(:value, :structuredValue, :parallelValue)
@@ -93,7 +92,6 @@ module Cocina
           # ignoring groupedValue
           slices.flatten
         end
-        # rubocop:enable Metrics/AbcSize
         # private_class_method :value_slices
 
         # for a given Hash (from a Cocina DescriptiveValue or Title or Name or ...)
@@ -113,7 +111,6 @@ module Cocina
         # @params [Cocina::Models::Title] title
         # @return [Array<Cocina::Models::DescriptiveValue>] where we are only interested in
         #   hashes containing (either :value or :structureValue) and :note if present
-        # rubocop:disable Metrics/AbcSize
         def self.title_value_note_slices(title)
           slices = []
           title_slice = title.to_h.slice(:value, :structuredValue, :parallelValue, :note)
@@ -127,7 +124,6 @@ module Cocina
           # ignoring groupedValue
           slices.flatten
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/cocina/models/builders/title_builder.rb

@@ -106,7 +106,6 @@ module Cocina
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/MethodLength
-        # rubocop:disable Metrics/AbcSize
         # @param [Cocina::Models::Title] title with structured values
         # @return [String] the title value from combining the pieces of the structured_values by type and order
         #   with desired punctuation per specs
@@ -157,7 +156,6 @@ module Cocina
           end
           structured_title
         end
-        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Metrics/BlockLength
         # rubocop:enable Metrics/CyclomaticComplexity

data/lib/cocina/models/citation_only_access.rb

@@ -8,8 +8,8 @@ module Cocina
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
       # Not used for this access type, must be null.
-      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
-      attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end
   end
 end

data/lib/cocina/models/collection_access.rb

@@ -4,15 +4,15 @@ module Cocina
   module Models
     class CollectionAccess < Struct
       # Access level
-      attribute :view, Types::Strict::String.default('dark').enum('world', 'dark').meta(omittable: true)
+      attribute? :view, Types::Strict::String.default('dark').enum('world', 'dark')
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute :copyright, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :copyright, Types::Strict::String.optional
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute :useAndReproductionStatement, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :useAndReproductionStatement, Types::Strict::String.optional
       # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute :license, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :license, Types::Strict::String.optional
     end
   end
 end

data/lib/cocina/models/collection_identification.rb

@@ -7,7 +7,7 @@ module Cocina
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
-      attribute :sourceId, Types::Strict::String.meta(omittable: true)
+      attribute? :sourceId, Types::Strict::String
     end
   end
 end

data/lib/cocina/models/collection_with_metadata.rb

@@ -29,9 +29,9 @@ module Cocina
       attribute(:description, Description.default { Description.new })
       attribute(:identification, CollectionIdentification.default { CollectionIdentification.new })
       # When the object was created.
-      attribute :created, Types::Params::DateTime.meta(omittable: true)
+      attribute? :created, Types::Params::DateTime
       # When the object was modified.
-      attribute :modified, Types::Params::DateTime.meta(omittable: true)
+      attribute? :modified, Types::Params::DateTime
       # Key for optimistic locking. The contents of the key is not specified.
       attribute :lock, Types::Strict::String
     end

data/lib/cocina/models/contributor.rb

@@ -4,15 +4,15 @@ module Cocina
   module Models
     class Contributor < Struct
       attribute :name, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Entity type of the contributor (person, organization, etc.).
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Entity type of the contributor (person, organization, etc.). See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.
+      attribute? :type, Types::Strict::String
       # Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute? :status, Types::Strict::String
       attribute :role, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # URL or other pointer to the location of the contributor information.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute? :valueAt, Types::Strict::String
       attribute :parallelContributor, Types::Strict::Array.of(DescriptiveParallelContributor).default([].freeze)
     end
   end

data/lib/cocina/models/controlled_digital_lending_access.rb

@@ -8,9 +8,9 @@ module Cocina
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
       # Not used for this access type, must be null.
-      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional.enum('')
       # Available for controlled digital lending.
-      attribute :controlledDigitalLending, Types::Strict::Bool.default(false)
+      attribute? :controlledDigitalLending, Types::Strict::Bool.default(false)
     end
   end
 end

data/lib/cocina/models/dark_access.rb

@@ -4,12 +4,12 @@ module Cocina
   module Models
     class DarkAccess < Struct
       # Access level.
-      attribute :view, Types::Strict::String.default('dark').enum('dark').meta(omittable: true)
+      attribute? :view, Types::Strict::String.default('dark').enum('dark')
       # Download access level.
-      attribute :download, Types::Strict::String.default('none').enum('none').meta(omittable: true)
+      attribute? :download, Types::Strict::String.default('none').enum('none')
       # Not used for this access type, must be null.
-      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
-      attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional.enum('')
+      attribute? :controlledDigitalLending, Types::Strict::Bool.default(false).enum(false)
     end
   end
 end

data/lib/cocina/models/description.rb

@@ -14,12 +14,12 @@ module Cocina
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :subject, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :access, DescriptiveAccessMetadata.optional.meta(omittable: true)
+      attribute? :access, DescriptiveAccessMetadata.optional
       attribute :relatedResource, Types::Strict::Array.of(RelatedResource).default([].freeze)
       attribute :marcEncodedData, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
+      attribute? :adminMetadata, DescriptiveAdminMetadata.optional
       # URL or other pointer to the location of the resource description.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute? :valueAt, Types::Strict::String
       # Stanford persistent URL associated with the related resource. Note this is http, not https.
       attribute :purl, Types::Strict::String
     end

data/lib/cocina/models/descriptive_basic_value.rb

@@ -7,27 +7,27 @@ module Cocina
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # String or integer value of the descriptive element.
-      attribute :value, Types::Nominal::Any.meta(omittable: true)
-      # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute? :value, Types::Nominal::Any
+      # Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.
+      attribute? :type, Types::Strict::String
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute? :status, Types::Strict::String
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute? :code, Types::Strict::String
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
-      attribute :standard, Standard.optional.meta(omittable: true)
-      attribute :encoding, Standard.optional.meta(omittable: true)
+      attribute? :uri, Types::Strict::String
+      attribute? :standard, Standard.optional
+      attribute? :encoding, Standard.optional
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :source, Source.optional.meta(omittable: true)
+      attribute? :source, Source.optional
       # The preferred display label to use for the descriptive element in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute? :displayLabel, Types::Strict::String
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute? :qualifier, Types::Strict::String
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute? :valueAt, Types::Strict::String
     end
   end
 end

data/lib/cocina/models/descriptive_parallel_contributor.rb

@@ -4,16 +4,16 @@ module Cocina
   module Models
     class DescriptiveParallelContributor < Struct
       attribute :name, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Entity type of the contributor (person, organization, etc.).
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      # Entity type of the contributor (person, organization, etc.). See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.
+      attribute? :type, Types::Strict::String
       # Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute? :status, Types::Strict::String
       attribute :role, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # URL or other pointer to the location of the contributor information.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
-      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      attribute? :valueAt, Types::Strict::String
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
     end
   end
 end

data/lib/cocina/models/descriptive_parallel_event.rb

@@ -5,15 +5,15 @@ module Cocina
     class DescriptiveParallelEvent < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Description of the event (creation, publication, etc.).
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute? :type, Types::Strict::String
       # The preferred display label to use for the event in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute? :displayLabel, Types::Strict::String
       attribute :date, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :contributor, Types::Strict::Array.of(Contributor).default([].freeze)
       attribute :location, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
     end
   end
 end

data/lib/cocina/models/descriptive_value.rb

@@ -7,27 +7,27 @@ module Cocina
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # String or integer value of the descriptive element.
-      attribute :value, Types::Nominal::Any.meta(omittable: true)
-      # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute? :value, Types::Nominal::Any
+      # Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.
+      attribute? :type, Types::Strict::String
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute? :status, Types::Strict::String
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute? :code, Types::Strict::String
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
-      attribute :standard, Standard.optional.meta(omittable: true)
-      attribute :encoding, Standard.optional.meta(omittable: true)
+      attribute? :uri, Types::Strict::String
+      attribute? :standard, Standard.optional
+      attribute? :encoding, Standard.optional
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :source, Source.optional.meta(omittable: true)
+      attribute? :source, Source.optional
       # The preferred display label to use for the descriptive element in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute? :displayLabel, Types::Strict::String
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute? :qualifier, Types::Strict::String
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute? :valueAt, Types::Strict::String
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
     end
   end

data/lib/cocina/models/descriptive_value_language.rb

@@ -4,16 +4,16 @@ module Cocina
   module Models
     class DescriptiveValueLanguage < Struct
       # Code representing the standard or encoding.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute? :code, Types::Strict::String
       # URI for the standard or encoding.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute? :uri, Types::Strict::String
       # String describing the standard or encoding.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute? :value, Types::Strict::String
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # 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? :version, Types::Strict::String
+      attribute? :source, Source.optional
+      attribute? :valueScript, Standard.optional
     end
   end
 end

data/lib/cocina/models/dro.rb

@@ -39,7 +39,7 @@ module Cocina
       attribute(:description, Description.default { Description.new })
       attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, DROStructural.default { DROStructural.new })
-      attribute :geographic, Geographic.optional.meta(omittable: true)
+      attribute? :geographic, Geographic.optional
     end
   end
 end

data/lib/cocina/models/dro_access.rb

@@ -5,24 +5,24 @@ module Cocina
     class DROAccess < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute? :view, Types::Strict::String.optional.default('dark')
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
+      attribute? :download, Types::Strict::String.optional.default('none')
       # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :location, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :location, Types::Strict::String.optional
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute :copyright, Types::Strict::String.optional.meta(omittable: true)
-      attribute :embargo, Embargo.optional.meta(omittable: true)
+      attribute? :copyright, Types::Strict::String.optional
+      attribute? :embargo, Embargo.optional
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute :useAndReproductionStatement, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :useAndReproductionStatement, Types::Strict::String.optional
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute :license, Types::Strict::String.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none').meta(omittable: true)
+      attribute? :license, Types::Strict::String.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
     end
   end
 end

data/lib/cocina/models/dro_with_metadata.rb

@@ -39,11 +39,11 @@ module Cocina
       attribute(:description, Description.default { Description.new })
       attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, DROStructural.default { DROStructural.new })
-      attribute :geographic, Geographic.optional.meta(omittable: true)
+      attribute? :geographic, Geographic.optional
       # When the object was created.
-      attribute :created, Types::Params::DateTime.meta(omittable: true)
+      attribute? :created, Types::Params::DateTime
       # When the object was modified.
-      attribute :modified, Types::Params::DateTime.meta(omittable: true)
+      attribute? :modified, Types::Params::DateTime
       # Key for optimistic locking. The contents of the key is not specified.
       attribute :lock, Types::Strict::String
     end