cocina-models 0.126.0 → 0.128.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e0c8618a41069ccb15d7cb7bd487ec9aa82647995f4205cf330bb1c0c93a62
-  data.tar.gz: 7cd09674422b6ab23887c68f2a2afd896eaf6afb110ec86f42c62b0bf7721847
+  metadata.gz: e36b1b2a099fed16e2cc7c49b46479b80ce03f2ee65ef5a87ef49e9d74379ac6
+  data.tar.gz: 878705f40ff9598207bcee6a2e8ff0c89f5dbcc8e9bc9fc5c755642c93c30440
 SHA512:
-  metadata.gz: 8eda1b3b135d24d1722baa84a4a7bb39858c77eb34c1d456327a9c6c03289d3fa423f8c0b6be19082b538443558e584cb0b851a22eac5dd2d16eb9370fdb5b3a
-  data.tar.gz: f5826802cde02885851223dc8988bf3300e3149fdb573672fc88db49416151ad895dcbe02bd25b80a643d41b36ee571a5a63e9ab4f07a46a630f1039c8eddc2b
+  metadata.gz: 9ea6f8363bb8a487a0670c8c062859ee1c16f618f6a12e5224ee0eb4ee30ebb6165a124c2d478f4e34250e9b3655a95b8d9f503e38f6afea4c130dfd9d4b3de8
+  data.tar.gz: c0de7bb6610cfa67a118a4c847add1da3a4d395fb0b8325e9bd2020a88a9a8555afa04fabce3e860b21569e9741d38b5e89f0e64c47e32a7dec22165791b7261

data/AGENTS.md

