cocina-models 0.94.1 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c6748d5c7659224f4139fc5d96b6b58732183bf133bb8ea32657a81fadc9ff
-  data.tar.gz: 29615bf905de450af973bd8a7ee00d0cd45810a8d2bd2b55166b2e686e0e048f
+  metadata.gz: b9e38c26d285ece89fdd8adb1faf3cc5fd19bb4c905d7cdb7a3a338948bcd43d
+  data.tar.gz: 27aec9cce87dff1300ae06216eed4b9b8c7d2f449e6d8e5eebf209c99a201b94
 SHA512:
-  metadata.gz: 3d6192a5bc54d0133483649d0bf421a4ce32f85b328d9cda131a6ce8aff7df180b045de1b58d5c78836a7ec53e326b04a141e3a616046febfc31650ec8ef4e80
-  data.tar.gz: 93069e72c38d812ddd493c0de9abcb80a0733fad353a36721821250cbf8c36482b1711748760a8f9a1cbc8fa4915654cf4236496f4a99eaa4ab8e687fee74cbe
+  metadata.gz: f9c71b2c8b8740baf151eb3dfe150e9a614cc9c655c03f8cbf4924f884d7ce94c2909ec9e5d9a229eac56bc694cc8b9d8142072762b120e2edba98e7fe49f137
+  data.tar.gz: 8cd9dd1787b286a9816714bf75b5d99a246ac390a914ffc83bbd6c9e79bc0d0cca1644cb4d2c16e1bbbd687a2407b3565645693ab6ac5ef60bf9ab564c4eef59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.94.1)
+    cocina-models (0.95.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -121,7 +121,7 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.3.0)
       rexml
-    rubocop (1.60.1)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

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), [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.
+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) and [Dor-Services-App](https://github.com/sul-dlss/dor-services-app)depend on these gems using the same models.
 
 ### Step 3: Update services directly coupled to the models
 
@@ -164,7 +164,9 @@ This can be accomplished by copying and pasting the cocina-models schemas to the
 
 If step 3A was needed, use the same PRs to also bump the versions of cocina-models, sdr-client, and dor-services-client in these applications/services. Why? When [dor-services-app](https://github.com/sul-dlss/dor-services-app), for example, is updated to use the new models (via the auto-update script), these clients should be updated at the same time or there is risk of models produced by dor-services-app not being acceptable to the clients.
 
-With or without step 3A, perform `bundle update` for cocina-models, sdr-client, and dor-services-client gems in the listed services and then make PRs for those repos.
+With or without step 3A, perform `bundle update` for cocina-models, sdr-client, dor-services-client and dor_indexing* gems in the listed services and then make PRs for those repos.
+
+* dor_indexing gem is used by dor_indexing_app and dor-services-app only.
 
 #### Step 3C: Merge 'em
 

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

@@ -201,6 +201,16 @@ module Cocina
         # @return [String] the title value from combining the pieces of the structured_values by type and order
         #   with desired punctuation per specs
         #
+        # - nonsorting characters value is followed by a space, unless the nonsorting
+        #   character count note has a numeric value equal to the length of the
+        #   nonsorting characters value, in which case no space is inserted
+        # - subtitle is preceded by space colon space, unless it is at the beginning
+        #   of the title string
+        # - partName and partNumber are always separated from each other by comma space
+        # - first partName or partNumber in the string is preceded by period space
+        # - partName or partNumber before nonsorting characters or main title is followed
+        #   by period space
+        #
         # for punctuaion funky town, thank MARC and catalog cards
         #
         # rubocop:disable Metrics/AbcSize
@@ -245,7 +255,7 @@ module Cocina
                        end
             when 'subtitle'
               result = if !add_punctuation?
-                         [result, value].select(&:presence).join(' ')
+                         [result, value.sub(/^:/, '').strip].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}"

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

@@ -14,6 +14,7 @@ module Cocina
           @attributes = attributes
           @error_paths_multiple = []
           @error_paths_blank = []
+          @error_paths_missing_title_type = []
         end
 
         def validate
@@ -23,11 +24,12 @@ module Cocina
 
           raise ValidationError, "Multiple value, groupedValue, structuredValue, and parallelValue in description: #{error_paths_multiple.join(', ')}" unless error_paths_multiple.empty?
           raise ValidationError, "Blank value in description: #{error_paths_blank.join(', ')}" unless error_paths_blank.empty?
+          raise ValidationError, "Missing type for value in description: #{error_paths_missing_title_type.join(', ')}" unless error_paths_missing_title_type.empty?
         end
 
         private
 
-        attr_reader :clazz, :attributes, :error_paths_blank, :error_paths_multiple
+        attr_reader :clazz, :attributes, :error_paths_blank, :error_paths_multiple, :error_paths_missing_title_type
 
         def meets_preconditions?
           [Cocina::Models::Description, Cocina::Models::RequestDescription].include?(clazz)
@@ -36,6 +38,7 @@ module Cocina
         def validate_hash(hash, path)
           validate_values_for_blanks(hash, path)
           validate_values_for_multiples(hash, path)
+          validate_title_type(hash, path)
           hash.each do |key, obj|
             validate_obj(obj, path + [key])
           end
@@ -64,6 +67,19 @@ module Cocina
           error_paths_multiple << path_to_s(path)
         end
 
+        def validate_title_type(hash, path)
+          # only apply to title.structuredValue, title.parallelValue.structuredValue, or relatedResource.title with a value
+          return unless hash[:value] && (path.first == :title || related_resource_title?(path)) && path.include?(:structuredValue)
+
+          # if there is a "value" key, make sure there is also a "type" key, only for title.structuredValue
+          error_paths_missing_title_type << path_to_s(path) unless hash[:type]
+        end
+
+        def related_resource_title?(path)
+          # title is directly within relatedResource, e.g [:relatedResource, 0, :title, 0, :structuredValue, 0])
+          path.first == :relatedResource && path[2] == :title
+        end
+
         def path_to_s(path)
           # This matches the format used by descriptive spreadsheets
           path_str = ''

data/lib/cocina/models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.94.1
+  version: 0.95.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -562,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Data models for the SDR