cocina-models 0.106.0 → 0.107.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e344b96eb11f904d0730963727606fed5046857f72901761c7e75a1101992086
-  data.tar.gz: 1d446ff09f267b94684b57afeada1be9f393fd99874ed360c5c67f6e2d35051c
+  metadata.gz: 3e982057b0f0017c03ce8809fa93494bd179b28a90e6ad3f32ad6859c4a8249c
+  data.tar.gz: 4777322f4d9b18fa6d814b36974dbbbd9e79857a4ce5149a756ae737e82ca49c
 SHA512:
-  metadata.gz: 3941a79c6c26af81128ed0face784ce398c5b343970c5511d5da8cf8aad9dde10d1ea6fe19dad6122e6d460b2a53c3f1bcd9ca800dfbb2885e98d9d37a4e588f
-  data.tar.gz: 4df7a5daf531751de3e26bb168f498a0b07042e039ea6797ee0f42e18893b74a464f72fc7ced0e6625818964f2e67d159bfa133878aa83f4c1410b6e67b0a076
+  metadata.gz: c0c1136149b28c85dfa4c7a5e1aab4ee6829beecb2a04367db82a85f31a4a84aca774a3243fdbbfac34db1dca4d6f7624eaf399548db69a281c0e7059136d67a
+  data.tar.gz: 0ba5d2b587e122a0ab1cd363fcc5c32e0fc3a3a26ae35621967bcb8e0eead73bc87d86f263520be8b6d831ca528f2e7e0a85138f545e31ff8381d90bd826971c

data/.rubocop.yml

@@ -6,7 +6,7 @@ plugins:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.4
 
 # ----- Layout ------
 
@@ -110,7 +110,7 @@ Metrics/PerceivedComplexity:
     - 'lib/cocina/models/mapping/to_mods/*'
     - 'lib/cocina/models/mapping/normalizers/**/*'
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - is_
 
@@ -521,3 +521,20 @@ Style/ItBlockParameter: # new in 1.75
   Enabled: true
 RSpec/IncludeExamples: # new in 3.6
   Enabled: true
+
+Gemspec/AttributeAssignment: # new in 1.77
+  Enabled: true
+Layout/EmptyLinesAfterModuleInclusion: # new in 1.79
+  Enabled: true
+Lint/UselessDefaultValueArgument: # new in 1.76
+  Enabled: true
+Lint/UselessOr: # new in 1.76
+  Enabled: true
+Naming/PredicateMethod: # new in 1.76
+  Enabled: true
+Style/CollectionQuerying: # new in 1.77
+  Enabled: true
+Style/EmptyStringInsideInterpolation: # new in 1.76
+  Enabled: true
+Style/RedundantArrayFlatten: # new in 1.76
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.106.0)
+    cocina-models (0.107.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2.1)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -36,7 +36,7 @@ GEM
     attr_extras (7.1.0)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    bigdecimal (3.3.1)
     byebug (12.0.0)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
@@ -78,7 +78,7 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.13.2)
+    json (2.15.1)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
@@ -86,7 +86,7 @@ GEM
     lint_roller (1.1.0)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
+    minitest (5.26.0)
     multi_json (1.17.0)
     nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
@@ -99,9 +99,9 @@ GEM
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    prism (1.5.1)
+    prism (1.6.0)
     racc (1.8.1)
-    rack (3.2.1)
+    rack (3.2.3)
     rainbow (3.1.1)
     rake (13.3.0)
     regexp_parser (2.11.3)
@@ -109,18 +109,18 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.5)
+    rspec-support (3.13.6)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.80.2)
+    rubocop (1.81.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -128,10 +128,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.7.1)
@@ -158,7 +158,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
-    uri (1.0.3)
+    uri (1.0.4)
     zeitwerk (2.7.3)
 
 PLATFORMS

data/README.md

@@ -91,32 +91,8 @@ RAILS_ENV=production bin/validate-cocina -p 8
 
 ## Running Reports in DSA
 
-Custom reports stored in dor-services-app can be run similarly to validation testing described above.
-
-1. Connect to the `sdr-infra` box:
-    ```shell
-    ssh sdr-infra
-    ```
-1. Start a shell as the `deploy` user:
-    ```shell
-    # you may or may not need to supply the `-n SUNETID` argument
-    ksu deploy
-    ```
-1. Go to the `~/dor-services-app` directory and reset to main if needed (verify nobody else is using this first though):
-    ```shell
-    cd ~/dor-services-app
-    git status # see if there are any unsaved changes, if so, you may need to git stash them
-    git pull # OR git reset --hard main   to just ditch any local unsaved changes
-    ```
-1. Connect to the desired database by setting the environment variables as described in the section above.  This must be done each time you SSH back into the box to run a new report.
-1. Run the report (good idea to do it in a screen or via background process in case you get disconnected):
-    ```shell
-    bundle exec bin/rails r -e production "BadIso8601Dates.report" > BadIso8601Dates.csv
-    ```
-1. When done, you can pull the report to your laptop as needed:
-    ```shell
-    scp sdr-infra:/opt/app/deploy/dor-services-app/BadIso8601Dates.csv .
-    ```
+See https://github.com/sul-dlss/dor-services-app/blob/main/README.md#running-reports
+
 
 ## Releasing a patch change
 A patch change is a change that (1) does not affect the data model; (2) does not alter the openapi.yml; and more broadly (3) does not matter if some applications have the change and others do not.
@@ -143,7 +119,7 @@ Send a note to `#dlss-infra-chg-mgmt` on Slack to let people know what is changi
 The release process is much like any other gem. While on main:
 1. Bump the version in `lib/cocina/models/version.rb`
 2. `bundle install` so that `Gemfile.lock` is updated.
-3. Commit those changes. 
+3. Commit those changes.
 4. Run:
 ```
 bundle exec rake release
@@ -179,11 +155,11 @@ Copy and paste the cocina-models schemas to each project's `openapi.yml`. By con
 If you updated the `openapi.yml` in step 3A, use the same PR for step 3B. 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.
 
 1. Perform `bundle update --conservative cocina-models dor-services-client` in the  services above and make PRs for those repos if they don't already exist. You may first need to update how these gems are pinned in the `Gemfile` in order to bump them.
-2. Note that sdr-client is not currently used in these applications, but if it were, would also need to be bumped to the latest release. 
+2. Note that sdr-client is not currently used in these applications, but if it were, would also need to be bumped to the latest release.
 
 #### Step 3C: Merge 'em
 
-Get the directly coupled services PRs merged before the deploy in step 5. 
+Get the directly coupled services PRs merged before the deploy in step 5.
 
 See the IMPORTANT note above about the timing of merging these PRs if you are waiting for dependency updates to make the updates to other dependent applications.
 
@@ -211,7 +187,7 @@ Create a branch and update cocina-models:
 ```
 bundle update --conservative cocina-models
 ```
-Once merged, it will deploy to stage via CD. 
+Once merged, it will deploy to stage via CD.
 
 ### Step 5: Deploy and test
 
@@ -228,7 +204,7 @@ It is safest to ensure _all_ the integration tests run cleanly.  However, patch
 
 **[Turn off Google Books](https://sul-gbooks-prod.stanford.edu/features) when deploying to production.** This avoids failed deposit due to a temporary Cocina model mismatch. Unlike other applications, the deposits will fail without retry and require manual remediation.
 
-In addition to deploying infrastructure apps via sdr-deploy, tag and cut a release of purl-fetcher. That will trigger its deploy to production. 
+In addition to deploying infrastructure apps via sdr-deploy, tag and cut a release of purl-fetcher. That will trigger its deploy to production.
 
 ## Usage conventions
 

data/cocina-models.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.4'
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'deprecation'

data/description_types.yml

@@ -99,6 +99,8 @@ contributor.note:
     description: Institution with which the contributor is associated.
   - value: citation status
     description: Indicator of whether the contributor should be included in the citation.
+  - value: contact email
+    description: Preferred email contact for contributor.
   - value: description
     description: Biographical information about the contributor.
 event:

data/docs/description_types.md

@@ -106,6 +106,8 @@ _Path: contributor.note.type_
     * Institution with which the contributor is associated.
   * citation status
     * Indicator of whether the contributor should be included in the citation.
+  * contact email
+    * Preferred email contact for contributor.
   * description
     * Biographical information about the contributor.
 # Event types

data/lib/cocina/generator/schema_base.rb

@@ -22,7 +22,7 @@ module Cocina
       end
 
       def name
-        "#{key || schema_doc.name}#{lite ? 'Lite' : ''}"
+        "#{key || schema_doc.name}#{'Lite' if lite}"
       end
 
       # Allows nullable values to be set to nil. This is useful when doing an

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

@@ -8,6 +8,7 @@ module Cocina
       # TitleBuilder selects the prefered title from the cocina object for solr indexing
       class TitleBuilder # rubocop:disable Metrics/ClassLength
         extend Deprecation
+
         # @param [Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
         # @param [Array<Cocina::Models::FolioCatalogLink>] catalog_links the folio catalog links to check for digital serials part labels
         # @param [Symbol] strategy ":first" is the strategy for selection when primary or display

data/lib/cocina/models/checkable.rb

@@ -5,23 +5,23 @@ module Cocina
     # A common interface for interrogating a model instance's type
     module Checkable
       def admin_policy?
-        (self.class::TYPES & AdminPolicy::TYPES).any?
+        self.class::TYPES.intersect?(AdminPolicy::TYPES)
       end
 
       def collection?
-        (self.class::TYPES & Collection::TYPES).any?
+        self.class::TYPES.intersect?(Collection::TYPES)
       end
 
       def dro?
-        (self.class::TYPES & DRO::TYPES).any?
+        self.class::TYPES.intersect?(DRO::TYPES)
       end
 
       def file?
-        (self.class::TYPES & File::TYPES).any?
+        self.class::TYPES.intersect?(File::TYPES)
       end
 
       def file_set?
-        (self.class::TYPES & FileSet::TYPES).any?
+        self.class::TYPES.intersect?(FileSet::TYPES)
       end
     end
   end

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

@@ -97,7 +97,7 @@ module Cocina
             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)
+              write_name_from_parallel(contributor, contributor.name.first, parallel_name_values.first, 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

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

@@ -91,8 +91,8 @@ module Cocina
 
           def geographic_and_geographic_code?(subject, subject_values)
             subject.type == 'place' &&
-              subject_values.count(&:value) == 1 &&
-              subject_values.count(&:code) == 1
+              subject_values.one?(&:value) &&
+              subject_values.one?(&:code)
           end
 
           # rubocop:disable Metrics/CyclomaticComplexity

data/lib/cocina/models/validatable.rb

@@ -7,9 +7,9 @@ module Cocina
       extend ActiveSupport::Concern
 
       class_methods do
-        def new(attributes = default_attributes, safe = false, validate = true, &block)
+        def new(attributes = default_attributes, safe = false, validate = true, &)
           Validators::Validator.validate(self, attributes) if validate
-          super(attributes, safe, &block)
+          super(attributes, safe, &)
         end
       end
 

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

@@ -61,13 +61,13 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end
 
         def collection?
-          (clazz::TYPES & Collection::TYPES).any?
+          clazz::TYPES.intersect?(Collection::TYPES)
         rescue NameError
           false
         end

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

@@ -33,7 +33,7 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end

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

@@ -62,22 +62,30 @@ module Cocina
         end
 
         def validate_values_for_multiples(hash, path)
-          return unless hash.count { |key, value| %i[value groupedValue structuredValue parallelValue].include?(key) && value.present? } > 1
+          return unless hash.count { |key, value| %w[value groupedValue structuredValue parallelValue].include?(key) && value.present? } > 1
 
           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)
+          return unless hash[:value] && (structured_value_title?(path) || related_resource_title?(path))
 
           # 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
+          # title is within relatedResource, e.g ["relatedResource", 0, "title", 0, "structuredValue", 0])
+          structured_value_path = path[4] == 'structuredValue' || (path[4] == 'parallelValue' && path[6] == 'structuredValue')
+          path.first == 'relatedResource' && path[2] == 'title' && structured_value_path
+        end
+
+        def structured_value_title?(path)
+          # title path includes a structuredValue directly or within a parallelValue
+          # e.g. ["title", 0, "structuredValue", 0] or ["title", 0, "parallelValue", 0, "structuredValue", 0])
+          structured_value_path = path[2] == 'structuredValue' || (path[2] == 'parallelValue' && path[4] == 'structuredValue')
+          path.first == 'title' && structured_value_path
         end
 
         def path_to_s(path)

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

@@ -32,7 +32,7 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end

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

@@ -28,7 +28,7 @@ module Cocina
         attr_reader :clazz, :attributes
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any? && attributes[:externalIdentifier].present?
+          clazz::TYPES.intersect?(DRO::TYPES) && attributes[:externalIdentifier].present?
         rescue NameError
           false
         end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.106.0'
+    VERSION = '0.107.1'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -80,8 +80,8 @@ module Cocina
 
       REQUEST_ADMIN_POLICY_DEFAULTS = ADMIN_POLICY_DEFAULTS.except(:id)
 
-      def self.build_dro_properties(id:, **kwargs)
-        build_request_dro_properties(**kwargs)
+      def self.build_dro_properties(id:, **)
+        build_request_dro_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
@@ -134,8 +134,8 @@ module Cocina
         Cocina::Models.build_request(build_request_dro_properties(**REQUEST_DRO_DEFAULTS.merge(attributes)))
       end
 
-      def self.build_collection_properties(id:, **kwargs)
-        build_request_collection_properties(**kwargs)
+      def self.build_collection_properties(id:, **)
+        build_request_collection_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
@@ -194,8 +194,8 @@ module Cocina
         Cocina::Models.build_request(build_request_admin_policy_properties(**REQUEST_ADMIN_POLICY_DEFAULTS.merge(attributes)))
       end
 
-      def self.build_admin_policy_properties(id:, **kwargs)
-        build_request_admin_policy_properties(**kwargs)
+      def self.build_admin_policy_properties(id:, **)
+        build_request_admin_policy_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.106.0
+  version: 0.107.1
 platform: ruby
 authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 2025-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -528,7 +528,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="