cocina-models 0.74.1 → 0.77.0

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

@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+require 'deprecation'
+
+module Cocina
+  module Models
+    module Builders
+      # TitleBuilder selects the prefered title from the cocina object for solr indexing
+      # rubocop:disable Metrics/ClassLength
+      class TitleBuilder
+        extend Deprecation
+        # @param [[Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
+        # @param [Symbol] strategy ":first" is the strategy for selection when primary or display
+        #   title are missing
+        # @param [Boolean] add_punctuation determines if the title should be formmated with punctuation
+        # @return [String] the title value for Solr
+        def self.build(titles, strategy: :first, add_punctuation: true)
+          if titles.respond_to?(:description)
+            Deprecation.warn(self,
+                             "Calling TitleBuilder.build with a #{titles.class} is deprecated. " \
+                             'It must be called with an array of titles')
+            titles = titles.description.title
+          end
+          new(strategy: strategy, add_punctuation: add_punctuation).build(titles)
+        end
+
+        def initialize(strategy:, add_punctuation:)
+          @strategy = strategy
+          @add_punctuation = add_punctuation
+        end
+
+        # @param [[Array<Cocina::Models::Title>] titles the titles to consider
+        # @return [String] the title value for Solr
+        def build(titles)
+          cocina_title = primary_title(titles) || untyped_title(titles)
+          cocina_title = other_title(titles) if cocina_title.blank?
+
+          if strategy == :first
+            extract_title(cocina_title)
+          else
+            cocina_title.map { |one| extract_title(one) }
+          end
+        end
+
+        private
+
+        attr_reader :strategy
+
+        def extract_title(cocina_title)
+          result = if cocina_title.value
+                     cocina_title.value
+                   elsif cocina_title.structuredValue.present?
+                     title_from_structured_values(cocina_title)
+                   elsif cocina_title.parallelValue.present?
+                     return build(cocina_title.parallelValue)
+                   end
+          remove_trailing_punctuation(result.strip) if result.present?
+        end
+
+        def add_punctuation?
+          @add_punctuation
+        end
+
+        # @return [Cocina::Models::Title, nil] title that has status=primary
+        def primary_title(titles)
+          primary_title = titles.find do |title|
+            title.status == 'primary'
+          end
+          return primary_title if primary_title.present?
+
+          # NOTE: structuredValues would only have status primary assigned as a sibling, not as an attribute
+
+          titles.find do |title|
+            title.parallelValue&.find do |parallel_title|
+              parallel_title.status == 'primary'
+            end
+          end
+        end
+
+        def untyped_title(titles)
+          method = strategy == :first ? :find : :select
+          untyped_title_for(titles.public_send(method))
+        end
+
+        # @return [Array[Cocina::Models::Title]] first title that has no type attribute
+        def untyped_title_for(titles)
+          titles.each do |title|
+            if title.parallelValue.present?
+              untyped_title_for(title.parallelValue)
+            else
+              title.type.nil? || title.type == 'title'
+            end
+          end
+        end
+
+        # This handles 'main title', 'uniform' or 'translated'
+        def other_title(titles)
+          if strategy == :first
+            titles.first
+          else
+            titles
+          end
+        end
+
+        # rubocop:disable Metrics/BlockLength
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/MethodLength
+        # @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
+        def title_from_structured_values(title)
+          structured_title = ''
+          part_name_number = ''
+          # combine pieces of the cocina structuredValue into a single title
+          title.structuredValue.each do |structured_value|
+            # There can be a structuredValue inside a structuredValue.  For example,
+            #   a uniform title where both the name and the title have internal StructuredValue
+            return title_from_structured_values(structured_value) if structured_value.structuredValue.present?
+
+            value = structured_value.value&.strip
+            next unless value
+
+            # additional types:  name, uniform ...
+            case structured_value.type&.downcase
+            when 'nonsorting characters'
+              non_sort_value = "#{value}#{non_sorting_padding(title, value)}"
+              structured_title = if structured_title.present?
+                                   "#{structured_title}#{non_sort_value}"
+                                 else
+                                   non_sort_value
+                                 end
+            when 'part name', 'part number'
+              if part_name_number.blank?
+                part_name_number = part_name_number(title.structuredValue)
+                structured_title = if !add_punctuation?
+                                     [structured_title, part_name_number].join(' ')
+                                   elsif structured_title.present?
+                                     "#{structured_title.sub(/[ .,]*$/, '')}. #{part_name_number}. "
+                                   else
+                                     "#{part_name_number}. "
+                                   end
+              end
+            when 'main title', 'title'
+              structured_title = "#{structured_title}#{value}"
+            when 'subtitle'
+              # subtitle is preceded by space colon space, unless it is at the beginning of the title string
+              structured_title = if !add_punctuation?
+                                   [structured_title, value].join(' ')
+                                 elsif structured_title.present?
+                                   "#{structured_title.sub(/[. :]+$/, '')} : #{value.sub(/^:/, '').strip}"
+                                 else
+                                   structured_title = value.sub(/^:/, '').strip
+                                 end
+            end
+          end
+          structured_title
+        end
+        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/BlockLength
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
+
+        def remove_trailing_punctuation(title)
+          title.sub(%r{[ .,;:/\\]+$}, '')
+        end
+
+        def non_sorting_padding(title, non_sorting_value)
+          non_sort_note = title.note&.find { |note| note.type&.downcase == 'nonsorting character count' }
+          if non_sort_note
+            padding_count = [non_sort_note.value.to_i - non_sorting_value.length, 0].max
+            ' ' * padding_count
+          elsif ['\'', '-'].include?(non_sorting_value.last)
+            ''
+          else
+            ' '
+          end
+        end
+
+        # combine part name and part number:
+        #   respect order of occurrence
+        #   separated from each other by comma space
+        def part_name_number(structured_values)
+          title_from_part = ''
+          structured_values.each do |structured_value|
+            case structured_value.type&.downcase
+            when 'part name', 'part number'
+              value = structured_value.value&.strip
+              next unless value
+
+              title_from_part = append_part_to_title(title_from_part, value)
+
+            end
+          end
+          title_from_part
+        end
+
+        def append_part_to_title(title_from_part, value)
+          if !add_punctuation?
+            [title_from_part, value].select(&:presence).join(' ')
+          elsif title_from_part.strip.present?
+            "#{title_from_part.sub(/[ .,]*$/, '')}, #{value}"
+          else
+            value
+          end
+        end
+      end
+      # rubocop:enable Metrics/ClassLength
+    end
+  end
+end

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

