cocina-models 0.83.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed81e24ae6c7f8a21f7dd55ac24df69a599dd69b4aae3de0e726962fdcd9318
-  data.tar.gz: a522660cd996da1a703f921940364ffd1690dea8c068dbdb0378f54da35a4597
+  metadata.gz: 326a7390c3ec14bfbc4ec9e4e79f26528b9dfa214f38aefd0646baddfbad96d5
+  data.tar.gz: cce43d9334fd16e47e790a082bbc999cf969b18ab78dc3d5e7015f757f6f4ea0
 SHA512:
-  metadata.gz: 17070357c2d42eee762d4234a8ad3233b1384442f077b7e45bd0039a905c9f9bf7e9db1a322003c7fa5bfc4a0135194fa05451524233f9ea070f28de2eba063c
-  data.tar.gz: 637b4bb37a7557abf2591dfaf348d758d89038075292cf0e7135d9fc49042e469b6ce533ea0b63c7428d4bebc60dba91807b97af3c9919b6fb378cad50ee77df
+  metadata.gz: d1a83488b4c5a07ae64073693c0a77424ce10fbfdada5e769fca6794d75cddc5c789d04ab92e35fa80a30eae82a0f8c284753df16ddab044bcd1ad11030b22f5
+  data.tar.gz: 6604a503733106b82f2e0155a2632a1eb8d00881dc762b52779179a96d962fd5e5143be6ebbe2738cb5d35eac88ee95d039c7f358d2664f10f6a82f71626b058

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@2.0.0
+  ruby-rails: sul-dlss/ruby-rails@3.1.2
 workflows:
   build:
     jobs:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.83.0)
+    cocina-models (0.84.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -20,7 +20,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -38,15 +38,11 @@ GEM
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-configurable (0.15.0)
+    dry-container (0.10.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+    dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
+    dry-inflector (0.3.0)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -60,11 +56,11 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    edtf (3.0.8)
+    edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.2)
@@ -72,9 +68,9 @@ GEM
     jsonpath (1.1.2)
       multi_json
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_json (1.15.0)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
@@ -82,7 +78,7 @@ GEM
     openapi_parser (0.15.0)
     optimist (3.0.1)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     patience_diff (1.2.0)
       optimist (~> 3.0)
@@ -109,17 +105,17 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.31.1)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
@@ -137,7 +133,7 @@ GEM
       diff-lcs
       patience_diff
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
     zeitwerk (2.6.0)

data/README.md

