cocina-models 0.114.0 → 0.115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8514cca9a06bbf3e7c36d84a1f27d093e16a263e8ac1cb92289b6640d28bec
-  data.tar.gz: '09f25bf203314c534eba5e21a16b163f56b21ac2e858cf9a5a25f309086efa12'
+  metadata.gz: 4d9e710c098333b0b95f15f1f624a365b7067e3ef638d48e7f04bcbc72f2b038
+  data.tar.gz: 2bcb210b1f563ddc1916fe8a718f326184c75eb077f3c931372083ad1bf8c179
 SHA512:
-  metadata.gz: 2dce9b0cc4eb70cc6a2ddbc2dda88e5249b9ac58a0ec96523ec9c3e23ebe82108d87eb1e36b70e8e44a0d8c0abf75682c6f284dbda26e4cefe469b4acf5bf715
-  data.tar.gz: 795ba280b81c888fd005cc5af39d671b942f3d5b718b61b44e902581d476958654f28485aec4f8d18de4d725a6b9338c84c8a0acc4a7c315b04e5cd2ec22c9a8
+  metadata.gz: ec2b6a2e5a92c4cc712e09e2edc23a6975c37eb71f13133e1400d21d999880f1a79a8962624bdd339cffaa08e88a0fffd4395c716b1ed49360c5045a43edf666
+  data.tar.gz: 69f0f8869d2536477765b033c39387ef4693f648e50747fa49e15d1cb1cd27be7bc830dec49bf5beb06a1a04472ddf78750201c60c31d002f47006ed72c99751

data/.rubocop.yml

@@ -540,7 +540,6 @@ Style/RedundantArrayFlatten: # new in 1.76
   Enabled: true
 Style/ArrayIntersectWithSingleElement: # new in 1.81
   Enabled: true
-
 Style/EmptyClassDefinition: # new in 1.83
   Enabled: true
 Style/ModuleMemberExistenceCheck: # new in 1.82
@@ -552,4 +551,30 @@ Style/ReverseFind: # new in 1.83
 RSpec/LeakyLocalVariable: # new in 3.8
   Enabled: true
 RSpec/Output: # new in 3.9
-  Enabled: true
+  Enabled: true
+Lint/DataDefineOverride: # new in 1.85
+  Enabled: true
+Lint/UnreachablePatternBranch: # new in 1.85
+  Enabled: true
+Style/FileOpen: # new in 1.85
+  Enabled: true
+Style/MapJoin: # new in 1.85
+  Enabled: true
+Style/OneClassPerFile: # new in 1.85
+  Enabled: true
+Style/PartitionInsteadOfDoubleSelect: # new in 1.85
+  Enabled: true
+Style/PredicateWithKind: # new in 1.85
+  Enabled: true
+Style/ReduceToHash: # new in 1.85
+  Enabled: true
+Style/RedundantMinMaxBy: # new in 1.85
+  Enabled: true
+Style/RedundantStructKeywordInit: # new in 1.85
+  Enabled: true
+Style/SelectByKind: # new in 1.85
+  Enabled: true
+Style/SelectByRange: # new in 1.85
+  Enabled: true
+Style/TallyMethod: # new in 1.85
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.114.0)
+    cocina-models (0.115.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -162,7 +162,7 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-rake (0.7.1)
@@ -219,7 +219,7 @@ CHECKSUMS
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
-  cocina-models (0.114.0)
+  cocina-models (0.115.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -275,7 +275,7 @@ CHECKSUMS
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
   rubocop (1.85.1) sha256=3dbcf9e961baa4c376eeeb2a03913dca5e3987033b04d38fa538aa1e7406cc77
-  rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
+  rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
@@ -295,4 +295,4 @@ CHECKSUMS
   zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
 
 BUNDLED WITH
-  4.0.7
+  4.0.8

data/README.md

@@ -55,7 +55,7 @@ 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, mapping, or validation change will conflict with some existing objects then `bin/validate-data` should be used for testing.  This operates on a sample of objects from the repository and reports any validation errors. You may get the sample by running the script [bin/export-cocina-head-versions](https://github.com/sul-dlss/dor-services-app/pull/5854) and downloading the data file to your computer.
+If there is a possibility that a model, mapping, or validation change will conflict with some existing objects then `bin/validate-data` should be used for testing.  This operates on a sample of objects from the repository and reports any validation errors. You may get the sample by running the script [bin/export-cocina-head-versions](https://github.com/sul-dlss/dor-services-app?tab=readme-ov-file#export-data) and downloading the data file to your computer. Running a full validation takes about 2 hours.
 
 
 Alternatively, you can use [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) for testing. This must be run on the `sdr-infra` VM since it requires deploying a branch of cocina-models.  It is slower than using `bin/validate-data`, but all of the data is completely up to date.

data/bin/validate-data

@@ -103,7 +103,7 @@ def worker_process(reader) # rubocop:disable Metrics/MethodLength
     rescue JSON::ParserError => e
       errors << { line: line_num, error: "JSON Parse Error: #{e.message}" }
     rescue Cocina::Models::ValidationError => e
-      errors << { line: line_num, error: "Validation Error: #{e.message}" }
+      errors << { line: line_num, error: "Validation Error: #{json['externalIdentifier']} - #{e.message}" }
     rescue Cocina::Models::UnknownTypeError => e
       errors << { line: line_num, error: "Unknown Type Error: #{e.message}" }
     rescue StandardError => e
@@ -125,6 +125,11 @@ def spawn_workers(num_processes) # rubocop:disable Metrics/MethodLength
 
     pid = fork do
       # Child process
+
+      # Close all writer pipes inherited from the parent for OTHER workers.
+      workers.each { |w| w[:writer].close }
+
+      # Now, close the handles for this specific worker that the child doesn't need.
       work_writer.close
       result_reader.close
 

data/lib/cocina/models/contributor.rb

@@ -23,9 +23,6 @@ module Cocina
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # URL or other pointer to the location of the contributor information.
       attribute? :valueAt, Types::Strict::String
-      # For multiple representations of information about the same contributor (e.g. in different
-      # languages).
-      attribute :parallelContributor, Types::Strict::Array.of(DescriptiveParallelContributor).default([].freeze)
     end
   end
 end

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

@@ -73,7 +73,7 @@ module Cocina
         # Some part of the path are ignored for the purpose of matching.
         def clean_path(path)
           new_path = path.reject do |part|
-            part.is_a?(Integer) || %i[parallelValue parallelContributor parallelEvent].include?(part.to_sym)
+            part.is_a?(Integer) || %i[parallelValue parallelEvent].include?(part.to_sym)
           end.map(&:to_sym)
           # This needs to happen after parallelValue is removed
           # to handle structuredValue > parallelValue > structuredValue

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.114.0'
+    VERSION = '0.115.0'
   end
 end

data/lib/cocina/models.rb

@@ -43,7 +43,7 @@ loader.ignore("#{__dir__}/rspec.rb")
 loader.ignore("#{__dir__}/rspec")
 loader.setup
 
-module Cocina
+module Cocina # rubocop:disable Style/OneClassPerFile
   # Provides Ruby objects for the repository and serializing them to/from JSON.
   module Models
     class Error < StandardError; end

data/schema.json

@@ -444,13 +444,6 @@
         "valueAt": {
           "description": "URL or other pointer to the location of the contributor information.",
           "type": "string"
-        },
-        "parallelContributor": {
-          "description": "For multiple representations of information about the same contributor (e.g. in different languages).",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveParallelContributor"
-          }
         }
       }
     },
@@ -903,56 +896,6 @@
         }
       }
     },
