cocina-models 0.93.1 → 0.94.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd049152e51891b2ab7fc1bd63fff3f95f8914f9939122ffb6990667f17ad98
-  data.tar.gz: 59645a00ccb0d8b21ae4830563f037dba0655a85d4f1b268ba21da66e6406d43
+  metadata.gz: 38c6748d5c7659224f4139fc5d96b6b58732183bf133bb8ea32657a81fadc9ff
+  data.tar.gz: 29615bf905de450af973bd8a7ee00d0cd45810a8d2bd2b55166b2e686e0e048f
 SHA512:
-  metadata.gz: df8635b1b7318cd957f2071aac2e46cce144119d5c497d166d2e0152db0269fdccd611ea72872e80217a9e1e07ed354393add1e440cc580f86e8493953684767
-  data.tar.gz: f12b79669c54e657aa0956412227a18f7445ba4940d4a6a5d27f9d6d9a79fe72aa408df096114e636ff8bd99d76bdfeb99f017efef989f12a27ef891bb4a9033
+  metadata.gz: 3d6192a5bc54d0133483649d0bf421a4ce32f85b328d9cda131a6ce8aff7df180b045de1b58d5c78836a7ec53e326b04a141e3a616046febfc31650ec8ef4e80
+  data.tar.gz: 93069e72c38d812ddd493c0de9abcb80a0733fad353a36721821250cbf8c36482b1711748760a8f9a1cbc8fa4915654cf4236496f4a99eaa4ab8e687fee74cbe

data/.rspec

@@ -1,3 +1,2 @@
---format documentation
 --color
 --require spec_helper

data/.rubocop.yml

@@ -458,4 +458,39 @@ Style/YAMLFileRead: # new in 1.53
 RSpec/ReceiveMessages: # new in 2.23
   Enabled: true
 RSpec/Rails/NegationBeValid: # new in 2.23
-  Enabled: true
+  Enabled: true
+
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Capybara/ClickLinkOrButtonStyle: # new in 2.19
+  Enabled: true
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
+FactoryBot/IdSequence: # new in 2.24
+  Enabled: true
+RSpec/EmptyMetadata: # new in 2.24
+  Enabled: true
+RSpec/Eq: # new in 2.24
+  Enabled: true
+RSpec/MetadataStyle: # new in 2.24
+  Enabled: true
+RSpec/RedundantPredicateMatcher: # new in 2.26
+  Enabled: true
+RSpec/RemoveConst: # new in 2.26
+  Enabled: true
+RSpec/SpecFilePathFormat: # new in 2.24
+  Enabled: true
+RSpec/SpecFilePathSuffix: # new in 2.24
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.93.1)
+    cocina-models (0.94.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -21,7 +21,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -34,14 +34,14 @@ GEM
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.6)
     byebug (11.1.3)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     deprecation (1.1.0)
       activesupport
@@ -62,7 +62,8 @@ GEM
       dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -81,7 +82,7 @@ GEM
       multi_json
     language_server-protocol (3.17.0.3)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     multi_json (1.15.0)
     mutex_m (0.2.0)
     nokogiri (1.16.0)
@@ -92,7 +93,7 @@ GEM
     openapi_parser (1.0.0)
     optimist (3.1.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -101,7 +102,7 @@ GEM
     rack (3.0.8)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -120,11 +121,11 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.3.0)
       rexml
