cocina-models 0.73.6 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010b22a3ad2f8bfe8f1c9fc020538adf0b89b2c77dc0ad0219c2321dfec5f6da
-  data.tar.gz: c51eae2641ca506f08abaedbd99e8385b291b4ac144f6bdffacb9cc5c5379576
+  metadata.gz: de6cff9bb4c5ec4f7b2533f024c37a6536d4c94ca1ba19cb91f4203ee8e9588f
+  data.tar.gz: 2b01b63cbccae36d295b825ffd44f435dd03e95ea84daf54caa62b13d696f9c5
 SHA512:
-  metadata.gz: 0b65ccf18b933dc8287371765ff66f1d17b13f3d206a960b6afcdaf337819fd3d1ddebb4146458c0eaacdc77064817f41aae5fe86edf2a58ab07de24ba5902a7
-  data.tar.gz: bb93e938a05ce9a3370f245074a72e5c0ad009e6bd81c1330db7bc595578caaeb93f068550ec0b92060b9c1d299ff6250bb598bee37b43f1f685405881bb7f24
+  metadata.gz: 6cff72fbbe94becd71a3ad92f622650dba10b7a26d3eef9f34d8c856e47b2bfd87551f0e8a6bccd7974c36347d33f7a20c906e417e7a70346fa00f0d43f4a66f
+  data.tar.gz: fc2e259a1d7c9a2efeda647d6db82bce3a9116736b1d69fbd01e07bfae2f169a5b56510ad7e29b2b10a9efe3ecc9896b0bf16f203e27ad752cc2c3df55730a09

data/description_types.yml

@@ -17,6 +17,8 @@ access.note:
     description: License describing allowed uses of the resource.
   - value: use and reproduction
     description: Information related to allowed uses of the resource in other contexts.
+  - value: access constraints
+    status: TEMP
 access.physicalLocation:
   - value: discovery
     description: Location where a user may find the resource.
@@ -176,7 +178,7 @@ event.date:
     description: The delivery of the resource to an external audience.
   - value: generation
     description: The creation of a resource by an automatic or natural process.
-  - value: Hijiri calendar
+  - value: Hijri calendar
   - value: Islamic
   - value: Julian
   - value: letter
@@ -285,6 +287,9 @@ geographic.subject.structuredValue:
   - value: south
   - value: west
 identifier:
+  - value: accession
+    status: deprecated
+    use: accession number
   - value: accession number
   - value: alternate case number
   - value: anchor
@@ -296,8 +301,11 @@ identifier:
     code: arxiv
   - value: case identifier
   - value: case number
+  - value: CCP
+  - value: CLC
   - value: CSt
   - value: CStRLIN
+  - value: CTC
   - value: Data Provider Digital Object Identifier
   - value: document number
   - value: DOI
@@ -359,6 +367,14 @@ identifier:
   - value: West Mat \#
   - value: Wikidata
     code: wikidata
+  - value: Bodley 342
+    status: TEMP
+  - value: vintage
+    status: TEMP
+  - value: accesion
+    status: TEMP
+  - value: Suri UUID
+    status: TEMP
 note:
   - value: abstract
   - value: access
@@ -480,6 +496,8 @@ note:
   - value: version
   - value: version identification
   - value: writing
+  - value: note
+    status: TEMP
 note.groupedValue:
   - value: caption
   - value: date
@@ -534,6 +552,8 @@ subject:
   - value: time
   - value: title
   - value: topic
+  - value: surname
+    status: TEMP
 subject.note:
   - value: affiliation
   - value: description
@@ -574,7 +594,6 @@ subject.structuredValue:
   - value: south
   - value: start
   - value: state
-  - value: subtitle
   - value: surname
   - value: term of address
   - value: territory
@@ -604,6 +623,10 @@ title:
     description: Title transliterated from non-Latin script to Latin script.
   - value: uniform
     description: Form of title in Library of Congress title authority.
+  - value: main
+    status: TEMP
+  - value: other title
+    status: TEMP
 title.note:
   - value: associated name
     description: A name linked to the title, such as for a name-title heading.

data/docs/description_types.md

@@ -15,6 +15,7 @@ _Path: access.note_
   * display label: Display label for the purl.
   * license: License describing allowed uses of the resource.
   * use and reproduction: Information related to allowed uses of the resource in other contexts.
+  * access constraints
 
 ## Access physicallocation types
 _Path: access.physicalLocation_
@@ -119,7 +120,7 @@ _Path: event.date_
   * development: The creation of a print from a photographic negative or other source medium.
   * distribution: The delivery of the resource to an external audience.
   * generation: The creation of a resource by an automatic or natural process.
-  * Hijiri calendar
+  * Hijri calendar
   * Islamic
   * Julian
   * letter: Athanasius
@@ -208,6 +209,7 @@ _Path: geographic.subject.structuredValue_
 
 # Identifier types
 _Path: identifier_
+  * accession
   * accession number
   * alternate case number
   * anchor