-    "DescriptiveParallelContributor": {
-      "description": "Value model for multiple representations of information about the same contributor (e.g. in different languages).",
-      "deprecated": true,
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Names associated with a contributor.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveValue"
-          }
-        },
-        "type": {
-          "description": "Entity type of the contributor (person, organization, etc.). See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.",
-          "type": "string"
-        },
-        "status": {
-          "description": "Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).",
-          "type": "string"
-        },
-        "role": {
-          "description": "Relationships of the contributor to the resource or to an event in its history.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveValue"
-          }
-        },
-        "identifier": {
-          "description": "Identifiers and URIs associated with the contributor entity.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveValue"
-          }
-        },
-        "note": {
-          "description": "Other information associated with the contributor.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveValue"
-          }
-        },
-        "valueAt": {
-          "description": "URL or other pointer to the location of the contributor information.",
-          "type": "string"
-        },
-        "valueLanguage": {
-          "$ref": "#/$defs/DescriptiveValueLanguage"
-        }
-      }
-    },
     "DescriptiveParallelEvent": {
       "description": "Value model for multiple representations of information about the same event (e.g. in different languages).",
       "type": "object",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.114.0
+  version: 0.115.0
 platform: ruby
 authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2026-03-13 00:00:00.000000000 Z
+date: 2026-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -372,7 +372,6 @@ files:
 - lib/cocina/models/descriptive_basic_value.rb
 - lib/cocina/models/descriptive_geographic_metadata.rb
 - lib/cocina/models/descriptive_grouped_value.rb
-- lib/cocina/models/descriptive_parallel_contributor.rb
 - lib/cocina/models/descriptive_parallel_event.rb
 - lib/cocina/models/descriptive_parallel_value.rb
 - lib/cocina/models/descriptive_structured_value.rb

data/lib/cocina/models/descriptive_parallel_contributor.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Cocina
-  module Models
-    # DEPRECATED
-    # Value model for multiple representations of information about the same contributor
-    # (e.g. in different languages).
-    class DescriptiveParallelContributor < Struct
-      # Names associated with a contributor.
-      attribute :name, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Entity type of the contributor (person, organization, etc.). See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md
-      # for valid types.
-      attribute? :type, Types::Strict::String
-      # Status of the contributor relative to other parallel contributors (e.g. the primary
-      # author among a group of contributors).
-      attribute? :status, Types::Strict::String
-      # Relationships of the contributor to the resource or to an event in its history.
-      attribute :role, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Identifiers and URIs associated with the contributor entity.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Other information associated with the contributor.
-      attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # URL or other pointer to the location of the contributor information.
-      attribute? :valueAt, Types::Strict::String
-      # Language of the descriptive element value
-      attribute? :valueLanguage, DescriptiveValueLanguage.optional
-    end
-  end
-end