data/lib/cocina/models/embargo.rb

@@ -5,21 +5,21 @@ module Cocina
     class Embargo < 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)
       # Date when the Collection is released from an embargo.
       # example: 2029-06-22T07:00:00.000+00:00
       attribute :releaseDate, Types::Params::DateTime
       # The human readable use and reproduction statement that applies when the embargo expires.
       # example: These materials are in the public domain.
-      attribute :useAndReproductionStatement, Types::Strict::String.optional.meta(omittable: true)
+      attribute? :useAndReproductionStatement, Types::Strict::String.optional
     end
   end
 end

data/lib/cocina/models/event.rb

@@ -5,15 +5,15 @@ module Cocina
     class Event < 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
       attribute :parallelEvent, Types::Strict::Array.of(DescriptiveParallelEvent).default([].freeze)
     end
   end

data/lib/cocina/models/file.rb

@@ -16,17 +16,17 @@ module Cocina
       # Filename for a file. Can be same as label.
       attribute :filename, Types::Strict::String
       # Size of the File (binary) in bytes.
-      attribute :size, Types::Strict::Integer.meta(omittable: true)
+      attribute? :size, Types::Strict::Integer
       # Version for the File within SDR.
       attribute :version, Types::Strict::Integer
       # MIME Type of the File.
-      attribute :hasMimeType, Types::Strict::String.meta(omittable: true)
+      attribute? :hasMimeType, Types::Strict::String
       # Use for the File.
-      attribute :use, Types::Strict::String.meta(omittable: true)
+      attribute? :use, Types::Strict::String
       attribute :hasMessageDigests, Types::Strict::Array.of(MessageDigest).default([].freeze)
       attribute(:access, FileAccess.default { FileAccess.new })
       attribute(:administrative, FileAdministrative.default { FileAdministrative.new })
-      attribute :presentation, Presentation.optional.meta(omittable: true)
+      attribute? :presentation, Presentation.optional
     end
   end
 end