cocina-models 0.81.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d8392fadece0bb4ec12ed93e958c99abf04e29ad0a78c14ee8651ec8ecd1e37
-  data.tar.gz: db4a5de344bb53d98b2b71f725e8b1d1b9e0d5e0b28416989ad55f19df826376
+  metadata.gz: 326a7390c3ec14bfbc4ec9e4e79f26528b9dfa214f38aefd0646baddfbad96d5
+  data.tar.gz: cce43d9334fd16e47e790a082bbc999cf969b18ab78dc3d5e7015f757f6f4ea0
 SHA512:
-  metadata.gz: 4880e4eb86935116e0bec017926aeab5e5aa12d8792ee5066d0aeef5f514e6f13f63c8bc68c03035fdff2748f95aa7215f236384e109a8e532bd76e9677ae53c
-  data.tar.gz: 22154804ee4b103bdbd3aaaee449327bb4a6c9bc1dce9431a5311ed06c5e76039ccb420634d275f56d644a60ffa529bd9cb822f9c549be057f4972d791a34bf7
+  metadata.gz: d1a83488b4c5a07ae64073693c0a77424ce10fbfdada5e769fca6794d75cddc5c789d04ab92e35fa80a30eae82a0f8c284753df16ddab044bcd1ad11030b22f5
+  data.tar.gz: 6604a503733106b82f2e0155a2632a1eb8d00881dc762b52779179a96d962fd5e5143be6ebbe2738cb5d35eac88ee95d039c7f358d2664f10f6a82f71626b058

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@2.0.0
+  ruby-rails: sul-dlss/ruby-rails@3.1.2
 workflows:
   build:
     jobs:

data/.gitignore

@@ -9,5 +9,3 @@
 
 # rspec failure tracking
 .rspec_status
-
-Gemfile.lock

data/.rubocop.yml

@@ -184,7 +184,7 @@ Style/SoleNestedConditional: # (new in 0.89)
 Style/StringConcatenation:
   Enabled: true
 
-Gemspec/DateAssignment: # new in 1.10
+Gemspec/DeprecatedAttributeAssignment: # new in 1.10
   Enabled: true
 Gemspec/RequireMFA: # new in 1.23
   Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2022-04-27 19:20:35 UTC using RuboCop version 1.28.2.
+# on 2022-06-08 23:20:02 UTC using RuboCop version 1.28.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -35,7 +35,7 @@ Lint/UnusedMethodArgument:
     - 'lib/cocina/models/mapping/from_mods/subject.rb'
     - 'lib/cocina/models/mapping/to_mods/event.rb'
 
-# Offense count: 95
+# Offense count: 96
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 40
@@ -56,16 +56,17 @@ Metrics/ParameterLists:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 89
+# Offense count: 87
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 128
 
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: Max.
 RSpec/NestedGroups:
   Exclude:
     - 'spec/cocina/models/mapping/normalizers/mods/origin_info_normalizer_spec.rb'
+    - 'spec/cocina/models/validators/date_time_validator_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
@@ -87,7 +88,7 @@ Style/MultilineBlockChain:
     - 'lib/cocina/models/mapping/to_mods/form.rb'
     - 'lib/cocina/models/mapping/to_mods/subject.rb'
 
-# Offense count: 206
+# Offense count: 223
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/Gemfile.lock