-    rubocop (1.59.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -133,13 +134,13 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

data/README.md

@@ -143,7 +143,7 @@ which pushes the gem to rubygems.org.
 
 ### Step 2: Update client gems coupled to the models
 
-Release new versions of [sdr-client](https://github.com/sul-dlss/sdr-client) and [dor-services-client](https://github.com/sul-dlss/dor-services-client/) pinned to use the new cocina-models version because applications such as [Argo](https://github.com/sul-dlss/argo) depend on both of these gems using the same models.
+Release new versions of [sdr-client](https://github.com/sul-dlss/sdr-client), [dor-services-client](https://github.com/sul-dlss/dor-services-client/), and [dor_indexing](https://github.com/sul-dlss/dor_indexing/) pinned to use the new cocina-models version because applications such as [Argo](https://github.com/sul-dlss/argo) depend on both of these gems using the same models.
 
 ### Step 3: Update services directly coupled to the models
 

data/description_types.yml

@@ -356,6 +356,7 @@ identifier:
   - value: DOI
     code: doi
   - value: druid
+  - value: EUR-OP
   - value: FOLIO
     description: FOLIO HRID for the source record of the metadata.
   - value: GTIN-14 ID
@@ -391,6 +392,8 @@ identifier:
   - value: PMCID
   - value: PMID
   - value: record id
+  - value: ROR
+    code: ror
   - value: Senate Number
   - value: Series
   - value: SICI
@@ -424,6 +427,8 @@ note:
   - value: access note
     status: deprecated
     use: access
+  - value: access restriction
+    description: Information about restrictions on who may or how to access a resource.
   - value: acquisition
     description: The transfer of a resource to a repository.
   - value: action
@@ -432,6 +437,9 @@ note:
   - value: additions
     description: Resources added after initial acquisition.
   - value: admin
+    status: deprecated
+    use: administrative
+  - value: administrative
     description: Administrative or internal use.
   - value: affiliation
     description: Institution with which a person or other entity is associated.
@@ -542,6 +550,9 @@ note:
   - value: reproduction
   - value: research
   - value: restriction
+  - value: restriction on access
+    status: deprecated
+    use: access restriction
   - value: rubric
   - value: scope and content
   - value: secfol
@@ -561,6 +572,7 @@ note:
   - value: table of contents
   - value: target audience
   - value: technical note
+    description: Technological requirements for accessing or using the resource.
   - value: thesis
   - value: transcript
   - value: translation
@@ -712,6 +724,8 @@ subject.structuredValue:
     description: An individual identity.
   - value: place
     description: A geographic location associated with the content of a resource.
+  - value: point coordinates
+    description: The latitude and longitude of a place associated with the content of a resource.
   - value: region
     description: An area that incorporates more than one first-order jurisdiction.
   - value: south

data/docs/description_types.md

@@ -363,6 +363,7 @@ _Path: identifier.type_
   * document number
   * DOI
   * druid
+  * EUR-OP
   * FOLIO
     * FOLIO HRID for the source record of the metadata.
   * GTIN-14 ID
@@ -385,6 +386,7 @@ _Path: identifier.type_
   * PMCID
   * PMID
   * record id
+  * ROR
   * Senate Number
   * Series
   * SICI
@@ -409,6 +411,8 @@ _Path: note.type_
     * Information about gaining access to a resource.
   * access note
     * Deprecated. Preferred usage: access
+  * access restriction
+    * Information about restrictions on who may or how to access a resource.
   * acquisition
     * The transfer of a resource to a repository.
   * action
@@ -417,6 +421,8 @@ _Path: note.type_
   * additions
     * Resources added after initial acquisition.
   * admin
+    * Deprecated. Preferred usage: administrative
+  * administrative
     * Administrative or internal use.
   * affiliation
     * Institution with which a person or other entity is associated.
@@ -522,6 +528,8 @@ _Path: note.type_
   * reproduction
   * research
   * restriction
+  * restriction on access
+    * Deprecated. Preferred usage: access restriction
   * rubric
   * scope and content
   * secfol
@@ -539,6 +547,7 @@ _Path: note.type_
   * table of contents
   * target audience
   * technical note
+    * Technological requirements for accessing or using the resource.
   * thesis
   * transcript
   * translation
@@ -695,6 +704,8 @@ _Path: subject.structuredValue.type_
     * An individual identity.
   * place
     * A geographic location associated with the content of a resource.
+  * point coordinates
+    * The latitude and longitude of a place associated with the content of a resource.
   * region
     * An area that incorporates more than one first-order jurisdiction.
   * south

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

@@ -12,7 +12,8 @@ module Cocina
         # @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
+        # @return [String, Array] the title value for Solr - for :first strategy, a string; for :all strategy, an array
+        #   (e.g. title displayed in blacklight search results vs boosting values for search result rankings)
         def self.build(titles, strategy: :first, add_punctuation: true)
           if titles.respond_to?(:description)
             Deprecation.warn(self,
@@ -27,7 +28,7 @@ module Cocina
         #   we can boost matches on it in search results (boost matching this string higher than matching full title string)
         #   e.g. "The Hobbit" (main_title) vs "The Hobbit, or, There and Back Again (full_title)
         # @param [[Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
-        # @return [String] the main title value for Solr
+        # @return [Array<String>] the main title value(s) for Solr - array due to possible parallelValue
         def self.main_title(titles)
           new(strategy: :first, add_punctuation: false).main_title(titles)
         end
@@ -35,9 +36,9 @@ module Cocina
         # the "full title" is the title WITH subtitle, part name, etc.  We want to able able to index it separately so
         #   we can boost matches on it in search results (boost matching this string higher than other titles present)
         # @param [[Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
-        # @return [String] the title value for Solr
+        # @return [Array<String>] the full title value(s) for Solr - array due to possible parallelValue
         def self.full_title(titles)
-          new(strategy: :first, add_punctuation: false).build(titles)
+          [new(strategy: :first, add_punctuation: false, only_one_parallel_value: false).build(titles)].flatten.compact
         end
 
         # "additional titles" are all title data except for full_title.  We want to able able to index it separately so
@@ -45,16 +46,28 @@ module Cocina
         # @param [[Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
         # @return [Array<String>] the values for Solr
         def self.additional_titles(titles)
-          new(strategy: :all, add_punctuation: false).build(titles) - [full_title(titles)]
+          [new(strategy: :all, add_punctuation: false).build(titles)].flatten - full_title(titles)
         end
 
-        def initialize(strategy:, add_punctuation:)
+        # @param strategy [Symbol] ":first" selects a single title value based on precedence of
+        #   primary, untyped, first occurrence. ":all" returns an array containing all the values.
+        # @param add_punctuation [boolean] whether the title should be formmated with punctuation (think of a structured
+        #   value coming from a MARC record, which is designed for catalog cards.)
+        # @param only_one_parallel_value [boolean] when true, choose one of the parallel values according to precedence
+        #   of primary, untyped, first occurrence.  When false, return an array containing all the parallel values.
+        #   Why? Think of e.g. title displayed in blacklight search results vs boosting values for ranking of search
+        #   results
+        def initialize(strategy:, add_punctuation:, only_one_parallel_value: true)
           @strategy = strategy
           @add_punctuation = add_punctuation
+          @only_one_parallel_value = only_one_parallel_value
         end
 
         # @param [[Array<Cocina::Models::Title>] cocina_titles the titles to consider
-        # @return [String] the title value for Solr
+        # @return [String, Array] the title value for Solr - for :first strategy, a string; for :all strategy, an array
+        #   (e.g. title displayed in blacklight search results vs boosting values for search result rankings)
+        #
+        # rubocop:disable Metrics/PerceivedComplexity
         def build(cocina_titles)
           cocina_title = primary_title(cocina_titles) || untyped_title(cocina_titles)
           cocina_title = other_title(cocina_titles) if cocina_title.blank?
@@ -62,15 +75,23 @@ module Cocina
           if strategy == :first
             extract_title(cocina_title)
           else
-            cocina_titles.map { |ctitle| extract_title(ctitle) }.flatten
+            result = cocina_titles.map { |ctitle| extract_title(ctitle) }.flatten
+            if only_one_parallel_value? && result.length == 1
+              result.first
+            else
+              result
+            end
           end
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
+        # this is the single "short title" - the title without subtitle, part name, etc.
+        #    this may be useful for boosting and exact matching for search results
+        # @return [Array<String>] the main title value(s) for Solr - can be array due to parallel titles
         def main_title(titles)
           cocina_title = primary_title(titles) || untyped_title(titles)
           cocina_title = other_title(titles) if cocina_title.blank?
 
-          cocina_title = cocina_title.first if cocina_title.is_a?(Array)
           extract_main_title(cocina_title)
         end
 
@@ -79,40 +100,71 @@ module Cocina
         attr_reader :strategy
 
         def extract_title(cocina_title)
+          title_values = if cocina_title.value
+                           cocina_title.value
+                         elsif cocina_title.structuredValue.present?
+                           rebuild_structured_value(cocina_title)
+                         elsif cocina_title.parallelValue.present?
+                           extract_title_parallel_values(cocina_title)
+                         end
+          result = [title_values].flatten.compact.map { |val| remove_trailing_punctuation(val.strip) }
+          result.length == 1 ? result.first : result
+        end
+
+        # stategy :first says to return a single value (default: true)
+        # only_one_parallel_value? says to return a single value, even if that value is a parallelValue (default: false)
+        #
+        # rubocop:disable Metrics/PerceivedComplexity
+        def extract_title_parallel_values(cocina_title)
+          primary = cocina_title.parallelValue.find { |pvalue| pvalue.status == 'primary' }
+          if primary && only_one_parallel_value? && strategy == :first
+            # we have a primary title and we know we want a single value
+            extract_title(primary)
+          elsif only_one_parallel_value? && strategy == :first
+            # no primary value;  algorithm says prefer an untyped value over a typed value for single value
+            untyped = cocina_title.parallelValue.find { |pvalue| pvalue.type.blank? }
+            extract_title(untyped || cocina_title.parallelValue.first)
+          else
+            cocina_title.parallelValue.map { |pvalue| extract_title(pvalue) }
+          end
+        end
+        # rubocop:enable Metrics/PerceivedComplexity
+
+        # @return [Array<String>] the main title value(s) for Solr - can be array due to parallel titles
+        def extract_main_title(cocina_title) # rubocop:disable Metrics/PerceivedComplexity
           result = if cocina_title.value
-                     cocina_title.value
+                     cocina_title.value # covers both title and main title types
                    elsif cocina_title.structuredValue.present?
-                     title_from_structured_values(cocina_title)
+                     main_title_from_structured_values(cocina_title)
                    elsif cocina_title.parallelValue.present?
-                     return build(cocina_title.parallelValue)
+                     primary = cocina_title.parallelValue.find { |pvalue| pvalue.status == 'primary' }
+                     if primary
+                       extract_main_title(primary)
+                     else
+                       cocina_title.parallelValue.map { |pvalue| extract_main_title(pvalue) }
+                     end
                    end
-          remove_trailing_punctuation(result.strip) if result.present?
-        end
+          return [] if result.blank?
 
-        def extract_main_title(cocina_title)
-          if cocina_title.value
-            cocina_title.value # covers both title and main title types
-          elsif cocina_title.structuredValue.present?
-            main_title_from_structured_values(cocina_title)
-          elsif cocina_title.parallelValue.present?
-            main_title(cocina_title.parallelValue)
-          end
+          [result].flatten.compact.map { |val| remove_trailing_punctuation(val) }
         end
 
         def add_punctuation?
           @add_punctuation
         end
 
+        def only_one_parallel_value?
+          @only_one_parallel_value
+        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
+        def primary_title(cocina_titles)
+          primary_title = cocina_titles.find { |title| title.status == 'primary' }
           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|
+          cocina_titles.find do |title|
             title.parallelValue&.find do |parallel_title|
               parallel_title.status == 'primary'
             end
@@ -149,56 +201,63 @@ module Cocina
         # @return [String] the title value from combining the pieces of the structured_values by type and order
         #   with desired punctuation per specs
         #
+        # for punctuaion funky town, thank MARC and catalog cards
+        #
+        # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/PerceivedComplexity
-        def title_from_structured_values(title)
-          # parse out the parts
-          main_title = ''
-          subtitle = ''
-          non_sort_value = ''
+        def rebuild_structured_value(cocina_title)
+          result = ''
           part_name_number = ''
-          title.structuredValue.each do |structured_value|
-            # There can be a structuredValue inside a structuredValue.  For example,
+          cocina_title.structuredValue.each do |structured_value| # rubocop:disable Metrics/BlockLength
+            # 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?
+            return rebuild_structured_value(structured_value) if structured_value.structuredValue.present?
 
             value = structured_value.value&.strip
             next unless value
 
-            # additional types:  name, uniform ...
+            # additional types ignored here, e.g. name, uniform ...
             case structured_value.type&.downcase
             when 'nonsorting characters'
-              non_sort_value = "#{value}#{non_sorting_padding(title, value)}"
+              padding = non_sorting_padding(cocina_title, value)
+              result = add_non_sorting_value(result, value, padding)
             when 'part name', 'part number'
-              part_name_number = part_name_number(title.structuredValue) if part_name_number.blank?
-            when 'main title', 'title'
-              main_title = value
-            when 'subtitle'
-              # combine multiple subtitles into a single string
-              subtitle = if !add_punctuation?
-                           if subtitle.present?
-                             [subtitle, value].join(' ')
-                           else
-                             value
-                           end
-                         elsif subtitle.present?
-                           # subtitle is preceded by space colon space, unless it is at the beginning of the title string
-                           "#{subtitle.sub(/[. :]+$/, '')} : #{value.sub(/^:/, '').strip}"
+              if part_name_number.blank?
+                part_name_number = part_name_number(cocina_title.structuredValue)
+                result = if !add_punctuation?
+                           [result, part_name_number].join(' ')
+                         elsif result.present?
+                           # part name/number is preceded by period space, unless it is at the beginning of the title string
+                           "#{result.sub(/[ .,]*$/, '')}. #{part_name_number}. "
                          else
-                           value.sub(/^:/, '').strip
+                           "#{part_name_number}. "
                          end
+              end
+            when 'main title', 'title'
+              # nonsorting characters ending with hyphen, apostrophe or space should be slammed against the main title,
+              #   even if we are not adding punctuation
+              result = if add_punctuation? || result.ends_with?(' ') || result.ends_with?('-') || result.ends_with?('\'')
+                         [result, value].join
+                       else
+                         [remove_trailing_punctuation(result), remove_trailing_punctuation(value)].select(&:presence).join(' ')
+                       end
+            when 'subtitle'
+              result = if !add_punctuation?
+                         [result, value].select(&:presence).join(' ')
+                       elsif result.present?
+                         # subtitle is preceded by space colon space, unless it is at the beginning of the title string
+                         "#{result.sub(/[. :]+$/, '')} : #{value.sub(/^:/, '').strip}"
+                       else
+                         result = value.sub(/^:/, '').strip
+                       end
             end
           end
 
-          # combine the parts into a single title string
-          if add_punctuation?
-            combine_with_punctuation(non_sort_value: non_sort_value, main_title: main_title, subtitle: subtitle,
-                                     part_name_number: part_name_number)
-          else
-            ["#{non_sort_value}#{main_title}", subtitle, part_name_number].select(&:presence).join(' ')
-          end
+          result
         end
+        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Metrics/PerceivedComplexity
@@ -206,11 +265,14 @@ module Cocina
         # main_title is title.structuredValue.value with type 'main title' (or just title.value)
         # @param [Cocina::Models::Title] title with structured values
         # @return [String] the main title value
-        def main_title_from_structured_values(cocina_title) # rubocop:disable Metrics/MethodLength
+        #
+        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/PerceivedComplexity
+        def main_title_from_structured_values(cocina_title)
           result = ''
           # combine pieces of the cocina structuredValue into a single title
           cocina_title.structuredValue.each do |structured_value|
-            # There can be a structuredValue inside a structuredValue.  For example,
+            # There can be a structuredValue inside a structuredValue, for example,
             #   a uniform title where both the name and the title have internal StructuredValue
             return main_title_from_structured_values(structured_value) if structured_value.structuredValue.present?
 
@@ -219,43 +281,36 @@ module Cocina
 
             case structured_value.type&.downcase
             when 'nonsorting characters'
-              non_sort_value = "#{value}#{non_sorting_padding(cocina_title, value)}"
-              result = "#{non_sort_value}#{result}" # non-sorting characters are at the beginning of the title
-            when 'main title'
-              result = "#{result}#{value}"
-            when 'title'
-              result = value
+              padding = non_sorting_padding(cocina_title, value)
+              result = add_non_sorting_value(result, value, padding)
+            when 'main title', 'title'
+              result = if ['\'', '-'].include?(result.last)
+                         [result, value].join
+                       else
+                         [remove_trailing_punctuation(result).strip, remove_trailing_punctuation(value).strip].select(&:presence).join(' ')
+                       end
             end
           end
-          result
-        end
 
-        # Thank MARC and catalog cards for this mess. We need to add punctuation.
-        # rubocop:disable Metrics/MethodLength
-        def combine_with_punctuation(non_sort_value:, main_title:, subtitle:, part_name_number:)
-          result = "#{non_sort_value}#{main_title}"
-          if subtitle.present?
-            result = if result.present?
-                       "#{result.sub(/[. :]+$/, '')} : #{subtitle.sub(/^:/, '').strip}"
-                     else
-                       result = subtitle
-                     end
-          end
-          if part_name_number.present?
-            result = if result.present?
-                       "#{result.sub(/[ .,]*$/, '')}. #{part_name_number}."
-                     else
-                       "#{part_name_number}."
-                     end
-          end
           result
         end
         # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/PerceivedComplexity
 
+        # Thank MARC and catalog cards for this mess.
         def remove_trailing_punctuation(title)
           title.sub(%r{[ .,;:/\\]+$}, '')
         end
 
+        def add_non_sorting_value(title_so_far, non_sorting_value, padding)
+          non_sort_value = "#{non_sorting_value}#{padding}"
+          if title_so_far.present?
+            [title_so_far.strip, padding, non_sort_value].join
+          else
+            non_sort_value
+          end
+        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

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

@@ -11,9 +11,7 @@ module Cocina
           PurlValidator,
           CatalogLinksValidator,
           AssociatedNameValidator,
-          # Removing until production data can be remediated and/or additional types can be added to configuration.
-          # See also spec/cocina/models/validatable_spec.rb:59
-          # DescriptionTypesValidator,
+          DescriptionTypesValidator,
           DescriptionValuesValidator,
           DateTimeValidator,
           LanguageTagValidator
@@ -27,12 +25,12 @@ module Cocina
           VALIDATORS.each { |validator| validator.validate(clazz, attributes_hash) }
         end
 
-        def self.deep_transform_values(object, &block)
+        def self.deep_transform_values(object, ...)
           case object
           when Hash
-            object.transform_values { |value| deep_transform_values(value, &block) }
+            object.transform_values { |value| deep_transform_values(value, ...) }
           when Array
-            object.map { |e| deep_transform_values(e, &block) }
+            object.map { |e| deep_transform_values(e, ...) }
           else
             yield(object)
           end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.93.1'
+    VERSION = '0.94.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.93.1
+  version: 0.94.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-04 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport