cocina-models 0.80.0 → 0.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c78843bdc4b3ba3ec0ea9e2e8fa569fe7979de0e5d1a52fc4923103ed20de36
-  data.tar.gz: b3e317a0154e15973e9a0e57aab07d0d91702a97a31889963d4df2c26339a6d4
+  metadata.gz: eed81e24ae6c7f8a21f7dd55ac24df69a599dd69b4aae3de0e726962fdcd9318
+  data.tar.gz: a522660cd996da1a703f921940364ffd1690dea8c068dbdb0378f54da35a4597
 SHA512:
-  metadata.gz: 2fa6986b659b6474ed9ac476237c6da8ff75487bb5c7ab61b33a0226af95c44b22f14210524f258bd75bf826ea141dcc3bb88ce31e2a85b6f4590ec1ea353eec
-  data.tar.gz: e41c8c60d4eafe62b0f4025213f73aa7629284a0e5f73e93d7b356204d075635a3ea7da3af1aaf9557de487e1eee5236c3eec23a92a04d17fc71ecec14e50c48
+  metadata.gz: 17070357c2d42eee762d4234a8ad3233b1384442f077b7e45bd0039a905c9f9bf7e9db1a322003c7fa5bfc4a0135194fa05451524233f9ea070f28de2eba063c
+  data.tar.gz: 637b4bb37a7557abf2591dfaf348d758d89038075292cf0e7135d9fc49042e469b6ce533ea0b63c7428d4bebc60dba91807b97af3c9919b6fb378cad50ee77df

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,162 @@
+PATH
+  remote: .
+  specs:
+    cocina-models (0.83.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)
+      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-configurable (0.15.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.1)
+    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.0.8)
+      activesupport (>= 3.0, < 8.0)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    i18n (1.10.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.2)
+    multi_json (1.15.0)
+    nokogiri (1.13.6)
+      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.0)
+      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.31.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.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.4)
+      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

@@ -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.
-
-* [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:
+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`.
+
+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/builders/name_title_group_builder.rb

@@ -92,7 +92,6 @@ module Cocina
           # ignoring groupedValue
           slices.flatten
         end
-        # private_class_method :value_slices
 
         # for a given Hash (from a Cocina DescriptiveValue or Title or Name or ...)
         # result will be either

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/name_builder.rb

@@ -36,7 +36,7 @@ module Cocina
 
           def build_parallel
             names = {
-              parallelValue: name_elements.map { |name_node| build_parallel_name(name_node) },
+              parallelValue: build_parallel_values,
               type: type_for(name_elements.first['type']),
               status: name_elements.filter_map { |name_element| name_element['usage'] }.first
             }.compact
@@ -52,7 +52,7 @@ module Cocina
             }.compact.merge(common_lang_script(name_node))
 
             name_attrs = name_attrs.merge(common_name(name_node, name_attrs[:name], is_parallel: true))
-            name_parts = build_name_parts(name_node)
+            name_parts = build_name_parts(name_node, parallel: true)
             notifier.warn('Missing name/namePart element') if name_parts.all?(&:empty?)
             name_parts.each { |name_part| name_attrs = name_part.merge(name_attrs) }
             name_attrs.compact
@@ -106,7 +106,17 @@ module Cocina
             end.compact
           end
 
-          def build_name_parts(name_node)
+          def build_parallel_values
+            parallel_values = []
+            name_elements.each do |name_node|
+              parallel_values << build_parallel_name(name_node)
+              display_val = display_value(name_node)
+              parallel_values << display_val if display_val
+            end
+            parallel_values.compact
+          end
+
+          def build_name_parts(name_node, parallel: false)
             name_part_nodes = name_node.xpath('mods:namePart', mods: Description::DESC_METADATA_NS)
             alternative_name_nodes = name_node.xpath('mods:alternativeName', mods: Description::DESC_METADATA_NS)
 
@@ -116,23 +126,64 @@ module Cocina
               parts << { valueAt: name_node['xlink:href'] } if name_node['xlink:href']
               parts << common_authority(name_node) if name_node['valueURI']
             when 1
-              parts << build_name_part(name_node, name_part_nodes.first,
-                                       default_type: alternative_name_nodes.present?)
-                       .merge(common_authority(name_node)).merge(common_lang_script(name_node)).presence
+              name = build_simple_value_name(name_node, name_part_nodes.first, alternative_name_nodes, parallel)
+              parts << name.merge(common_authority(name_node)).merge(common_lang_script(name_node)).presence
             else
-              vals = name_part_nodes.filter_map do |name_part|
-                build_name_part(name_node, name_part, default_type: name_node['type'] != 'corporate').presence
-              end
-              parts << { structuredValue: vals }.merge(common_authority(name_node)).merge(common_lang_script(name_node))
+              name = build_structured_value_name(name_node, name_part_nodes)
+              parts << name.merge(common_authority(name_node)).merge(common_lang_script(name_node))
             end
 
             parts = build_alternative_name(alternative_name_nodes, parts) if alternative_name_nodes.present?
-
-            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
-            parts << { value: display_form.text, type: 'display' } if display_form
             parts.compact
           end
 
+          def build_simple_value_name(name_node, name_part_node, alternative_name_nodes, parallel)
+            name_value_hash = build_name_part(name_node, name_part_node, default_type: alternative_name_nodes.present?)
+            display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
+            if display_form_node.present? && !parallel
+              cocina_contrib_name =
+                {
+                  parallelValue: [
+                    name_value_hash
+                  ]
+                }
+              add_display_parallel_value(name_node, cocina_contrib_name)
+            else
+              name_value_hash
+            end
+          end
+
+          def build_structured_value_name(name_node, name_part_nodes)
+            vals = name_part_nodes.filter_map { |name_part_node| build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence }
+            display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
+            if display_form_node.present?
+              cocina_contrib_name =
+                {
+                  parallelValue: [
+                    { structuredValue: vals }
+                  ]
+                }
+              add_display_parallel_value(name_node, cocina_contrib_name)
+            else
+              { structuredValue: vals }
+            end
+          end
+
+          def add_display_parallel_value(name_node, cocina_contrib_name)
+            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS)&.text
+            return cocina_contrib_name if display_form.blank?
+
+            display_parallel_value = display_value(name_node)
+            cocina_contrib_name[:parallelValue] << display_parallel_value if display_parallel_value && cocina_contrib_name[:parallelValue].present?
+
+            cocina_contrib_name
+          end
+
+          def display_value(name_node)
+            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS)&.text
+            { value: display_form, type: 'display' } if display_form.present?
+          end
+
           def build_name_part(name_node, name_part_node, default_type: true)
             if name_part_node.content.blank? && !name_part_node['xlink:href']
               notifier.warn('name/namePart missing value')

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/name_writer.rb

@@ -36,25 +36,11 @@ module Cocina
             if contributor.type == 'unspecified others'
               write_etal
             elsif contributor.name.present?
+              # Expect contributor to have a single value for name property
               contrib_name = contributor.name.first
-              parallel_values = contrib_name.parallelValue
-              if parallel_values.present?
-                altrepgroup_id = id_generator.next_altrepgroup
-                parallel_values.each do |parallel_contrib_name|
-                  Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_contrib_name)&.each do |parallel_contrib_name_slice|
-                    if name_title_vals_index[parallel_contrib_name_slice]
-                      name_title_group = name_title_vals_index[parallel_contrib_name_slice]&.values&.first
-                      write_parallel_contributor(contributor, contrib_name, parallel_contrib_name,
-                                                 name_title_group, altrepgroup_id)
-                    else
-                      # TODO:  want a way to notify that we hit a problem - either notifier or HB error (issue #3751)
-                      #  OR validate for semantic correctness upon creation/update so we can't get here.
-                      #  notifier.warn("For contributor name '#{parallel_contrib_name_val}', no title matching '#{title_from_contrib}'")
-                      write_parallel_contributor(contributor, contrib_name, parallel_contrib_name, nil,
-                                                 altrepgroup_id)
-                    end
-                  end
-                end
+              parallel_name_values = contrib_name.parallelValue
+              if parallel_name_values.present?
+                write_contributor_with_parallel_names(parallel_name_values, contrib_name)
               else
                 write_contributor(contributor)
               end
@@ -105,7 +91,50 @@ module Cocina
             end
           end
 
-          def write_parallel_contributor(contributor, name, parallel_name, name_title_group, altrepgroup_id)
+          def write_contributor_with_parallel_names(parallel_name_values, contrib_name)
+            display_type_parallel_name = display_type_parallel_name(parallel_name_values)
+            if parallel_name_values.size == 1
+              contrib_name_value_slice = Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_name_values.first)
+              name_title_group = name_title_vals_index[contrib_name_value_slice]&.values&.first
+              write_name_from_parallel(contributor, contributor.name.first, parallel_name_values, name_title_group, nil)
+            elsif parallel_name_values.size == 2 && display_type_parallel_name
+              contrib_name_value_slice = Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_name_values.first)
+              name_title_group = name_title_vals_index[contrib_name_value_slice]&.values&.first
+              write_name_with_display_form(contributor, contributor.name.first, parallel_name_values, 0, name_title_group, nil)
+            else
+              write_multiple_parallel_contributors(parallel_name_values, contrib_name)
+            end
+          end
+
+          def write_multiple_parallel_contributors(parallel_name_values, contrib_name)
+            altrepgroup_id = id_generator.next_altrepgroup
+            parallel_name_values.each_with_index do |parallel_contrib_name, index|
+              display_name_present = parallel_name_values[index + 1].present? && parallel_name_values[index + 1].type == 'display'
+              Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_contrib_name)&.each do |parallel_contrib_name_slice|
+                if name_title_vals_index[parallel_contrib_name_slice]
+                  name_title_group = name_title_vals_index[parallel_contrib_name_slice]&.values&.first
+                  if display_name_present
+                    # associate type 'display' with the previous value
+                    write_name_with_display_form(contributor, contrib_name, parallel_name_values, index, name_title_group, altrepgroup_id)
+                  else
+                    write_name_from_parallel(contributor, contrib_name, parallel_contrib_name, name_title_group, altrepgroup_id)
+                  end
+                elsif display_name_present
+                  # TODO:  want a way to notify that we hit a problem - either notifier or HB error (issue #3751)
+                  #  OR validate for semantic correctness upon creation/update so we can't get here.
+                  #  notifier.warn("For contributor name '#{parallel_contrib_name_slice}', no contrib matching")
+                  write_name_with_display_form(contributor, contrib_name, parallel_name_values, index, nil, altrepgroup_id)
+                elsif parallel_name_values[index].type == 'display'
+                  # we assume we included this as part of a previous name
+                  next
+                else
+                  write_name_from_parallel(contributor, contrib_name, parallel_contrib_name, nil, altrepgroup_id)
+                end
+              end
+            end
+          end
+
+          def write_name_from_parallel(contributor, name, parallel_name, name_title_group, altrepgroup_id)
             attributes = parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
             type_attr = NAME_TYPE.fetch(contributor.type, name_title_group ? 'personal' : nil)
             attributes[:type] = type_attr if type_attr
@@ -121,6 +150,37 @@ module Cocina
             end
           end
 
+          # rubocop:disable Metrics/ParameterLists
+          def write_name_with_display_form(contributor, name, parallel_name_values, index, name_title_group, altrepgroup_id)
+            display_type_parallel_name = display_type_parallel_name(parallel_name_values)
+            parallel_name = parallel_name_values[index]
+            return if parallel_name.blank?
+
+            attributes = if altrepgroup_id.present?
+                           parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
+                         else
+                           name_attributes(contributor, name, nil)
+                         end
+            type_attr = NAME_TYPE.fetch(contributor.type, name_title_group ? 'personal' : nil)
+            attributes[:type] = type_attr if type_attr
+            xml.name attributes do
+              if parallel_name.structuredValue.present?
+                write_structured(parallel_name)
+              else
+                write_basic(parallel_name)
+              end
+              write_display_form(display_type_parallel_name) if display_type_parallel_name.present?
+              write_identifier(contributor) if contributor.identifier.present?
+              write_note(contributor)
+              write_roles(contributor)
+            end
+          end
+          # rubocop:enable Metrics/ParameterLists
+
+          def display_type_parallel_name(parallel_name_values)
+            parallel_name_values.detect { |parallel_value| parallel_value.type == 'display' }
+          end
+
           def parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
             {
               nameTitleGroup: name_title_group,

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/validators/date_time_validator.rb

@@ -0,0 +1,102 @@
+# 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
+          false
+        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/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.80.0'
+    VERSION = '0.83.0'
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.83.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-07-05 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
@@ -377,6 +420,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 +505,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 +537,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Data models for the SDR