@@ -51,10 +51,10 @@ 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 or validation change will conflict with some existing objects then [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) should be used for testing. This must be run on sdr-deploy since it requires deploying a branch of cocina-models.
+If there is a possibility that a model or validation change will conflict with some existing objects then [validate-cocina](https://github.com/sul-dlss/dor-services-app/blob/main/bin/validate-cocina) should be used for testing. This must be run on sdr-infra since it requires deploying a branch of cocina-models.
 
-1. Create a cocina-models branch containing the proposed change and push to Github.
-2. On sdr-deploy, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
+1. Create a cocina-models branch containing the proposed change and push to GitHub.
+2. On sdr-infra, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
 3. Select the appropriate database.
 For QA:
 ```

data/lib/cocina/models/doi_exceptions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    DoiExceptions = Types::String.constrained(
+      format: %r{^10\.(25740/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936/629[tT]-[bB][xX]79)$}i
+    )
+  end
+end

data/lib/cocina/models/{doi.rb → doi_pattern.rb}

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    DOI = Types::String.constrained(
+    DoiPattern = Types::String.constrained(
       format: %r{^10\.(25740|80343)/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$}i
     )
   end

data/lib/cocina/models/identification.rb

@@ -7,8 +7,7 @@ module Cocina
       attribute? :barcode, Types::Nominal::Any
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).default([].freeze)
       # Digital Object Identifier (https://www.doi.org)
-      # example: 10.25740/bc123df4567
-      attribute? :doi, Types::Strict::String
+      attribute? :doi, Types::Nominal::Any
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026

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

@@ -339,7 +339,8 @@ module Cocina
                          end
             notes = name_notes_for(full_name[:role], node)
             name_attrs[:note] = notes unless notes.empty?
-            name_attrs.merge(attrs)
+            name_attrs[:identifier] = full_name[:identifier]
+            name_attrs.compact.merge(attrs)
           end
 
           def name_notes_for(roles, name_node)

data/lib/cocina/models/mapping/to_mods/subject.rb

@@ -230,8 +230,11 @@ module Cocina
           # Write nodes within MODS subject
           def write_topic(subject, subject_value, is_parallel: false, type: nil, subject_values_have_same_authority: true)
             type ||= subject_value.type
-            topic_attributes = topic_attributes_for(subject, subject_value, type, is_parallel: is_parallel,
-                                                                                  subject_values_have_same_authority: subject_values_have_same_authority)
+            topic_attributes = topic_attributes_for(subject,
+                                                    subject_value,
+                                                    type,
+                                                    is_parallel: is_parallel,
+                                                    subject_values_have_same_authority: subject_values_have_same_authority)
             case type
             when 'person'
               xml.name topic_attributes.merge(type: 'personal') do
@@ -395,6 +398,7 @@ module Cocina
               write_name_part(subject_value)
               write_display_form(display_values)
               write_roles(subject_value.note)
+              write_identifier(subject.identifier)
               write_other_notes(subject.note, 'description')
               write_other_notes(subject.note, 'affiliation')
             end
@@ -427,6 +431,12 @@ module Cocina
             end.each { |role| RoleWriter.write(xml: xml, role: role) }
           end
 
+          def write_identifier(identifiers)
+            identifiers.each do |identifier|
+              xml.nameIdentifier identifier.value, type: identifier.source.code
+            end
+          end
+
           def write_other_notes(notes, type)
             Array(notes).filter { |note| note.type == type }.each { |note| xml.public_send(type, note.value) }
           end

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

@@ -68,7 +68,15 @@ module Cocina
           Date.edtf!(value)
           true
         rescue StandardError
-          false
+          # NOTE: the upstream EDTF implementation in the `edtf` gem does not
+          #       allow a valid pattern that we use (possibly because only level
+          #       0 of the spec was implemented?):
+          #
+          # * Y-20555
+          #
+          # So we catch the false positives from the upstream gem and allow
+          # this pattern to validate
+          /\AY-?\d{5,}\Z/.match?(value)
         end
 
         def valid_iso8601?(value)
@@ -90,7 +98,7 @@ module Cocina
           #
           # So we catch the false positives from the upstream gem and allow
           # these two patterns to validate
-          /\A\d{4}(-0[1-9]|1[0-2])?\Z/.match?(value)
+          /\A\d{4}(-0[1-9]|-1[0-2])?\Z/.match?(value)
         end
 
         def druid

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

@@ -12,7 +12,8 @@ module Cocina
           CatalogLinksValidator,
           AssociatedNameValidator,
           DescriptionTypesValidator,
-          DescriptionValuesValidator
+          DescriptionValuesValidator,
+          DateTimeValidator
         ].freeze
 
         def self.validate(clazz, attributes)

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.83.0'
+    VERSION = '0.84.0'
   end
 end

data/lib/cocina/models.rb

@@ -40,7 +40,7 @@ loader = Zeitwerk::Loader.new
 loader.inflector = CocinaModelsInflector.new
 loader.push_dir(File.absolute_path("#{__FILE__}/../.."))
 loader.ignore("#{__dir__}/rspec.rb")
-loader.ignore("#{__dir__}/rspec/**/*.rb")
+loader.ignore("#{__dir__}/rspec")
 loader.setup
 
 module Cocina
@@ -153,5 +153,12 @@ module Cocina
       raise ValidationError, 'Type field not found'
     end
     private_class_method :type_for
+
+    def self.druid_regex
+      @druid_regex ||= begin
+        str = Openapi3Parser.load_file('openapi.yml').components.schemas['Druid'].pattern
+        Regexp.new(str)
+      end
+    end
   end
 end

data/openapi.yml

@@ -896,8 +896,18 @@ components:
               # description: An alphabet or other notation used to represent a
               #   language or other symbolic system of the descriptive element value.
     DOI:
-      type: string
       description: Digital Object Identifier (https://www.doi.org)
+      oneOf:
+        - $ref: '#/components/schemas/DoiPattern'
+        - $ref: '#/components/schemas/DoiExceptions'
+    DoiExceptions:
+      type: string
+      description: pre-existing Digital Object Identifiers (https://www.doi.org) not matching the pattern (case insensitive)
+      pattern: '^10\.(25740\/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936\/629[tT]-[bB][xX]79)$'
+      example: '10.25740/12qF-5243'
+    DoiPattern:
+      type: string
+      description: Digital Object Identifier (https://www.doi.org) regex pattern
       # The prod and test prefixes are permitted
       pattern: '^10\.(25740|80343)\/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$'
       example: '10.25740/bc123df4567'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.83.0
+  version: 0.84.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -398,7 +398,8 @@ files:
 - lib/cocina/models/descriptive_structured_value.rb
 - lib/cocina/models/descriptive_value.rb
 - lib/cocina/models/descriptive_value_language.rb
-- lib/cocina/models/doi.rb
+- lib/cocina/models/doi_exceptions.rb
+- lib/cocina/models/doi_pattern.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
@@ -537,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Data models for the SDR