cocina-models 0.91.1 → 0.91.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ec01db7a1ce34eb6949d50b95ee99f61ff9a9ebcfaa07627c8e848810193fa
-  data.tar.gz: 6f8ea9812e67a755994ed991bb6e97f322f37b18fa488c582dec025928b81772
+  metadata.gz: 8062f7e04f843861947c0d53bf9d909620f991d262457f6ecb80842a67dcfe21
+  data.tar.gz: 9b1da95041e78c09ec88e70ec63cb940d29edcc22fd408428cd351a665223970
 SHA512:
-  metadata.gz: 6374e20bdbaf8a7c05549e85575c25edf177ddd1f99d2d000a36c91b7627dc38c81ec16e662fd068bd51899fca72f5de623ce42642c12a72da0504f575f7c5ca
-  data.tar.gz: 79a090fccb9a0005b6f80148170e0f4fadf8895a6e70fd33e42af4a26a43c364e209426128bfc88eeb41923ab5aa55e02e8ec9391168db55517fb482e250db35
+  metadata.gz: dc5c8c49ed0765cd5281f7a5c3a05b92862b7c6e6e3d982891c381af2881d05026fe22f8d718c0219522f6dffe7639fda3d59e90c13a141f8fd693d17db3cecd
+  data.tar.gz: 78802018f0a02aa4683c01663535bacd89ded3ffe4ff43433e69d267f33283f935182aabf24d23d2abaceb2a748fae7208e6c9f4cb2f0b450ba06d22cab50dbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.91.1)
+    cocina-models (0.91.3)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -20,14 +20,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     byebug (11.1.3)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
@@ -35,10 +41,13 @@ GEM
       rack (>= 1.5)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
@@ -67,12 +76,13 @@ GEM
     ice_nine (0.11.2)
     json (2.6.3)
     json_schema (0.21.0)
-    jsonpath (1.1.3)
+    jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
     multi_json (1.15.0)
+    mutex_m (0.1.2)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -81,7 +91,7 @@ GEM
     openapi_parser (1.0.0)
     optimist (3.1.0)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -90,7 +100,7 @@ GEM
     rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -109,12 +119,12 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.3.0)
       rexml
-    rubocop (1.56.3)
+    rubocop (1.57.1)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -123,17 +133,18 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.0)
+    rubocop-rspec (2.24.1)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -147,8 +158,8 @@ GEM
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    zeitwerk (2.6.11)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby

data/README.md

@@ -51,7 +51,7 @@ 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-infra since it requires deploying a branch of cocina-models.
+If there is a possibility that a model, mapping, 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-infra, check out `main`, update the `Gemfile` so that cocina-models references the branch, and `bundle install`.
@@ -120,7 +120,12 @@ bundle exec bin/rails r -e production "BadIso8601Dates.report" > BadIso8601Dates
 scp deploy@sdr-infra:/opt/app/deploy/dor-services-app/BadIso8601Dates.csv BadIso8601Dates.csv
 ```
 
-## Releasing
+## Releasing a patch change
+A patch change is a change that (1) does not affect the data model; (2) does not alter the openapi.yml; and more broadly (3) does not matter if some applications have the change and others do not.
+
+A patch change can be released as part of regular dependency updates or selectively released for individual applications.
+
+## Releasing major or minor change
 
 ### Step 0: Share intent to change the models
 
@@ -136,9 +141,7 @@ which pushes the gem to rubygems.org.
 
 ### Step 2: Update client gems coupled to the models
 
-**NOTE**: You may skip this step if the new release is a patch-level bump only, as the client gems are pinned to a minor release of cocina-models.  However, a PR to update Gemfile.lock with the new cocina-models version is welcome ... and not a blocker.
-
-If this is a minor or major cocina-models version change, release new versions of [sdr-client](https://github.com/sul-dlss/sdr-client) and [dor-services-client](https://github.com/sul-dlss/dor-services-client/) pinned to use the new cocina-models version because applications such as [Argo](https://github.com/sul-dlss/argo) depend on both of these gems using the same models.
+Release new versions of [sdr-client](https://github.com/sul-dlss/sdr-client) and [dor-services-client](https://github.com/sul-dlss/dor-services-client/) pinned to use the new cocina-models version because applications such as [Argo](https://github.com/sul-dlss/argo) depend on both of these gems using the same models.
 
 ### Step 3: Update services directly coupled to the models
 

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

@@ -77,7 +77,7 @@ module Cocina
                 write_location(loc)
               end
               Array(names).each do |name|
-                xml.publisher name.value, name_attributes(name)
+                xml.publisher name.value, name_attributes(name) if name
               end
               Array(notes).each do |note|
                 write_note(note)
@@ -87,9 +87,15 @@ module Cocina
           # rubocop:enable Metrics/ParameterLists
 
           def write_note(note)
-            attributes = {}
-            attributes[:authority] = note.source.code if note&.source&.code
-            xml.send(note_tag_for(note), note.value, attributes)
+            if note.parallelValue.present?
+              note.parallelValue.each do |parallel_note|
+                write_note(parallel_note)
+              end
+            else
+              attributes = {}
+              attributes[:authority] = note.source.code if note&.source&.code
+              xml.send(note_tag_for(note), note.value, attributes)
+            end
           end
 
           def note_tag_for(note)

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

@@ -35,7 +35,7 @@ module Cocina
 
         def validate_hash(hash, path)
           hash.each do |key, obj|
-            if key == :type
+            if key.to_sym == :type
               validate_type(obj, path)
             else
               validate_obj(obj, path + [key])
@@ -55,8 +55,10 @@ module Cocina
         end
 
         def validate_type(type, path)
+          clean_path = clean_path(path)
           valid_types.each do |type_signature, types|
-            next unless match?(path, type_signature)
+            next unless match?(clean_path, type_signature)
+
             break if types.include?(type.downcase)
 
             error_paths << "#{path_to_s(path)} (#{type})"
@@ -64,15 +66,15 @@ module Cocina
           end
         end
 
-        def match?(path, type_signature)
-          clean_path(path).last(type_signature.length) == type_signature
+        def match?(clean_path, type_signature)
+          clean_path.last(type_signature.length) == type_signature
         end
 
         # Some part of the path are ignored for the purpose of matching.
         def clean_path(path)
           new_path = path.reject do |part|
-            part.is_a?(Integer) || %i[parallelValue parallelContributor parallelEvent].include?(part)
-          end
+            part.is_a?(Integer) || %i[parallelValue parallelContributor parallelEvent].include?(part.to_sym)
+          end.map(&:to_sym)
           # This needs to happen after parallelValue is removed
           # to handle structuredValue > parallelValue > structuredValue
           new_path.reject.with_index do |part, index|

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

@@ -18,16 +18,9 @@ module Cocina
 
         def self.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|
+          attributes_hash = attributes.to_h.deep_transform_values do |value|
             value.class.name.starts_with?('Cocina::Models') ? value.to_h : value
-          end.deep_symbolize_keys.with_indifferent_access
+          end.with_indifferent_access
           VALIDATORS.each { |validator| validator.validate(clazz, attributes_hash) }
         end
 

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.91.1'
+    VERSION = '0.91.3'
   end
 end

data/lib/cocina/models.rb

@@ -9,11 +9,7 @@ require 'yaml'
 require 'openapi_parser'
 require 'openapi3_parser'
 require 'active_support'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/string'
-require 'active_support/core_ext/object/deep_dup'
+require 'active_support/core_ext'
 require 'thor'
 
 # Help Zeitwerk find some of our classes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.91.1
+  version: 0.91.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -545,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Data models for the SDR