cocina-models 0.129.0 → 0.131.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e825fe93a987da1a8c23ce57093eb0ee376229a605d4e7bb548e56cabb03fc86
-  data.tar.gz: 542a860bd40cd64f31232cd4dfd0b65e2b8ae53dddc1f86597a0b86951d0327a
+  metadata.gz: 7896b08d2d0a1f99608ce6dfd4fe2a92cc0d9786f68f3f2eb971793444fd7194
+  data.tar.gz: 5dcbd075841e70fc116a0bc720411f52fb8823f1be2c401c7dcfa48ff50b9775
 SHA512:
-  metadata.gz: 0a31ff1218930150d45c3457bd8f7915934416fae3ba9b37abbbc7acfea177e38943b9493d00335933ae9d7cde8a02def61a37780d805762fd9ac0f65fb6a46c
-  data.tar.gz: bf0406a3f1d6267a40de10d1e747ac90bd9b57d75f11eeb33826b5161b7a7c46fcd84447f74e57b5b6e2e33c8313c7d493f5e0da682799a7bcf784bbc2c458e7
+  metadata.gz: 04cceeb51f7dbddb72946b4a668d87f4078b88bf2256b5a322d49a21eda870e9d832b648bf9f0ff9969b845fd0290236b14481dbde95c55cb1468cba3c09f8f9
+  data.tar.gz: 540ba204efa81c747c6ebbddd53f25452fcfa26a961d2bb3b123be9d90d0d7f2d0156207e7d8b5050d70ff095e59a74130850452a56954169e14f38bb7d81251

data/.gitignore

@@ -10,7 +10,8 @@
 # rspec failure tracking
 .rspec_status
 
+*.jsonl.zst
 *.jq.txt
 *.jsonl.xz
 *.csv
-*-playground.html
+*-playground.html

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.129.0)
+    cocina-models (0.131.0)
       activesupport
       cocina_display
       deprecation
@@ -45,9 +45,9 @@ GEM
       iso8601 (~> 0.13.0)
       janeway-jsonpath (>= 0.6, < 2)
       zeitwerk (~> 2.7)
-    concurrent-ruby (1.3.7)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
-    csv (3.3.5)
+    csv (3.3.6)
     debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -81,7 +81,7 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (6.0.4)
+    erb (6.0.6)
     faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
@@ -101,9 +101,9 @@ GEM
     iso8601 (0.13.0)
     janeway-jsonpath (1.0.0)
     json (2.21.1)
-    jsonschema_rs (0.47.0-arm64-darwin)
+    jsonschema_rs (0.49.1-arm64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.47.0-x86_64-linux)
+    jsonschema_rs (0.49.1-x86_64-linux)
       bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
@@ -119,7 +119,7 @@ GEM
       racc (~> 1.4)
     optimist (3.2.1)
     parallel (2.1.0)
-    parser (3.3.11.1)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -131,7 +131,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.0.3)
+    rbs (4.1.0)
       logger
       prism (>= 1.6.0)
       tsort
@@ -184,7 +184,7 @@ GEM
       rubocop (~> 1.86, >= 1.86.2)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
-    simplecov (1.0.0)
+    simplecov (1.0.3)
     super_diff (0.19.0)
       attr_extras (>= 6.2.4, < 8)
       diff-lcs (~> 1.5)
@@ -225,12 +225,12 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
-  bundler (4.0.16) sha256=d6ca5dd440c24f9abce9844cf44cc8e18c6a553de65a47efb4544137af92c47d
-  cocina-models (0.129.0)
+  bundler (4.0.17) sha256=214e21431b5665dd2f99df8a5511c6b151d7a72e8015c8b38f8b775b61cbb6c1
+  cocina-models (0.131.0)
   cocina_display (2.9.0) sha256=00e97cf826dafd5c547ca87b58e55f1d3bfa68fa4ddcddbbe25b4d9d9ed05d8f
-  concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0
+  concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
-  csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
+  csv (3.3.6) sha256=aba61e7e507a66f03d45cb1f3c4b6359861c3504038b422962875dce099e4456
   debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6
   deprecation (1.1.0) sha256=01707cea9a6ed2d7270377457941f43394a345e6dd8048e1be6d18ff2f2a01e1
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
@@ -242,7 +242,7 @@ CHECKSUMS
   dry-types (1.9.1) sha256=baebeecdb9f8395d6c9d227b62011279440943e3ef2468fe8ccc1ba11467f178
   edtf (3.3.0) sha256=0ce2b80f5cf222870e5a3df130701f4d24b75c29e23e5bf3130f574d75073487
   equivalent-xml (0.6.0) sha256=8919761efa848ad0846369ff8be1f646b17e5061698c4867b09829000cc3f487
-  erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
+  erb (6.0.6) sha256=a9b24986700f5bf127c4f297c5403c3ca41b83b0a316c0cd09a096b56e644ae5
   faraday (2.14.3) sha256=1882247e6766615c8220b4392bf1d27f6ebb63d8e28267587cef1fb0bf37f278
   faraday-net_http (3.4.4) sha256=0e78af151747ed1b00f33e25973b4bc220d7f16c00c39676817c8b12331eb588
   geo_coord (0.2.0) sha256=ae4e2dc5799deafa4db9138f3d7e85cf5e7dbd00b3b8395f1e1dbd34e007d7e8
@@ -253,8 +253,8 @@ CHECKSUMS
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
   janeway-jsonpath (1.0.0) sha256=c8293f009f2aea9487ddee3067ca735a1f758eb1c8834ff4fab3ffd06c56d0a3
   json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583
-  jsonschema_rs (0.47.0-arm64-darwin) sha256=ab3aae9da5796999d2686dfacaa2b4c9a5510b9194b4e4b73a6aa8767a78ac8a
-  jsonschema_rs (0.47.0-x86_64-linux) sha256=5dfc5c14362cf5efee24242be23feb4342665f489b63e1eba4c256aac8c96047
+  jsonschema_rs (0.49.1-arm64-darwin) sha256=1c3a72c95f60e6c1dad6873b206eebaaa57ac947049675d0504bddc79be6db67
+  jsonschema_rs (0.49.1-x86_64-linux) sha256=de9c96bc0d68f818b1dd59fba09d954a13e02deaf2121aef803ad9c47dc3204b
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
@@ -264,7 +264,7 @@ CHECKSUMS
   nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a
   optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
   parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
-  parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
+  parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   patience_diff (1.2.0) sha256=f492094486af02fff4a80070fa6b4d0ebbcf4d42fb38bba29d095eef43f6822c
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -272,7 +272,7 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14
+  rbs (4.1.0) sha256=8baba59008b0643b4ba2090e9b1d0149655b0bbd42eb2ffe42b1d0eb6923fd72
   rdoc (8.0.0) sha256=03bf8c08a9639658855a0cfd77c0abca8325c227693f7f33f82957811348c469
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
@@ -289,7 +289,7 @@ CHECKSUMS
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  simplecov (1.0.0) sha256=bdc50b41fa4a8b3c860da4bf5d61ba4704479c51d08a8f53cbd56ae50778dca8
+  simplecov (1.0.3) sha256=38ef0514f16ae7562f0d0f4df02610071115103d301b6de7dacbcc000082e39b
   super_diff (0.19.0) sha256=c35fc1c0daa223d67b203fe3fb49a6cfd67850a53920319565c3c654e03ec902
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
@@ -300,4 +300,4 @@ CHECKSUMS
   zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
 
 BUNDLED WITH
-  4.0.16
+  4.0.17

data/README.md

@@ -62,7 +62,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 an export of objects from the repository and reports any validation errors. You may get the file by running the script [bin/export-cocina-head-versions](https://github.com/sul-dlss/dor-services-app#export-cocina-json-data) and downloading the data file to your computer. See the [DSA README](https://github.com/sul-dlss/dor-services-app#scheduled-cocina-json-data-exports) for more info about the files and locations. Running a full validation takes about 2 hours. 
+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 an export of objects from the repository and reports any validation errors. You may get the file by running the script [bin/export-cocina-head-versions](https://github.com/sul-dlss/dor-services-app#export-cocina-json-data) and downloading the data file to your computer. See the [DSA README](https://github.com/sul-dlss/dor-services-app#scheduled-cocina-json-data-exports) for more info about the files and locations. 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.
@@ -70,7 +70,8 @@ Alternatively, you can use [validate-cocina](https://github.com/sul-dlss/dor-ser
 For background on object validation, as it relates to migrating versions, see: https://github.com/sul-dlss/dor-services-app/wiki/Migrating-Cocina
 
 1. Create a cocina-models branch containing the proposed change and push to GitHub.
-2. On the `sdr-infra` VM, while logged in as the `deploy` user, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
+2. On the `sdr-infra` VM, while logged in as the `deploy` user, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`, e.g.
+gem 'cocina-models', git: 'https://github.com/sul-dlss/cocina-models', branch: 'my-branch'
 3. Select the appropriate environment vars below - they are set to values in puppet.  (first 2 lines are the same;  last two lines use different variables)
 
 For QA:
@@ -109,6 +110,11 @@ export RUBYOPT='-W:no-deprecated -W:no-experimental'
 RAILS_ENV=production bin/validate-cocina -p 8 -l
 ```
 
+To run against only a specific list of druids, pass in a CSV file with druids in the first column and no header (druids should have the "druid:" prefix).  This matches the format that comes from the `bin/validate-data` script in cocina-models repo, so you can the use the CSV file and re-run against just those objects once they have been remediated.
+```
+RAILS_ENV=production bin/validate-cocina -f validate-data-errors.csv
+```
+
 5. Check `validate-cocina.csv` for validation errors.
 
 ## Running Reports in DSA

data/language_source_codes.yml

@@ -0,0 +1,15 @@
+# Language Code and Term Source Codes
+# Source: https://www.loc.gov/standards/sourcelist/language.html
+- austlang
+- din2335
+- glotto
+- iso639-1
+- iso639-2b
+- iso639-3
+- iso639-5
+- knia
+- lrwl
+- rfc3066
+- rfc4646
+- rfc5646
+- walso

data/lib/cocina/models/admin_policy.rb

@@ -15,11 +15,10 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*AdminPolicy::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer
       # Administrative properties for an AdminPolicy
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
-      attribute? :description, Description.optional
+      attribute(:description, Description.default { Description.new })
     end
   end
 end

data/lib/cocina/models/admin_policy_lite.rb

@@ -13,7 +13,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*AdminPolicyLite::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer
       # Administrative properties for an AdminPolicy
       # Validation of this property is relaxed. See the schema.json for full validation.

data/lib/cocina/models/admin_policy_with_metadata.rb

@@ -16,11 +16,10 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*AdminPolicyWithMetadata::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer
       # Administrative properties for an AdminPolicy
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
-      attribute? :description, Description.optional
+      attribute(:description, Description.default { Description.new })
       # When the object was created.
       attribute? :created, Types::Params::DateTime
       # When the object was modified.

data/lib/cocina/models/collection.rb

@@ -22,8 +22,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*Collection::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a Collection.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the Collection within SDR.
       attribute :version, Types::Strict::Integer
       # Access metadata for collections

data/lib/cocina/models/collection_lite.rb

@@ -20,8 +20,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*CollectionLite::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a Collection.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the Collection within SDR.
       attribute :version, Types::Strict::Integer
       # Access metadata for collections

data/lib/cocina/models/collection_with_metadata.rb

@@ -21,8 +21,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*CollectionWithMetadata::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a Collection.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the Collection within SDR.
       attribute :version, Types::Strict::Integer
       # Access metadata for collections

data/lib/cocina/models/dro.rb

@@ -32,8 +32,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*DRO::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a DRO.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the DRO within SDR.
       attribute :version, Types::Strict::Integer
       attribute(:access, DROAccess.default { DROAccess.new })

data/lib/cocina/models/dro_lite.rb

@@ -30,8 +30,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*DROLite::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a DRO.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the DRO within SDR.
       attribute :version, Types::Strict::Integer
       # Validation of this property is relaxed. See the schema.json for full validation.

data/lib/cocina/models/dro_with_metadata.rb

@@ -31,8 +31,6 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*DROWithMetadata::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      # Primary processing label (can be same as title) for a DRO.
-      attribute? :label, Types::Strict::String.default('')
       # Version for the DRO within SDR.
       attribute :version, Types::Strict::Integer
       attribute(:access, DROAccess.default { DROAccess.new })

data/lib/cocina/models/event.rb

@@ -21,9 +21,6 @@ module Cocina
       attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Language of the descriptive element value
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
-      # For multiple representations of information about the same event (e.g. in different
-      # languages)
-      attribute :parallelEvent, Types::Strict::Array.of(DescriptiveParallelEvent).default([].freeze)
     end
   end
 end

data/lib/cocina/models/mapping/from_mods/description.rb

@@ -11,20 +11,18 @@ module Cocina
 
           # @param [Nokogiri::XML] mods
           # @param [String] druid
-          # @oaram [String] label
           # @param [TitleBuilder] title_builder - defaults to Title class
           # @param [Cocina::Models::Mapping::ErrorNotifier] notifier
           # @return [Hash] a hash that can be mapped to a cocina descriptive model
-          def self.props(mods:, druid:, label:, title_builder: Title, notifier: nil)
-            new(title_builder: title_builder, mods: mods, druid: druid, label: label, notifier: notifier).props
+          def self.props(mods:, druid:, title_builder: Title, notifier: nil)
+            new(title_builder: title_builder, mods: mods, druid: druid, notifier: notifier).props
           end
 
-          def initialize(title_builder:, mods:, label:, druid:, notifier:)
+          def initialize(title_builder:, mods:, druid:, notifier:)
             @title_builder = title_builder
             @ng_xml = mods
             @notifier = notifier || ErrorNotifier.new(druid: druid)
             @druid = druid
-            @label = label
           end
 
           # @return [Hash] a hash that can be mapped to a cocina descriptive model
@@ -34,17 +32,15 @@ module Cocina
 
             check_altrepgroups
             check_version
-            props = DescriptionBuilder.build(title_builder: title_builder,
-                                             resource_element: ng_xml.root,
-                                             notifier: notifier,
-                                             purl: druid ? Cocina::Models::Mapping::Purl.for(druid: druid) : nil)
-            props[:title] = [{ value: label }] unless props.key?(:title)
-            props
+            DescriptionBuilder.build(title_builder: title_builder,
+                                     resource_element: ng_xml.root,
+                                     notifier: notifier,
+                                     purl: druid ? Cocina::Models::Mapping::Purl.for(druid: druid) : nil)
           end
 
           private
 
-          attr_reader :title_builder, :ng_xml, :notifier, :druid, :label
+          attr_reader :title_builder, :ng_xml, :notifier, :druid
 
           def check_altrepgroups
             ng_xml.xpath('//mods:*[@altRepGroup]', mods: DESC_METADATA_NS)

data/lib/cocina/models/mapping/from_mods/event.rb

@@ -104,58 +104,9 @@ module Cocina
           end
 
           def build_grouped_origin_infos(grouped_origin_infos)
-            grouped_origin_infos.map do |origin_info_nodes|
-              common_event_type = event_type_in_common(origin_info_nodes)
-              common_display_label = display_label_in_common(origin_info_nodes)
-
-              parallel_event = {
-                type: common_event_type,
-                displayLabel: common_display_label,
-                parallelEvent: build_parallel_origin_infos(origin_info_nodes, common_event_type,
-                                                           common_display_label)
-              }
-
-              parallel_event.compact
-            end.flatten
-          end
-
-          # For parallelEvent items, the valueLanguage construct is at the same level as the rest
-          #   of the event attributes, rather than inside each event attribute
-          def build_parallel_origin_infos(origin_infos, common_event_type, common_display_label)
-            origin_infos.flat_map do |origin_info|
-              event = build_event_for_parallel_origin_info(origin_info)
-              event[:valueLanguage] = LanguageScript.build(node: origin_info)
-              event[:type] = display_label(origin_info) if common_event_type.blank?
-              event[:displayLabel] = display_label(origin_info) if common_display_label.blank?
-
-              event.compact
-            end.compact
-          end
-
-          def build_event_for_parallel_origin_info(origin_info_node)
-            return build_copyright_notice_event(origin_info_node) if origin_info_node['eventType'] == 'copyright notice'
-
-            event = {}
-            add_info_to_event(event, origin_info_node)
-            event.compact
-          end
-
-          # @return String type for the cocina event if it is the same for all the origin_info_nodes, o.w. nil
-          def event_type_in_common(origin_info_nodes)
-            raw_type = origin_info_nodes.first['eventType']
-            return if raw_type.blank?
-
-            first_event_type = event_type(origin_info_nodes.first)
-            first_event_type if origin_info_nodes.all? { |node| event_type(node) == first_event_type }
-          end
-
-          # @return String displayLabel for the cocina event if it is the same for all the origin_info_nodes, o.w. nil
-          def display_label_in_common(origin_info_nodes)
-            raw_label = origin_info_nodes.first['displayLabel']
-            return if raw_label.blank?
-
-            first_label = display_label(origin_info_nodes.first)
-            first_label if origin_info_nodes.all? { |node| display_label(node) == first_label }
+            grouped_origin_infos.flat_map do |origin_info_nodes|
+              origin_info_nodes.map { |origin_info| build_event_for_origin_info(origin_info) }
+            end
           end
 
           def add_info_to_event(event, origin_info_node)

data/lib/cocina/models/request_admin_policy.rb

@@ -14,7 +14,6 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestAdminPolicy::TYPES)
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer.default(1).enum(1)
       # Administrative properties for an AdminPolicy
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })

data/lib/cocina/models/request_collection.rb

@@ -18,7 +18,6 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestCollection::TYPES)
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer.default(1).enum(1)
       # Access metadata for collections
       attribute(:access, CollectionAccess.default { CollectionAccess.new })

data/lib/cocina/models/request_dro.rb

@@ -30,7 +30,6 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestDRO::TYPES)
-      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer.default(1).enum(1)
       attribute? :access, DROAccess.optional
       attribute(:administrative, RequestAdministrative.default { RequestAdministrative.new })

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

@@ -20,6 +20,7 @@ module Cocina
           DescriptionSubjectTemporalEncodingVisitorValidator,
           DescriptionTitleSourceCodeVisitorValidator,
           DescriptionLanguageUriVisitorValidator,
+          DescriptionLanguageSourceCodeVisitorValidator,
           DescriptionScriptVisitorValidator,
           DescriptionLocationVisitorValidator
         ].freeze

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Validates language.source.code and valueLanguage.source.code values against language_source_codes.yml.
+      class DescriptionLanguageSourceCodeVisitorValidator < BaseDescriptionVisitorValidator
+        def validate!
+          return if error_paths.empty?
+
+          raise ValidationError, "Unrecognized language source codes in description: #{error_paths.join(', ')}"
+        end
+
+        def visit_hash(hash:, path:)
+          return unless language_or_value_language_path?(path)
+
+          source_code = hash.dig(:source, :code)
+          return unless source_code
+          return if valid_codes.include?(source_code.downcase)
+
+          error_paths << "#{path_to_s(path)}.source.code (#{source_code})"
+        end
+
+        private
+
+        def error_paths
+          @error_paths ||= []
+        end
+
+        def language_or_value_language_path?(path)
+          language_path?(path) || value_language_path?(path)
+        end
+
+        def language_path?(path)
+          # language is a typed array (Array.of(Language)), so the visitor descends through
+          # an integer index. Path ends with [:language, <Integer>].
+          path.length >= 2 && path[-1].is_a?(Integer) && path[-2].to_s == 'language'
+        end
+
+        def value_language_path?(path)
+          # valueLanguage is a single optional hash (not an array), so the visitor descends
+          # directly by key. Path ends with [:valueLanguage].
+          path.length >= 1 && path[-1].to_s == 'valueLanguage'
+        end
+
+        # rubocop:disable Style/ClassVars
+        def valid_codes
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../language_source_codes.yml', __dir__)).to_set(&:downcase)
+        end
+        # rubocop:enable Style/ClassVars
+      end
+    end
+  end
+end

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

@@ -41,7 +41,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 parallelEvent].include?(part.to_sym)
+            part.is_a?(Integer) || %i[parallelValue].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/validators/non_alternative_title_validator.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Validates that not all titles have type 'alternative'
+      class NonAlternativeTitleValidator
+        def self.validate(...)
+          new(...).validate
+        end
+
+        def initialize(clazz, attributes)
+          @clazz = clazz
+          @attributes = attributes
+        end
+
+        def validate
+          return unless meets_preconditions?
+
+          return unless titles.all? { |title| title[:type] == 'alternative' }
+
+          raise ValidationError, "At least one title must have no type or a type other than 'alternative'."
+        end
+
+        private
+
+        attr_reader :clazz, :attributes
+
+        def meets_preconditions?
+          [Cocina::Models::Description, Cocina::Models::RequestDescription].include?(clazz) &&
+            titles.present?
+        end
+
+        def titles
+          @titles ||= Array(attributes[:title])
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,8 @@ module Cocina
           PurlValidator,
           CatalogLinksValidator,
           AssociatedNameValidator,
-          MarcRelatorRoleValidator
+          MarcRelatorRoleValidator,
+          NonAlternativeTitleValidator
         ].freeze
 
         def self.validate(clazz, attributes, validators: VALIDATORS)

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.129.0'
+    VERSION = '0.131.0'
   end
 end

data/schema.json

@@ -106,10 +106,6 @@
         "externalIdentifier": {
           "$ref": "#/$defs/Druid"
         },
-        "label": {
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "type": "integer"
         },
@@ -125,7 +121,8 @@
         "administrative",
         "externalIdentifier",
         "type",
-        "version"
+        "version",
+        "description"
       ]
     },
     "AdminPolicy": {
@@ -372,11 +369,6 @@
         "externalIdentifier": {
           "$ref": "#/$defs/Druid"
         },
-        "label": {
-          "description": "Primary processing label (can be same as title) for a Collection.",
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "description": "Version for the Collection within SDR.",
           "type": "integer"
@@ -645,11 +637,6 @@
           ]
         },
         "externalIdentifier": { "$ref": "#/$defs/Druid" },
-        "label": {
-          "description": "Primary processing label (can be same as title) for a DRO.",
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "description": "Version for the DRO within SDR.",
           "type": "integer"
@@ -1270,70 +1257,6 @@
         }
       }
     },
-    "DescriptiveParallelEvent": {
-      "description": "Value model for multiple representations of information about the same event (e.g. in different languages).",
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/$defs/DescriptiveStructuredValue"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "type": {
-              "description": "Description of the event (creation, publication, etc.).",
-              "type": "string"
-            },
-            "displayLabel": {
-              "description": "The preferred display label to use for the event in access systems.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "date": {
-              "description": "Dates associated with the event.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveValue"
-              }
-            },
-            "contributor": {
-              "description": "Contributors associated with the event.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/Contributor"
-              }
-            },
-            "location": {
-              "description": "Locations associated with the event.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveValue"
-              }
-            },
-            "identifier": {
-              "description": "Identifiers and URIs associated with the event.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveIdentifier"
-              }
-            },
-            "note": {
-              "description": "Other information about the event.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveValue"
-              }
-            },
-            "valueLanguage": {
-              "$ref": "#/$defs/DescriptiveValueLanguage"
-            }
-          }
-        }
-      ],
-      "unevaluatedProperties": false
-    },
     "DescriptiveParallelValue": {
       "description": "Value model for multiple representations of the same information (e.g. in different languages).",
       "type": "object",
@@ -1529,13 +1452,6 @@
             },
             "valueLanguage": {
               "$ref": "#/$defs/DescriptiveValueLanguage"
-            },
-            "parallelEvent": {
-              "description": "For multiple representations of information about the same event (e.g. in different languages)",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveParallelEvent"
-              }
             }
           }
         }
@@ -1589,14 +1505,6 @@
               "minItems": 1
             }
           }
-        },
-        {
-          "required": ["parallelEvent"],
-          "properties": {
-            "parallelEvent": {
-              "minItems": 1
-            }
-          }
         }
       ]
     },
@@ -2525,10 +2433,6 @@
             "https://cocina.sul.stanford.edu/models/admin_policy"
           ]
         },