@@ -167,7 +167,7 @@ Generate a short kebab-case slug summarizing the query (e.g., `invalid-encoding`
 
 The comment lines must use `#` so the file remains valid jq syntax. When resuming (Step 2 resume path), parse these comment sections by their labels to reconstruct the inputs.
 
-Find the most recent `.jsonl.xz` file in the project root by listing `*.jsonl.xz` files sorted by name descending and taking the first result.
+Find the most recent `.jsonl.zst` file in the project root by listing `*.jsonl.zst` files sorted by name descending and taking the first result.
 
 ### Step 8 — Output
 
@@ -178,7 +178,7 @@ Present:
 4. A ready-to-run shell snippet:
 
 ```
-xzcat <most-recent .jsonl.xz filename> \
+zstdcat <most-recent .jsonl.zst filename> \
   | pv -l -s 5500000 \
   | parallel -j$(sysctl -n hw.logicalcpu) --pipe --block 50M --recend '\n' \
               jq -rcf <slug>.jq.txt \

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.126.0)
+    cocina-models (0.128.0)
       activesupport
       cocina_display
       deprecation
@@ -102,11 +102,11 @@ GEM
     iso8601 (0.13.0)
     janeway-jsonpath (1.0.0)
     json (2.20.0)
-    jsonschema_rs (0.46.6-arm64-darwin)
+    jsonschema_rs (0.46.10-arm64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.46.6-x86_64-linux)
+    jsonschema_rs (0.46.10-x86_64-linux)
       bigdecimal (>= 3.1, < 5)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (6.0.6)
@@ -162,7 +162,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.88.0)
+    rubocop (1.88.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -173,7 +173,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.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-rake (0.7.1)
@@ -232,7 +232,7 @@ CHECKSUMS
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
   bundler (4.0.15) sha256=a4ceb882fe94a0e0ac63cd0813932bbfd631a14e5ac0b7975189b19a4d28d9e7
-  cocina-models (0.126.0)
+  cocina-models (0.128.0)
   cocina_display (2.8.0) sha256=89722e8e204c07cfa38f3deacbd66d42f3db9c7b29fdc034973d847cf93c4995
   concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
@@ -260,9 +260,9 @@ CHECKSUMS
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
   janeway-jsonpath (1.0.0) sha256=c8293f009f2aea9487ddee3067ca735a1f758eb1c8834ff4fab3ffd06c56d0a3
   json (2.20.0) sha256=9362bc6e55a952b056abf9167cf053358181c904cb70cd6eee0808ea830fc32b
-  jsonschema_rs (0.46.6-arm64-darwin) sha256=05c0acc91fd03c38160491fa10bfd4d608ccf99be3c34a365e7df93c8a10c647
-  jsonschema_rs (0.46.6-x86_64-linux) sha256=26e889bbd9e2e884ae187952d00809714946e4626ae8a323e80667b9aa7b2844
-  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  jsonschema_rs (0.46.10-arm64-darwin) sha256=1bece46823184a8cbec55d7585f09de68cc2bc03772d8aa9c29deba23b490609
+  jsonschema_rs (0.46.10-x86_64-linux) sha256=ef1f8a244e8e5b4a9e35ccd0b7f7aa9912a7e15b00f1170ba3f3cade0bdc627b
+  language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
@@ -290,8 +290,8 @@ CHECKSUMS
   rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
-  rubocop (1.88.0) sha256=e420ddf1662d0ef34bc8a2910ac4b396a7ddda0b51a708264405241734b08e0b
-  rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
+  rubocop (1.88.1) sha256=726af773d6bc169ed3ff852f3ca020b7c58d39c34e7a8d879a8e0147cc994f26
+  rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33

data/bin/validate-data

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Validate JSONL (XZ compressed) files against the schema
+# Validate JSONL (zstd compressed) files against the schema
 
 # Trap Ctrl+C to exit gracefully
 Signal.trap('INT') do
@@ -65,7 +65,7 @@ end
 # Count lines in the file
 def count_lines(filename)
   count = 0
-  IO.popen(['xzcat', filename]) do |io|
+  IO.popen(['zstdcat', filename]) do |io|
     io.each_line { count += 1 }
   end
   count
@@ -73,7 +73,7 @@ end
 
 # Get total line count (either from option or by counting)
 def get_total_lines(filename, provided_count)
-  count_filename = filename.sub(/\.xz$/, '.count.txt')
+  count_filename = filename.sub(/\.zst$/, '.count.txt')
   if provided_count
     puts "Using provided line count: #{provided_count}"
     provided_count
@@ -183,7 +183,7 @@ def distribute_work(filename, workers, batch_size, total_lines) # rubocop:disabl
     throttle_rate: 0.1
   )
 
-  IO.popen(['xzcat', filename]) do |io|
+  IO.popen(['zstdcat', filename]) do |io|
     io.each_line do |line|
       line_number += 1
       batch << [line_number, line]

data/lib/cocina/models/admin_policy_access_template.rb

@@ -6,6 +6,17 @@ module Cocina
     # an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults
     # and has no embargo.
     class AdminPolicyAccessTemplate < Struct
+      # Access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :view, Types::Strict::String.optional.default('dark')
+      # Download access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :download, Types::Strict::String.optional.default('none')
+      # Not used for this access type, must be null.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :location, Types::Strict::String.optional
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
       attribute? :copyright, Copyright.optional
@@ -18,17 +29,6 @@ module Cocina
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
       attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
-      # Access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :view, Types::Strict::String.optional.default('dark')
-      # Download access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :download, Types::Strict::String.optional.default('none')
-      # Not used for this access type, must be null.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :location, Types::Strict::String.optional
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/applies_to.rb

@@ -2,10 +2,44 @@
 
 module Cocina
   module Models
-    # Property model for indicating the parts, aspects, or versions of the resource to
-    # which a descriptive element is applicable.
+    # Value model for appliesTo property.
     class AppliesTo < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      # String or integer value of the descriptive element.
+      attribute? :value, Types::Nominal::Any
+      # Type of value provided by the descriptive element. 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 descriptive element value relative to other instances of the element.
+      attribute? :status, Types::Strict::String
+      # Code value of the descriptive element.
+      attribute? :code, Types::Strict::String
+      # URI value of the descriptive element.
+      attribute? :uri, Types::Strict::String
+      # Property model for indicating the encoding, standard, or syntax to which a value
+      # conforms (e.g. RDA).
+      attribute? :standard, Standard.optional
+      # Property model for indicating the encoding, standard, or syntax to which a value
+      # conforms (e.g. RDA).
+      attribute? :encoding, Standard.optional
+      # Property model for indicating the vocabulary, authority, or other origin for a term,
+      # code, or identifier.
+      attribute? :source, Source.optional
+      # The preferred display label to use for the descriptive element in access systems.
+      attribute? :displayLabel, Types::Strict::String.optional
+      # A term providing information about the circumstances of the statement (e.g., approximate
+      # dates).
+      attribute? :qualifier, Types::Strict::String
+      # Other information related to the descriptive element.
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      # Language of the descriptive element value
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
+      # URL or other pointer to the location of the value of the descriptive element.
+      attribute? :valueAt, Types::Strict::String
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

data/lib/cocina/models/descriptive_basic_value.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     # Basic value model for descriptive elements. Can only have one of value, parallelValue,
-    # groupedValue, or structuredValue.
+    # groupedValue, or structuredValue. Does not have identifier or appliesTo properties.
     class DescriptiveBasicValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -25,8 +25,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional

data/lib/cocina/models/descriptive_identifier.rb

@@ -2,10 +2,8 @@
 
 module Cocina
   module Models
-    # Value model for descriptive identifiers. Same as DescriptiveValue but omits the identifier
-    # property to prevent infinite recursion.
+    # Default value model for identifiers.
     class DescriptiveIdentifier < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -40,6 +38,7 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
     end
   end
 end

data/lib/cocina/models/descriptive_value.rb

@@ -4,7 +4,6 @@ module Cocina
   module Models
     # Default value model for descriptive elements.
     class DescriptiveValue < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -25,8 +24,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional
@@ -41,6 +38,9 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

data/lib/cocina/models/dro_access.rb

@@ -3,6 +3,17 @@
 module Cocina
   module Models
     class DROAccess < Struct
+      # Access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :view, Types::Strict::String.optional.default('dark')
+      # Download access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :download, Types::Strict::String.optional.default('none')
+      # Not used for this access type, must be null.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :location, Types::Strict::String.optional
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
       attribute? :copyright, Copyright.optional
@@ -16,17 +27,6 @@ module Cocina
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
       attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
-      # Access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :view, Types::Strict::String.optional.default('dark')
-      # Download access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :download, Types::Strict::String.optional.default('none')
-      # Not used for this access type, must be null.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :location, Types::Strict::String.optional
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/language.rb

@@ -5,7 +5,7 @@ module Cocina
     # Languages, scripts, symbolic systems, and notations used in all or part of a resource
     # or its descriptive metadata.
     class Language < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
       # Code value of the descriptive element.
       attribute? :code, Types::Strict::String
       # The preferred display label to use for the descriptive element in access systems.

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

@@ -37,8 +37,10 @@ module Cocina
             @notifier = notifier
           end
 
+          # @param [Boolean] include_related_resource whether to map nested relatedItem elements;
+          #   false when building a relatedItem, since RelatedResource cannot itself nest a relatedResource
           # @return [Hash] a hash that can be mapped to a cocina description model
-          def build(resource_element:, purl: nil, require_title: true)
+          def build(resource_element:, purl: nil, require_title: true, include_related_resource: true)
             cocina_description = {}
             title_result = @title_builder.build(resource_element: resource_element, require_title: require_title,
                                                 notifier: notifier)
@@ -47,7 +49,8 @@ module Cocina
             purl_value = purl || Purl.primary_purl_value(resource_element, purl)
             cocina_description[:purl] = purl_value if purl_value
 
-            BUILDERS.each do |description_property, builder|
+            builders = include_related_resource ? BUILDERS : BUILDERS.except(:relatedResource)
+            builders.each do |description_property, builder|
               result = builder.build(resource_element: resource_element, description_builder: self,
                                      purl: purl_value)
               cocina_description.merge!(description_property => result) if result.present?

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

@@ -80,7 +80,8 @@ module Cocina
           end
 
           def build_related_item(related_item)
-            description_builder.build(resource_element: related_item, require_title: false).tap do |item|
+            description_builder.build(resource_element: related_item, require_title: false,
+                                      include_related_resource: false).tap do |item|
               item[:displayLabel] = related_item['displayLabel']
               if related_item['type']
                 item[:type] = normalized_type_for(related_item['type'])

data/lib/cocina/models/related_resource.rb

@@ -38,8 +38,6 @@ module Cocina
       attribute? :purl, Purl.optional
       # Information about how to access digital and physical versions of the object.
       attribute? :access, DescriptiveAccessMetadata.optional
-      # Other resources associated with the related resource.
-      attribute :relatedResource, Types::Strict::Array.of(RelatedResource).default([].freeze)
       # Information about this resource description.
       attribute? :adminMetadata, DescriptiveAdminMetadata.optional
       # The version of the related resource.

data/lib/cocina/models/request_admin_policy.rb

@@ -14,7 +14,7 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestAdminPolicy::TYPES)
-      attribute :label, Types::Strict::String
+      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,7 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestCollection::TYPES)
-      attribute :label, Types::Strict::String
+      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,7 @@ module Cocina
       # example: 1.2.3
       attribute :cocinaVersion, CocinaVersion.default(VERSION)
       attribute :type, Types::Strict::String.enum(*RequestDRO::TYPES)
-      attribute :label, Types::Strict::String
+      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/title.rb

@@ -3,7 +3,6 @@
 module Cocina
   module Models
     class Title < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -24,8 +23,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional
@@ -40,6 +37,9 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

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

@@ -17,10 +17,10 @@ module Cocina
           DescriptionDateTimeVisitorValidator,
           DescriptionEventDateVisitorValidator,
           DescriptionSubjectTemporalEncodingVisitorValidator,
-          DescriptionLocationSourceCodeVisitorValidator,
           DescriptionTitleSourceCodeVisitorValidator,
           DescriptionLanguageUriVisitorValidator,
-          DescriptionScriptVisitorValidator
+          DescriptionScriptVisitorValidator,
+          DescriptionLocationVisitorValidator
         ].freeze
 
         def self.validate(clazz, attributes)

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'cocina_display'
+
+module Cocina
+  module Models
+    module Validators
+      # Validates location.source.code against location_source_codes.yml and
+      # validates location.code against marc_country_codes.yml when source.code is marccountry.
+      class DescriptionLocationVisitorValidator < BaseDescriptionVisitorValidator
+        def validate!
+          errors = []
+          errors << "Unrecognized location source codes in description: #{error_paths.join(', ')}" if error_paths.any?
+          errors << "Invalid MARC country codes in description: #{marc_country_error_paths.join(', ')}" if marc_country_error_paths.any?
+          raise ValidationError, errors.join('; ') if errors.any?
+        end
+
+        def visit_hash(hash:, path:)
+          return unless location_path?(path)
+
+          source_code = hash.dig(:source, :code)
+          return unless source_code
+
+          error_paths << "#{path_to_s(path)}.source.code (#{source_code})" unless valid_codes.include?(source_code.downcase)
+
+          return unless source_code.downcase == 'marccountry'
+
+          code = hash[:code]
+          marc_country_error_paths << "#{path_to_s(path)}.code (#{code})" if code && !valid_marc_country_codes.include?(code.downcase)
+        end
+
+        private
+
+        def error_paths
+          @error_paths ||= []
+        end
+
+        def marc_country_error_paths
+          @marc_country_error_paths ||= []
+        end
+
+        def location_path?(path)
+          # Match entries in a location array (e.g., [:location, 0] or [:relatedResource, 0, :location, 0]).
+          path.length >= 2 && path[-1].is_a?(Integer) && path[-2].to_s == 'location'
+        end
+
+        # rubocop:disable Style/ClassVars
+        def valid_codes
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../location_source_codes.yml', __dir__)).to_set(&:downcase)
+        end
+
+        def valid_marc_country_codes
+          @@valid_marc_country_codes ||= YAML.load_file(CocinaDisplay.root.join('config/marc_countries.yml')).keys.to_set(&:to_s)
+        end
+        # rubocop:enable Style/ClassVars
+      end
+    end
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.126.0'
+    VERSION = '0.128.0'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -48,7 +48,6 @@ module Cocina
         type: Cocina::Models::ObjectType.object,
         id: 'druid:bc234fg5678',
         version: 1,
-        label: 'factory DRO label',
         title: 'factory DRO title',
         source_id: 'sul:1234',
         admin_policy_id: 'druid:hv992ry2431'
@@ -60,7 +59,6 @@ module Cocina
         type: Cocina::Models::ObjectType.collection,
         id: 'druid:bb222ff5555',
         version: 1,
-        label: 'factory collection label',
         title: 'factory collection title',
         admin_policy_id: 'druid:hv992ry2431',
         source_id: 'sulcollection:1234'
@@ -72,7 +70,6 @@ module Cocina
         type: Cocina::Models::ObjectType.admin_policy,
         id: 'druid:cb432gf8765',
         version: 1,
-        label: 'factory APO label',
         title: 'factory APO title',
         admin_policy_id: 'druid:hv992ry2431',
         agreement_id: 'druid:hp308wm0436'
@@ -97,12 +94,11 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_dro_properties(type:, version:, label:, title:, source_id:, admin_policy_id:,
+      def self.build_request_dro_properties(type:, version:, title:, source_id:, admin_policy_id:,
                                             barcode: nil, catkeys: [], folio_instance_hrids: [], collection_ids: [])
         {
           type: type,
           version: version,
-          label: label,
           access: {},
           administrative: { hasAdminPolicy: admin_policy_id },
           description: {
@@ -143,12 +139,11 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil,
+      def self.build_request_collection_properties(type:, version:, title:, admin_policy_id:, source_id: nil,
                                                    catkeys: [], folio_instance_hrids: [])
         {
           type: type,
           version: version,
-          label: label,
           access: {},
           administrative: { hasAdminPolicy: admin_policy_id },
           description: {
@@ -204,7 +199,7 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_admin_policy_properties(type:, version:, label:, title:,
+      def self.build_request_admin_policy_properties(type:, version:, title:,
                                                      admin_policy_id:, agreement_id:,
                                                      use_statement: nil, copyright: nil, license: nil,
                                                      registration_workflow: nil, collections_for_registration: nil,
@@ -212,7 +207,6 @@ module Cocina
         {
           type: type,
           version: version,
-          label: label,
           administrative: {
             hasAdminPolicy: admin_policy_id,
             hasAgreement: agreement_id,

data/schema.json

@@ -155,19 +155,22 @@
       "allOf": [
         {
           "$ref": "#/$defs/Access"
-        }
-      ],
-      "properties": {
-        "copyright": {
-          "$ref": "#/$defs/Copyright"
-        },
-        "useAndReproductionStatement": {
-          "$ref": "#/$defs/UseAndReproductionStatement"
         },
-        "license": {
-          "$ref": "#/$defs/License"
+        {
+          "type": "object",
+          "properties": {
+            "copyright": {
+              "$ref": "#/$defs/Copyright"
+            },
+            "useAndReproductionStatement": {
+              "$ref": "#/$defs/UseAndReproductionStatement"
+            },
+            "license": {
+              "$ref": "#/$defs/License"
+            }
+          }
         }
-      },
+      ],
       "unevaluatedProperties": false
     },
     "AdminPolicyAdministrative": {
@@ -230,18 +233,6 @@
       ],
       "unevaluatedProperties": false
     },
-    "AppliesTo": {
-      "description": "Property model for indicating the parts, aspects, or versions of the resource to which a descriptive element is applicable.",
-      "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      }
-    },
     "Barcode": {
       "description": "A barcode",
       "oneOf": [
@@ -262,6 +253,28 @@
         }
       ]
     },
+    "AppliesTo": {
+      "description": "Value model for appliesTo property.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/$defs/DescriptiveBasicValue"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "identifier": {
+              "description": "Identifiers and URIs associated with the descriptive element.",
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/DescriptiveIdentifier"
+              }
+            }
+          }
+        }
+      ],
+      "unevaluatedProperties": false
+    },
     "BusinessBarcode": {
       "description": "The barcode associated with a business library DRO, prefixed with 2050",
       "type": "string",
@@ -672,23 +685,26 @@
     },
     "DROAccess": {
       "type": "object",
-      "properties": {
-        "copyright": {
-          "$ref": "#/$defs/Copyright"
-        },
-        "embargo": {
-          "$ref": "#/$defs/Embargo"
-        },
-        "useAndReproductionStatement": {
-          "$ref": "#/$defs/UseAndReproductionStatement"
-        },
-        "license": {
-          "$ref": "#/$defs/License"
-        }
-      },
       "allOf": [
         {
           "$ref": "#/$defs/Access"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "copyright": {
+              "$ref": "#/$defs/Copyright"
+            },
+            "embargo": {
+              "$ref": "#/$defs/Embargo"
+            },
+            "useAndReproductionStatement": {
+              "$ref": "#/$defs/UseAndReproductionStatement"
+            },
+            "license": {
+              "$ref": "#/$defs/License"
+            }
+          }
         }
       ],
       "unevaluatedProperties": false
@@ -1073,7 +1089,7 @@
       "unevaluatedProperties": false
     },
     "DescriptiveBasicValue": {
-      "description": "Basic value model for descriptive elements. Can only have one of value, parallelValue, groupedValue, or structuredValue.",
+      "description": "Basic value model for descriptive elements. Can only have one of value, parallelValue, groupedValue, or structuredValue. Does not have identifier or appliesTo properties.",
       "type": "object",
       "allOf": [
         {
@@ -1118,13 +1134,6 @@
             "encoding": {
               "$ref": "#/$defs/Standard"
             },
-            "identifier": {
-              "description": "Identifiers and URIs associated with the descriptive element.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveIdentifier"
-              }
-            },
             "source": {
               "$ref": "#/$defs/Source"
             },
@@ -1203,7 +1212,7 @@
               "required": ["groupedValue"],
               "properties": {
                 "groupedValue": {
-                  "minItems": 2
+                  "minItems": 1
                 }
               }
             }
@@ -1349,181 +1358,49 @@
         }
       }
     },
-    "DescriptiveValue": {
-      "description": "Default value model for descriptive elements.",
+    "DescriptiveIdentifier": {
+      "description": "Default value model for identifiers.",
       "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      },
       "allOf": [
         {
-          "$ref": "#/$defs/DescriptiveStructuredValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveParallelValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveGroupedValue"
+          "$ref": "#/$defs/DescriptiveBasicValue"
         },
         {
           "type": "object",
           "properties": {
-            "value": {
-              "description": "String or integer value of the descriptive element.",
-              "oneOf": [
-                {
-                  "type": "string"
-                }
-              ]
-            },
-            "type": {
-              "description": "Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.",
-              "type": "string"
-            },
-            "status": {
-              "description": "Status of the descriptive element value relative to other instances of the element.",
-              "type": "string"
-            },
-            "code": {
-              "description": "Code value of the descriptive element.",
-              "type": "string"
-            },
-            "uri": {
-              "description": "URI value of the descriptive element.",
-              "type": "string"
-            },
-            "standard": {
-              "$ref": "#/$defs/Standard"
-            },
-            "encoding": {
-              "$ref": "#/$defs/Standard"
-            },
-            "identifier": {
-              "description": "Identifiers and URIs associated with the descriptive element.",
+            "appliesTo": {
               "type": "array",
               "items": {
-                "$ref": "#/$defs/DescriptiveIdentifier"
+                "$ref": "#/$defs/AppliesTo"
               }
-            },
-            "source": {
-              "$ref": "#/$defs/Source"
-            },
-            "displayLabel": {
-              "description": "The preferred display label to use for the descriptive element in access systems.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "qualifier": {
-              "description": "A term providing information about the circumstances of the statement (e.g., approximate dates).",
-              "type": "string"
-            },
-            "note": {
-              "description": "Other information related to the descriptive element.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveValue"
-              }
-            },
-            "valueLanguage": {
-              "$ref": "#/$defs/DescriptiveValueLanguage"
-            },
-            "valueAt": {
-              "description": "URL or other pointer to the location of the value of the descriptive element.",
-              "type": "string"
             }
           }
         }
       ],
       "unevaluatedProperties": false
     },
-    "DescriptiveIdentifier": {
-      "description": "Value model for descriptive identifiers. Same as DescriptiveValue but omits the identifier property to prevent infinite recursion.",
+    "DescriptiveValue": {
+      "description": "Default value model for descriptive elements.",
       "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      },
       "allOf": [
         {
-          "$ref": "#/$defs/DescriptiveStructuredValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveParallelValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveGroupedValue"
+          "$ref": "#/$defs/DescriptiveBasicValue"
         },
         {
           "type": "object",
           "properties": {
-            "value": {
-              "description": "String or integer value of the descriptive element.",
-              "oneOf": [
-                {
-                  "type": "string"
-                }
-              ]
-            },
-            "type": {
-              "description": "Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.",
-              "type": "string"
-            },
-            "status": {
-              "description": "Status of the descriptive element value relative to other instances of the element.",
-              "type": "string"
-            },
-            "code": {
-              "description": "Code value of the descriptive element.",
-              "type": "string"
-            },
-            "uri": {
-              "description": "URI value of the descriptive element.",
-              "type": "string"
-            },
-            "standard": {
-              "$ref": "#/$defs/Standard"
-            },
-            "encoding": {
-              "$ref": "#/$defs/Standard"
-            },
-            "source": {
-              "$ref": "#/$defs/Source"
-            },
-            "displayLabel": {
-              "description": "The preferred display label to use for the descriptive element in access systems.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "qualifier": {
-              "description": "A term providing information about the circumstances of the statement (e.g., approximate dates).",
-              "type": "string"
-            },
-            "note": {
-              "description": "Other information related to the descriptive element.",
+            "appliesTo": {
               "type": "array",
               "items": {
-                "$ref": "#/$defs/DescriptiveValue"
+                "$ref": "#/$defs/AppliesTo"
               }
             },
-            "valueLanguage": {
-              "$ref": "#/$defs/DescriptiveValueLanguage"
-            },
-            "valueAt": {
-              "description": "URL or other pointer to the location of the value of the descriptive element.",
-              "type": "string"
+            "identifier": {
+              "description": "Identifiers and URIs associated with the descriptive element.",
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/DescriptiveIdentifier"
+              }
             }
           }
         }
@@ -1720,7 +1597,7 @@
               "minItems": 1
             }
           }
-        }        
+        }
       ]
     },
     "File": {
@@ -2012,7 +1889,7 @@
         "appliesTo": {
           "type": "array",
           "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
+            "$ref": "#/$defs/AppliesTo"
           }
         },
         "code": {
@@ -2502,13 +2379,6 @@
         "access": {
           "$ref": "#/$defs/DescriptiveAccessMetadata"
         },
-        "relatedResource": {
-          "description": "Other resources associated with the related resource.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/RelatedResource"
-          }
-        },
         "adminMetadata": {
           "$ref": "#/$defs/DescriptiveAdminMetadata"
         },
@@ -2676,7 +2546,6 @@
       "required": [
         "cocinaVersion",
         "administrative",
-        "label",
         "type",
         "version"
       ],
@@ -2744,7 +2613,6 @@
         "cocinaVersion",
         "access",
         "administrative",
-        "label",
         "type",
         "version"
       ],
@@ -2811,7 +2679,6 @@
         "cocinaVersion",
         "administrative",
         "identification",
-        "label",
         "type",
         "version"
       ],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.126.0
+  version: 0.128.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -488,7 +488,7 @@ files:
 - 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_uri_visitor_validator.rb
-- lib/cocina/models/validators/description_location_source_code_visitor_validator.rb
+- lib/cocina/models/validators/description_location_visitor_validator.rb
 - lib/cocina/models/validators/description_name_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_role_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_script_visitor_validator.rb
@@ -536,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Data models for the SDR
 test_files: []

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Cocina
-  module Models
-    module Validators
-      # Validates location.source.code values against location_source_codes.yml.
-      class DescriptionLocationSourceCodeVisitorValidator < BaseDescriptionVisitorValidator
-        def validate!
-          return if error_paths.empty?
-
-          raise ValidationError, "Unrecognized location source codes in description: #{error_paths.join(', ')}"
-        end
-
-        def visit_hash(hash:, path:)
-          return unless location_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 location_path?(path)
-          # Match entries in a location array (e.g., [:location, 0] or [:relatedResource, 0, :location, 0]).
-          path.length >= 2 && path[-1].is_a?(Integer) && path[-2].to_s == 'location'
-        end
-
-        # rubocop:disable Style/ClassVars
-        def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../location_source_codes.yml', __dir__)).to_set(&:downcase)
-        end
-        # rubocop:enable Style/ClassVars
-      end
-    end
-  end
-end