cocina-models 0.125.0 → 0.127.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1cbe64214701949f868f9bc059723de7cdd615f32224b083912598f206b7fe
-  data.tar.gz: 8056d85b1ae995268a535bfb7054539134333d8284cf71005493bc323498efca
+  metadata.gz: c9beced1e40bb48b8cb1b833da51b9205b5f454554c0385ad982c3f8bed648f8
+  data.tar.gz: b94cfd3960e8bdd7ff896a3749b12c95ed1827bcf05cdf7a62d37c0e9f88d817
 SHA512:
-  metadata.gz: 073300d57326edf9cb163199e8d1d2da1a2793840a048e29bd9bc67de64a09e10e192ceb0d290c4281d515b51325c14f882118794759322a42b9ee38fd5a39f4
-  data.tar.gz: b960c95acbd75ba99f7363b30fed87aadcc3a26a653506fa56c416547f4e285d5b7dd361a7dff012961b3a90255fa7a6b93237e1af2c92b3e7797eae6e1944f6
+  metadata.gz: 3accd9261f9215632a273525b0459e004db3cc0410bda7d455018e5042e1de908f87d7a13d1faa75c605c67c26b6437e0cc1c8dc6a8abda67fe5a6927bd71283
+  data.tar.gz: 26c9d0be0086a3567d640760432dca23a4355e088b7368bc48db87023c4e6d915880c33b3ab4588be22b2ce84b49eed69eb30cf357f8dab1921ec9eece3cea1e

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.125.0)
+    cocina-models (0.127.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.125.0)
+  cocina-models (0.127.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.rb

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

data/lib/cocina/models/admin_policy_lite.rb

@@ -13,7 +13,7 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*AdminPolicyLite::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      attribute :label, Types::Strict::String
+      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,7 +16,7 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*AdminPolicyWithMetadata::TYPES)
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
-      attribute :label, Types::Strict::String
+      attribute? :label, Types::Strict::String.default('')
       attribute :version, Types::Strict::Integer
       # Administrative properties for an AdminPolicy
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })

data/lib/cocina/models/collection.rb

@@ -23,7 +23,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a Collection.
-      attribute :label, Types::Strict::String
+      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

@@ -21,7 +21,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a Collection.
-      attribute :label, Types::Strict::String
+      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

@@ -22,7 +22,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a Collection.
-      attribute :label, Types::Strict::String
+      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

@@ -33,7 +33,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a DRO.
-      attribute :label, Types::Strict::String
+      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

@@ -31,7 +31,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a DRO.
-      attribute :label, Types::Strict::String
+      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

@@ -32,7 +32,7 @@ module Cocina
       # example: druid:bc123df4567
       attribute :externalIdentifier, Druid
       # Primary processing label (can be same as title) for a DRO.
-      attribute :label, Types::Strict::String
+      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/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/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.125.0'
+    VERSION = '0.127.0'
   end
 end

data/schema.json

@@ -107,7 +107,8 @@
           "$ref": "#/$defs/Druid"
         },
         "label": {
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "type": "integer"
@@ -123,7 +124,6 @@
         "cocinaVersion",
         "administrative",
         "externalIdentifier",
-        "label",
         "type",
         "version"
       ]
@@ -361,7 +361,8 @@
         },
         "label": {
           "description": "Primary processing label (can be same as title) for a Collection.",
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "description": "Version for the Collection within SDR.",
@@ -384,7 +385,6 @@
         "cocinaVersion",
         "description",
         "externalIdentifier",
-        "label",
         "type",
         "version",
         "access",
@@ -634,7 +634,8 @@
         "externalIdentifier": { "$ref": "#/$defs/Druid" },
         "label": {
           "description": "Primary processing label (can be same as title) for a DRO.",
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "description": "Version for the DRO within SDR.",
@@ -653,7 +654,6 @@
         "administrative",
         "description",
         "externalIdentifier",
-        "label",
         "type",
         "version",
         "identification",
@@ -1720,7 +1720,7 @@
               "minItems": 1
             }
           }
-        }        
+        }
       ]
     },
     "File": {
@@ -2656,7 +2656,8 @@
           ]
         },
         "label": {
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "type": "integer",
@@ -2675,7 +2676,6 @@
       "required": [
         "cocinaVersion",
         "administrative",
-        "label",
         "type",
         "version"
       ],
@@ -2716,7 +2716,8 @@
           ]
         },
         "label": {
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "type": "integer",
@@ -2742,7 +2743,6 @@
         "cocinaVersion",
         "access",
         "administrative",
-        "label",
         "type",
         "version"
       ],
@@ -2776,7 +2776,8 @@
           ]
         },
         "label": {
-          "type": "string"
+          "type": "string",
+          "default": ""
         },
         "version": {
           "type": "integer",
@@ -2808,7 +2809,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.125.0
+  version: 0.127.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: 4.0.6
+rubygems_version: 3.6.9
 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