-        "label": {
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "type": "integer",
           "default": 1,
@@ -2597,10 +2501,6 @@
             "https://cocina.sul.stanford.edu/models/series"
           ]
         },
-        "label": {
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "type": "integer",
           "default": 1,
@@ -2698,10 +2598,6 @@
             "https://cocina.sul.stanford.edu/models/webarchive-seed"
           ]
         },
-        "label": {
-          "type": "string",
-          "default": ""
-        },
         "version": {
           "type": "integer",
           "default": 1,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.129.0
+  version: 0.131.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -329,6 +329,7 @@ files:
 - form_source_codes.yml
 - identifier_source_codes.yml
 - iso15924_codes.yml
+- language_source_codes.yml
 - language_uri_iso639_2_codes.yml
 - language_uri_languages_codes.yml
 - lib/cocina/generator.rb
@@ -382,7 +383,6 @@ files:
 - lib/cocina/models/descriptive_geographic_metadata.rb
 - lib/cocina/models/descriptive_grouped_value.rb
 - lib/cocina/models/descriptive_identifier.rb
-- lib/cocina/models/descriptive_parallel_event.rb
 - lib/cocina/models/descriptive_parallel_value.rb
 - lib/cocina/models/descriptive_structured_value.rb
 - lib/cocina/models/descriptive_value.rb
@@ -442,7 +442,6 @@ files:
 - lib/cocina/models/mapping/from_mods/subject_authority_codes.rb
 - lib/cocina/models/mapping/from_mods/title.rb
 - lib/cocina/models/mapping/from_mods/title_builder.rb
-- lib/cocina/models/mapping/from_mods/title_builder_strategy.rb
 - lib/cocina/models/mapping/from_mods/value_uri.rb
 - lib/cocina/models/mapping/purl.rb
 - lib/cocina/models/message_digest.rb
@@ -489,6 +488,7 @@ files:
 - lib/cocina/models/validators/description_form_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_identifier_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_language_code_visitor_validator.rb
+- lib/cocina/models/validators/description_language_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_language_uri_visitor_validator.rb
 - lib/cocina/models/validators/description_location_visitor_validator.rb
 - lib/cocina/models/validators/description_name_source_code_visitor_validator.rb
@@ -503,6 +503,7 @@ files:
 - lib/cocina/models/validators/language_tag_visitor_validator.rb
 - lib/cocina/models/validators/marc_date_validator.rb
 - lib/cocina/models/validators/marc_relator_role_validator.rb
+- lib/cocina/models/validators/non_alternative_title_validator.rb
 - lib/cocina/models/validators/purl_validator.rb
 - lib/cocina/models/validators/reserved_filename_visitor_validator.rb
 - lib/cocina/models/validators/validator.rb

data/lib/cocina/models/descriptive_parallel_event.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Cocina
-  module Models
-    # Value model for multiple representations of information about the same event (e.g.
-    # in different languages).
-    class DescriptiveParallelEvent < Struct
-      attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Description of the event (creation, publication, etc.).
-      attribute? :type, Types::Strict::String
-      # The preferred display label to use for the event in access systems.
-      attribute? :displayLabel, Types::Strict::String.optional
-      # Dates associated with the event.
-      attribute :date, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Contributors associated with the event.
-      attribute :contributor, Types::Strict::Array.of(Contributor).default([].freeze)
-      # Locations associated with the event.
-      attribute :location, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Identifiers and URIs associated with the event.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
-      # Other information about the event.
-      attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
-      # Language of the descriptive element value
-      attribute? :valueLanguage, DescriptiveValueLanguage.optional
-    end
-  end
-end

data/lib/cocina/models/mapping/from_mods/title_builder_strategy.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Cocina
-  module Models
-    module Mapping
-      module FromMods
-        # Decides how to build a title based on whether this is a registered Hydrus object or not.
-        class TitleBuilderStrategy
-          # @param [String] label
-          # @return [#build] a class that can build a title
-          def self.find(label:)
-            # Some hydrus items don't have titles, so using label. See https://github.com/sul-dlss/hydrus/issues/421
-            label == 'Hydrus' ? HydrusDefaultTitleBuilder : Title
-          end
-        end
-      end
-    end
-  end
-end