cocina-models 0.131.0 → 0.132.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7896b08d2d0a1f99608ce6dfd4fe2a92cc0d9786f68f3f2eb971793444fd7194
-  data.tar.gz: 5dcbd075841e70fc116a0bc720411f52fb8823f1be2c401c7dcfa48ff50b9775
+  metadata.gz: 6a61867c1ae0703869cce27ced15c5698d5e4e93b5792e6e1ae559ca55965d39
+  data.tar.gz: e091f101f3922c69833aca4117f4d8d011f55d0959e2463e8f151bf1ba6f8d6a
 SHA512:
-  metadata.gz: 04cceeb51f7dbddb72946b4a668d87f4078b88bf2256b5a322d49a21eda870e9d832b648bf9f0ff9969b845fd0290236b14481dbde95c55cb1468cba3c09f8f9
-  data.tar.gz: 540ba204efa81c747c6ebbddd53f25452fcfa26a961d2bb3b123be9d90d0d7f2d0156207e7d8b5050d70ff095e59a74130850452a56954169e14f38bb7d81251
+  metadata.gz: b8b8e322eeed3c9a59831ef76a664c79cd6438224e4ec92de4448c9da17ea10c20874758fd968e270523ceb13acce529cc6b13e596b925b05aac77ba93accfa9
+  data.tar.gz: bace81574ac19ed81b453caeec3530c940e1c4bc41d94e316726ea5f42092092363e0c4138fb51fe693732af3f74db5bea5b629f0ab5a60b1db57cf3ca05c802

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.131.0)
+    cocina-models (0.132.0)
       activesupport
       cocina_display
       deprecation
@@ -226,7 +226,7 @@ CHECKSUMS
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
   bundler (4.0.17) sha256=214e21431b5665dd2f99df8a5511c6b151d7a72e8015c8b38f8b775b61cbb6c1
-  cocina-models (0.131.0)
+  cocina-models (0.132.0)
   cocina_display (2.9.0) sha256=00e97cf826dafd5c547ca87b58e55f1d3bfa68fa4ddcddbbe25b4d9d9ed05d8f
   concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a

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

@@ -7,7 +7,7 @@ module Cocina
     module Validators
       # Validates that dates of known types are type-valid using the visitor pattern.
       class DescriptionDateTimeVisitorValidator < BaseDescriptionVisitorValidator
-        VALIDATABLE_TYPES = %w[edtf iso8601 w3cdtf].freeze
+        VALIDATABLE_TYPES = %w[edtf iso8601 marc w3cdtf].freeze
         VALID_ENCODING_CODES = %w[edtf iso8601 marc temper w3cdtf].freeze
 
         def visit_hash(hash:, path:) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
@@ -135,6 +135,10 @@ module Cocina
         def valid_w3cdtf?(value)
           W3cdtfValidator.validate(value)
         end
+
+        def valid_marc?(value)
+          MarcDateValidator.validate(value)
+        end
       end
     end
   end

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

@@ -3,8 +3,10 @@
 module Cocina
   module Models
     module Validators
-      # Validates contributor.role.source.code values against role_source_codes.yml.
+      # Validates contributor.role.source.code values.
       class DescriptionRoleSourceCodeVisitorValidator < BaseDescriptionVisitorValidator
+        VALID_CODES = %w[aat lcmpt marcrelator rbmsrel].freeze
+
         def validate!
           return if error_paths.empty?
 
@@ -16,7 +18,7 @@ module Cocina
 
           source_code = hash.dig(:source, :code)
           return unless source_code
-          return if valid_codes.include?(source_code.downcase)
+          return if VALID_CODES.include?(source_code.downcase)
 
           error_paths << "#{path_to_s(path)}.source.code (#{source_code})"
         end
@@ -33,11 +35,6 @@ module Cocina
             path[-2].to_s == 'role' && # we have a nested role in the path
             path.any? { |part| part.to_s == 'contributor' } # there is a contributor in the path (any? allows for nested roles)
         end
-
-        # Source codes allowed for contributor.role.source.code
-        def valid_codes
-          %w[aat lcmpt marcrelator rbmsrel]
-        end
       end
     end
   end

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

@@ -36,7 +36,8 @@ module Cocina
         # @return [JSONSchema validator] a cached per-definition validator
         def self.validator_for(def_name)
           @validators ||= {}
-          @validators[def_name] ||= JSONSchema.validator_for({ '$ref' => "#/$defs/#{def_name}", '$defs' => document['$defs'] })
+          schema = { '$ref' => "#/$defs/#{def_name}", '$defs' => document['$defs'] }
+          @validators[def_name] ||= JSONSchema.validator_for(schema, validate_formats: true)
         end
 
         # @return [Hash] a hash representation of the schema.json document

data/lib/cocina/models/version.rb

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

data/schema.json

@@ -1113,7 +1113,8 @@
             },
             "uri": {
               "description": "URI value of the descriptive element.",
-              "type": "string"
+              "type": "string",
+              "format": "uri"
             },
             "standard": {
               "$ref": "#/$defs/Standard"
@@ -1339,7 +1340,8 @@
         },
         "uri": {
           "description": "URI for the standard or encoding.",
-          "type": "string"
+          "type": "string",
+          "format": "uri"
         },
         "value": {
           "description": "String describing the standard or encoding.",
@@ -1864,7 +1866,8 @@
         },
         "uri": {
           "description": "URI value of the descriptive element.",
-          "type": "string"
+          "type": "string",
+          "format": "uri"
         },
         "value": {
           "description": "Value of the descriptive element.",
@@ -2971,7 +2974,8 @@
         },
         "uri": {
           "description": "URI for the value source.",
-          "type": "string"
+          "type": "string",
+          "format": "uri"
         },
         "value": {
           "description": "String describing the value source.",
@@ -3018,7 +3022,8 @@
         },
         "uri": {
           "description": "URI for the standard or encoding.",
-          "type": "string"
+          "type": "string",
+          "format": "uri"
         },
         "value": {
           "description": "String describing the standard or encoding.",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.131.0
+  version: 0.132.0
 platform: ruby
 authors:
 - Justin Coyne