@@ -216,8 +218,11 @@ _Path: identifier_
   * arXiv
   * case identifier
   * case number
+  * CCP
+  * CLC
   * CSt
   * CStRLIN
+  * CTC
   * Data Provider Digital Object Identifier
   * document number
   * DOI
@@ -256,6 +261,10 @@ _Path: identifier_
   * videorecording identifier
   * West Mat \#
   * Wikidata
+  * Bodley 342
+  * vintage
+  * accesion
+  * Suri UUID
 
 # Note types
 _Path: note_
@@ -363,6 +372,7 @@ _Path: note_
   * version
   * version identification
   * writing
+  * note
 
 ## Note types for grouped value (MODS legacy)
 _Path: note.groupedValue_
@@ -410,6 +420,7 @@ _Path: subject_
   * time
   * title
   * topic
+  * surname
 
 ## Subject note types
 _Path: subject.note_
@@ -454,7 +465,6 @@ _Path: subject.structuredValue_
   * south
   * start
   * state
-  * subtitle
   * surname
   * term of address
   * territory
@@ -481,6 +491,8 @@ _Path: title_
   * translated: Title translated into another language.
   * transliterated: Title transliterated from non-Latin script to Latin script.
   * uniform: Form of title in Library of Congress title authority.
+  * main
+  * other title
 
 ## Title note types
 _Path: title.note_

data/lib/cocina/models/validatable.rb

@@ -8,7 +8,7 @@ module Cocina
 
       class_methods do
         def new(attributes = default_attributes, safe = false, validate = true, &block)
-          Validators::Validator.validate(self, attributes.with_indifferent_access) if validate
+          Validators::Validator.validate(self, attributes) if validate
           super(attributes, safe, &block)
         end
       end
@@ -16,7 +16,7 @@ module Cocina
       def new(*args)
         validate = args.first.delete(:validate) if args.present?
         new_model = super(*args)
-        Validators::Validator.validate(new_model.class, new_model.to_h) if validate || validate.nil?
+        Validators::Validator.validate(new_model.class, new_model) if validate || validate.nil?
         new_model
       end
     end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Validates that Purl matches the external identifier (druid)
+      class PurlValidator
+        def self.validate(clazz, attributes)
+          new(clazz, attributes).validate
+        end
+
+        def initialize(clazz, attributes)
+          @clazz = clazz
+          @attributes = attributes
+        end
+
+        def validate
+          return unless meets_preconditions?
+
+          return if identifier_from_druid == identifier_from_purl
+
+          raise ValidationError, "Purl mismatch: #{druid} purl does not match object druid."
+        end
+
+        private
+
+        attr_reader :clazz, :attributes
+
+        def meets_preconditions?
+          purl
+        end
+
+        def druid
+          @druid ||= attributes[:externalIdentifier]
+        end
+
+        def purl
+          @purl ||= attributes.dig(:description, :purl)
+        end
+
+        def identifier_from_druid
+          druid.delete_prefix('druid:')
+        end
+
+        def identifier_from_purl
+          purl.split('/').last
+        end
+      end
+    end
+  end
+end

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

@@ -8,13 +8,38 @@ module Cocina
         VALIDATORS = [
           OpenApiValidator,
           DarkValidator,
+          PurlValidator,
           CatalogLinksValidator,
           DescriptionTypesValidator
         ].freeze
 
         def self.validate(clazz, attributes)
-          VALIDATORS.each { |validator| validator.validate(clazz, attributes) }
+          # This gets rid of nested model objects.
+          # Once DSA is on Rails 6, this can be:
+          # attributes_hash = attributes.to_h.deep_transform_values do |value|
+          #   value.class.name.starts_with?('Cocina::Models') ? value.to_h : value
+          # end.with_indifferent_access
+          # And add require 'active_support/core_ext/hash/deep_transform_values' to models file.
+
+          # In the meantime, copying code.
+          attributes_hash = deep_transform_values(attributes.to_h) do |value|
+            value.class.name.starts_with?('Cocina::Models') ? value.to_h : value
+          end.with_indifferent_access
+
+          VALIDATORS.each { |validator| validator.validate(clazz, attributes_hash) }
+        end
+
+        def self.deep_transform_values(object, &block)
+          case object
+          when Hash
+            object.transform_values { |value| deep_transform_values(value, &block) }
+          when Array
+            object.map { |e| deep_transform_values(e, &block) }
+          else
+            yield(object)
+          end
         end
+        private_class_method :deep_transform_values
       end
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.73.6'
+    VERSION = '0.74.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.73.6
+  version: 0.74.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -391,6 +391,7 @@ files:
 - lib/cocina/models/validators/dark_validator.rb
 - lib/cocina/models/validators/description_types_validator.rb
 - lib/cocina/models/validators/open_api_validator.rb
+- lib/cocina/models/validators/purl_validator.rb
 - lib/cocina/models/validators/validator.rb
 - lib/cocina/models/version.rb
 - lib/cocina/models/vocabulary.rb