@@ -0,0 +1,158 @@
+PATH
+  remote: .
+  specs:
+    cocina-models (0.84.0)
+      activesupport
+      deprecation
+      dry-struct (~> 1.0)
+      dry-types (~> 1.1)
+      edtf
+      equivalent-xml
+      jsonpath
+      nokogiri
+      openapi3_parser
+      openapi_parser (>= 0.11.1, < 1.0)
+      rss
+      super_diff
+      thor
+      zeitwerk (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    attr_extras (6.2.5)
+    byebug (11.1.3)
+    committee (4.4.0)
+      json_schema (~> 0.14, >= 0.14.3)
+      openapi_parser (>= 0.11.1, < 1.0)
+      rack (>= 1.5)
+    commonmarker (0.23.5)
+    concurrent-ruby (1.1.10)
+    deprecation (1.1.0)
+      activesupport
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    dry-container (0.10.1)
+      concurrent-ruby (~> 1.0)
+    dry-core (0.8.1)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.3.0)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-struct (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-types (~> 1.5)
+      ice_nine (~> 0.11)
+    dry-types (1.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    edtf (3.1.0)
+      activesupport (>= 3.0, < 8.0)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    json (2.6.2)
+    json_schema (0.21.0)
+    jsonpath (1.1.2)
+      multi_json
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    multi_json (1.15.0)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    openapi3_parser (0.9.2)
+      commonmarker (~> 0.17)
+    openapi_parser (0.15.0)
+    optimist (3.0.1)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    patience_diff (1.2.0)
+      optimist (~> 3.0)
+    racc (1.6.0)
+    rack (2.2.4)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rss (0.2.9)
+      rexml
+    rubocop (1.35.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    super_diff (0.9.0)
+      attr_extras (>= 6.2.4)
+      diff-lcs
+      patience_diff
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  byebug
+  cocina-models!
+  committee
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rspec_junit_formatter
+  rubocop (~> 1.24)
+  rubocop-rake
+  rubocop-rspec (~> 2.1)
+  simplecov
+
+BUNDLED WITH
+   2.3.17

data/README.md

@@ -51,10 +51,10 @@ Beyond what is necessary to test the generator, the Cocina model classes are not
 
 ## Testing validation changes
 
-If there is a possibility that a model or validation change will conflict with some existing objects then [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) should be used for testing. This must be run on sdr-deploy since it requires deploying a branch of cocina-models.
+If there is a possibility that a model or validation change will conflict with some existing objects then [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) should be used for testing. This must be run on sdr-infra since it requires deploying a branch of cocina-models.
 
-1. Create a cocina-models branch containing the proposed change and push to Github.
-2. On sdr-deploy, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
+1. Create a cocina-models branch containing the proposed change and push to GitHub.
+2. On sdr-infra, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
 3. Select the appropriate database.
 For QA:
 ```
@@ -124,18 +124,9 @@ At the same, we have found it convenient to use these PRs to also bump the versi
 
 ### Step 4: Update other dependent applications
 
-Once the above listed steps have been completed, all the following applications that use cocina-models should be updated and released at the same time.  "Cocina Level 2" describes this set of updates.
+Once the above listed steps have been completed, all applications that use cocina-models should be updated and released at the same time.  "Cocina Level 2" describes this set of updates. The applications that use cocina-models are those in [this list](https://github.com/sul-dlss/access-update-scripts/blob/master/infrastructure/projects.yml) that are NOT marked with `cocina_level2: false`.
 
-* [sul-dlss/argo](https://github.com/sul-dlss/argo/)
-* [sul-dlss/common-accessioning](https://github.com/sul-dlss/common-accessioning/)
-* [sul-dlss/dor_indexing_app](https://github.com/sul-dlss/dor_indexing_app/)
-* [sul-dlss/google-books](https://github.com/sul-dlss/google-books/)
-* [sul-dlss/happy-heron](https://github.com/sul-dlss/happy-heron/)
-* [sul-dlss/hydra_etd](https://github.com/sul-dlss/hydra_etd/)
-* [sul-dlss/infrastructure-integration-test](https://github.com/sul-dlss/infrastructure-integration-test/)
-* [sul-dlss/pre-assembly](https://github.com/sul-dlss/pre-assembly/)
-
-There are scripts to help with this:
+There are scripts to help with updating other dependent applications:
 
 #### Step 4A: Create the PRs
 

data/cocina-models.gemspec

@@ -28,12 +28,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deprecation'
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'
+  spec.add_dependency 'edtf' # used for date/time validation
   spec.add_dependency 'equivalent-xml' # for diffing MODS
+  spec.add_dependency 'jsonpath' # used for date/time validation
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'openapi3_parser' # Parsing openapi doc
   # Match these version requirements to what committee wants,
   # so that our client (non-committee) users have the same dependencies.
   spec.add_dependency 'openapi_parser', '>= 0.11.1', '< 1.0'
+  spec.add_dependency 'rss' # used for date/time validation
   spec.add_dependency 'super_diff'
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk', '~> 2.1'

data/lib/cocina/models/doi_exceptions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    DoiExceptions = Types::String.constrained(
+      format: %r{^10\.(25740/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936/629[tT]-[bB][xX]79)$}i
+    )
+  end
+end

data/lib/cocina/models/{doi.rb → doi_pattern.rb}

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    DOI = Types::String.constrained(
+    DoiPattern = Types::String.constrained(
       format: %r{^10\.(25740|80343)/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$}i
     )
   end

data/lib/cocina/models/identification.rb

@@ -7,8 +7,7 @@ module Cocina
       attribute? :barcode, Types::Nominal::Any
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).default([].freeze)
       # Digital Object Identifier (https://www.doi.org)
-      # example: 10.25740/bc123df4567
-      attribute? :doi, Types::Strict::String
+      attribute? :doi, Types::Nominal::Any
       # 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

data/lib/cocina/models/mapping/escape_html.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Mapping
+      # Escaps HTML entities as CDATA for MODS since HTML is not permitted in MODS
+      class EscapeHtml
+        # @param [String] data
+        # @param [Nokogiri::XML::Builder]
+        def self.with_cdata(data, builder)
+          tokens = data.split(%r{(</?(?:i|cite)>)})
+          tokens.map do |token|
+            if /\A<.+>\z/.match? token
+              builder.cdata(token)
+            else
+              builder.text(token)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/mapping/from_mods/subject.rb

@@ -339,7 +339,8 @@ module Cocina
                          end
             notes = name_notes_for(full_name[:role], node)
             name_attrs[:note] = notes unless notes.empty?
-            name_attrs.merge(attrs)
+            name_attrs[:identifier] = full_name[:identifier]
+            name_attrs.compact.merge(attrs)
           end
 
           def name_notes_for(roles, name_node)

data/lib/cocina/models/mapping/to_mods/geographic.rb

@@ -70,12 +70,10 @@ module Cocina
           end
 
           def extract_type(geo)
-            type = geo[:form].find do |form|
-              form[:type].match(TYPE_REGEX) || (form[:type].match(MEDIA_REGEX) && form[:value] == 'Image')
+            type = geo.form.find do |form|
+              form.type.match?(TYPE_REGEX) || (form.type.match?(MEDIA_REGEX) && form.value == 'Image')
             end
-            return type[:value] if type
-
-            nil
+            type&.value
           end
 
           def about(druid)

data/lib/cocina/models/mapping/to_mods/note.rb

@@ -68,7 +68,9 @@ module Cocina
                     else
                       note.value
                     end
-            xml.public_send tag_name, value, attributes
+            xml.public_send tag_name, attributes do |builder|
+              EscapeHtml.with_cdata(value, builder) if value
+            end
           end
 
           def write_basic(note)

data/lib/cocina/models/mapping/to_mods/subject.rb

@@ -230,8 +230,11 @@ module Cocina
           # Write nodes within MODS subject
           def write_topic(subject, subject_value, is_parallel: false, type: nil, subject_values_have_same_authority: true)
             type ||= subject_value.type
-            topic_attributes = topic_attributes_for(subject, subject_value, type, is_parallel: is_parallel,
-                                                                                  subject_values_have_same_authority: subject_values_have_same_authority)
+            topic_attributes = topic_attributes_for(subject,
+                                                    subject_value,
+                                                    type,
+                                                    is_parallel: is_parallel,
+                                                    subject_values_have_same_authority: subject_values_have_same_authority)
             case type
             when 'person'
               xml.name topic_attributes.merge(type: 'personal') do
@@ -395,6 +398,7 @@ module Cocina
               write_name_part(subject_value)
               write_display_form(display_values)
               write_roles(subject_value.note)
+              write_identifier(subject.identifier)
               write_other_notes(subject.note, 'description')
               write_other_notes(subject.note, 'affiliation')
             end
@@ -427,6 +431,12 @@ module Cocina
             end.each { |role| RoleWriter.write(xml: xml, role: role) }
           end
 
+          def write_identifier(identifiers)
+            identifiers.each do |identifier|
+              xml.nameIdentifier identifier.value, type: identifier.source.code
+            end
+          end
+
           def write_other_notes(notes, type)
             Array(notes).filter { |note| note.type == type }.each { |note| xml.public_send(type, note.value) }
           end

data/lib/cocina/models/validators/date_time_validator.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'edtf'
+require 'jsonpath'
+require 'rss'
+
+module Cocina
+  module Models
+    module Validators
+      # Validates that dates of known types are type-valid
+      class DateTimeValidator
+        VALIDATABLE_TYPES = %w[edtf iso8601 w3cdtf].freeze
+
+        def self.validate(_clazz, attributes)
+          new(attributes).validate
+        end
+
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def validate
+          return unless meets_preconditions?
+
+          return if invalid_dates.empty?
+
+          raise ValidationError, "Invalid date(s) for #{druid}: #{invalid_dates}"
+        end
+
+        private
+
+        attr_reader :attributes
+
+        def meets_preconditions?
+          attributes.key?(:description)
+        end
+
+        def invalid_dates
+          @invalid_dates ||= validatable_dates.filter_map do |date_hash|
+            code = date_hash.dig('encoding', 'code')
+            bad_values = JsonPath.new('$..value').on(date_hash.to_json).reject do |value|
+              send("valid_#{code}?", value)
+            end
+
+            next if bad_values.empty?
+
+            [*bad_values, code]
+          end
+        end
+
+        def validatable_dates
+          # Why is the `uniq` needed below? Odd behavior when handling highly nested use cases:
+          #
+          # > JsonPath.new("$..date..[?(@.encoding.code =~ /#{VALIDATABLE_TYPES.join('|')}/)]").on(attributes[:description].to_json)
+          # > [
+          #     {"structuredValue"=>[{"value"=>"1996", "type"=>"start"}, {"value"=>"1998", "type"=>"end"}], "encoding"=>{"code"=>"iso8601"}},
+          #     {"structuredValue"=>[{"value"=>"1996", "type"=>"start"}, {"value"=>"1998", "type"=>"end"}], "encoding"=>{"code"=>"iso8601"}}
+          # ]
+          #
+          # Notice how the JSONPath expression returns the *same exact* structure twice despite only being present once in the data.
+          JsonPath
+            .new("$..date..[?(@.encoding.code =~ /#{VALIDATABLE_TYPES.join('|')}/)]")
+            .on(attributes[:description].to_json)
+            .uniq
+        end
+
+        def valid_edtf?(value)
+          Date.edtf!(value)
+          true
+        rescue StandardError
+          # NOTE: the upstream EDTF implementation in the `edtf` gem does not
+          #       allow a valid pattern that we use (possibly because only level
+          #       0 of the spec was implemented?):
+          #
+          # * Y-20555
+          #
+          # So we catch the false positives from the upstream gem and allow
+          # this pattern to validate
+          /\AY-?\d{5,}\Z/.match?(value)
+        end
+
+        def valid_iso8601?(value)
+          DateTime.iso8601(value)
+          true
+        rescue StandardError
+          false
+        end
+
+        def valid_w3cdtf?(value)
+          Time.w3cdtf(value)
+          true
+        rescue StandardError
+          # NOTE: the upstream W3CDTF implementation in the `rss` gem does not
+          #       allow two patterns that should be valid per the specification:
+          #
+          # * YYYY
+          # * YYYY-MM
+          #
+          # So we catch the false positives from the upstream gem and allow
+          # these two patterns to validate
+          /\A\d{4}(-0[1-9]|-1[0-2])?\Z/.match?(value)
+        end
+
+        def druid
+          @druid ||= attributes[:externalIdentifier]
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/validators/validator.rb

@@ -12,7 +12,8 @@ module Cocina
           CatalogLinksValidator,
           AssociatedNameValidator,
           DescriptionTypesValidator,
-          DescriptionValuesValidator
+          DescriptionValuesValidator,
+          DateTimeValidator
         ].freeze
 
         def self.validate(clazz, attributes)

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.81.0'
+    VERSION = '0.84.0'
   end
 end

data/lib/cocina/models.rb

@@ -40,7 +40,7 @@ loader = Zeitwerk::Loader.new
 loader.inflector = CocinaModelsInflector.new
 loader.push_dir(File.absolute_path("#{__FILE__}/../.."))
 loader.ignore("#{__dir__}/rspec.rb")
-loader.ignore("#{__dir__}/rspec/**/*.rb")
+loader.ignore("#{__dir__}/rspec")
 loader.setup
 
 module Cocina
@@ -153,5 +153,12 @@ module Cocina
       raise ValidationError, 'Type field not found'
     end
     private_class_method :type_for
+
+    def self.druid_regex
+      @druid_regex ||= begin
+        str = Openapi3Parser.load_file('openapi.yml').components.schemas['Druid'].pattern
+        Regexp.new(str)
+      end
+    end
   end
 end

data/openapi.yml

@@ -390,7 +390,7 @@ components:
         - catalogRecordId
         - refresh
     CatkeyBarcode:
-      description: The barcode associated with a DRO object based on catkey, prefixed with 36105
+      description: The barcode associated with a DRO object based on catkey, prefixed with a catkey followed by a hyphen
       type: string
       pattern: '^[0-9]+-[0-9]+$'
       example: '6772719-1001'
@@ -896,8 +896,18 @@ components:
               # description: An alphabet or other notation used to represent a
               #   language or other symbolic system of the descriptive element value.
     DOI:
-      type: string
       description: Digital Object Identifier (https://www.doi.org)
+      oneOf:
+        - $ref: '#/components/schemas/DoiPattern'
+        - $ref: '#/components/schemas/DoiExceptions'
+    DoiExceptions:
+      type: string
+      description: pre-existing Digital Object Identifiers (https://www.doi.org) not matching the pattern (case insensitive)
+      pattern: '^10\.(25740\/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936\/629[tT]-[bB][xX]79)$'
+      example: '10.25740/12qF-5243'
+    DoiPattern:
+      type: string
+      description: Digital Object Identifier (https://www.doi.org) regex pattern
       # The prod and test prefixes are permitted
       pattern: '^10\.(25740|80343)\/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$'
       example: '10.25740/bc123df4567'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.81.0
+  version: 0.84.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: edtf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +156,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: super_diff
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +339,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -355,7 +398,8 @@ files:
 - lib/cocina/models/descriptive_structured_value.rb
 - lib/cocina/models/descriptive_value.rb
 - lib/cocina/models/descriptive_value_language.rb
-- lib/cocina/models/doi.rb
+- lib/cocina/models/doi_exceptions.rb
+- lib/cocina/models/doi_pattern.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
@@ -377,6 +421,7 @@ files:
 - lib/cocina/models/location_based_access.rb
 - lib/cocina/models/location_based_download_access.rb
 - lib/cocina/models/mapping/error_notifier.rb
+- lib/cocina/models/mapping/escape_html.rb
 - lib/cocina/models/mapping/from_mods/access.rb
 - lib/cocina/models/mapping/from_mods/admin_metadata.rb
 - lib/cocina/models/mapping/from_mods/alt_rep_group.rb
@@ -461,6 +506,7 @@ files:
 - lib/cocina/models/validators/associated_name_validator.rb
 - lib/cocina/models/validators/catalog_links_validator.rb
 - lib/cocina/models/validators/dark_validator.rb
+- lib/cocina/models/validators/date_time_validator.rb
 - lib/cocina/models/validators/description_types_validator.rb
 - lib/cocina/models/validators/description_values_validator.rb
 - lib/cocina/models/validators/open_api_validator.rb
@@ -492,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Data models for the SDR