cocina-models 0.98.1 → 0.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc2be2ab60d4baa71e5d36e310afb176a649aa60fea3c566650975d4ffe4a6e
-  data.tar.gz: 6a63e80f2dc8f18e69a011c071b83ff8a268e011504cd413b3d4f341a853c5b2
+  metadata.gz: 86609a02da21c8f42f2244ef7f947b1eff8cc4063feef12118b2f605fe516ddd
+  data.tar.gz: 7c5d25fbfdab8c87f414c8ecd000e047c2387a26949c460427071e82167c3ec6
 SHA512:
-  metadata.gz: 523922282cfcdbb335484dbb2c429561cc60250aa26dd31dbbb6c2823e95966cb5ce6cb00f4dc1c6943f1fb1d1ae1bce18e36c6ba9b0c1b9a44a87a5fa72fcff
-  data.tar.gz: 609e78a360608dcaa8234ccb34621822c61ccec96d28e2c53e5fea4fa38add47655f5ca627627af57b9409e5f106bb17c28b3bbe9aee46a73d51ef0a3e7d4c64
+  metadata.gz: 54d32dd0dff4963df008172bf36f0c229e903375ad4c14f7a00fb3c892e5cc8322751baaf61ef52f14c78503af64b2ac0a8103fe39d92c849113b6d7a03d32cd
+  data.tar.gz: 20328dcaeeed98b9baa20966dda3c73930731627db9fd4eab242ec5894424e3973a75b7826d09c26f0f8a4c9e29536fbd76a47417f6b9bb506b1887c1168e428

data/.circleci/config.yml

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

data/.rubocop.yml

@@ -511,3 +511,24 @@ RSpec/ExpectInLet: # new in 2.30
   Enabled: true
 RSpec/UndescriptiveLiteralsDescription: # new in 2.29
   Enabled: true
+
+Gemspec/AddRuntimeDependency: # new in 1.65
+  Enabled: true
+Lint/DuplicateSetElement: # new in 1.67
+  Enabled: true
+Lint/UnescapedBracketInRegexp: # new in 1.68
+  Enabled: true
+Lint/UselessNumericOperation: # new in 1.66
+  Enabled: true
+Style/AmbiguousEndlessMethodDefinition: # new in 1.68
+  Enabled: true
+Style/BitwisePredicate: # new in 1.68
+  Enabled: true
+Style/CombinableDefined: # new in 1.68
+  Enabled: true
+Style/KeywordArgumentsMerging: # new in 1.68
+  Enabled: false
+Style/RedundantInterpolationUnfreeze: # new in 1.66
+  Enabled: true
+Style/SafeNavigationChainLength: # new in 1.68
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.98.1)
+    cocina-models (0.99.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -20,38 +20,42 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     byebug (11.1.3)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    commonmarker (1.1.4)
+    commonmarker (1.1.5)
       rb_sys (~> 0.9)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.1)
-    docile (1.4.0)
+    docile (1.4.1)
     drb (2.2.1)
-    dry-core (1.0.1)
+    dry-core (1.0.2)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
@@ -72,66 +76,63 @@ GEM
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.7.2)
+    json (2.8.2)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
-    mini_portile2 (2.8.7)
-    minitest (5.24.0)
+    logger (1.6.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.2)
     multi_json (1.15.0)
-    mutex_m (0.2.0)
-    nokogiri (1.16.6)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openapi3_parser (0.10.0)
       commonmarker (>= 1.0)
     openapi_parser (1.0.0)
-    optimist (3.1.0)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    optimist (3.2.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    racc (1.8.0)
-    rack (3.1.4)
+    racc (1.8.1)
+    rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb_sys (0.9.97)
+    rb_sys (0.9.103)
     regexp_parser (2.9.2)
-    rexml (3.3.0)
-      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.64.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -147,22 +148,22 @@ GEM
     rubocop-rspec_rails (2.29.1)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
-    super_diff (0.12.1)
+    super_diff (0.14.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.16)
+    unicode-display_width (2.6.0)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -140,7 +140,7 @@ Send a note to `#dlss-infra-chg-mgmt` on Slack to let people know what is changi
 
 ### Step 1: Cut the release
 
-The release process is much like any other gem. First bump the version in `lib/cocina/models/version.rb`, and commit the result. Then run:
+The release process is much like any other gem. First bump the version in `lib/cocina/models/version.rb`, then `bundle install` so that `Gemfile.lock` is updated, then commit and push those changes. Then run:
 ```
 bundle exec rake release
 ```

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

@@ -421,7 +421,6 @@ module Cocina
             cocina_desc_val
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
           def build_structured_date(date_nodes)
             return if date_nodes.blank?
 
@@ -432,13 +431,12 @@ module Cocina
               next if node.text.blank? && node.attributes.empty?
 
               new_node = node.deep_dup
-              new_node.remove_attribute('encoding') if common_attribs[:encoding].present? || node[:encoding]&.size&.zero?
-              new_node.remove_attribute('qualifier') if common_attribs[:qualifier].present? || node[:qualifier]&.size&.zero?
+              new_node.remove_attribute('encoding') if common_attribs[:encoding].present? || node[:encoding]&.empty?
+              new_node.remove_attribute('qualifier') if common_attribs[:qualifier].present? || node[:qualifier]&.empty?
               build_date(new_node)
             end
             { structuredValue: dates }.merge(common_attribs).compact
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           # Per Arcadia, keyDate should only appear once in an originInfo.
           # If keyDate is on a date of type point and is on both the start and end points, then

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

@@ -290,10 +290,8 @@ module Cocina
           end
 
           def build_affiliation_notes(name_node)
-            [].tap do |parts|
-              name_node.xpath('mods:affiliation', mods: Description::DESC_METADATA_NS).each do |affiliation_node|
-                parts << { value: affiliation_node.text, type: 'affiliation' }
-              end
+            name_node.xpath('mods:affiliation', mods: Description::DESC_METADATA_NS).map do |affiliation_node|
+              { value: affiliation_node.text, type: 'affiliation' }
             end
           end
 

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

@@ -32,7 +32,7 @@ module Cocina
               note_present?(node)
             end
             altrepgroup_abstract_nodes, other_abstract_nodes = AltRepGroup.split(nodes: all_abstract_nodes)
-            other_abstract_nodes.map { |node| common_note_for(node).merge(abstract_type(node)) } + \
+            other_abstract_nodes.map { |node| common_note_for(node).merge(abstract_type(node)) } +
               altrepgroup_abstract_nodes.map { |parallel_nodes| parallel_abstract_for(parallel_nodes) }
           end
 
@@ -92,7 +92,7 @@ module Cocina
               note_present?(node) && node[:type] != 'contact'
             end
             altrepgroup_note_nodes, other_note_nodes = AltRepGroup.split(nodes: all_note_nodes)
-            other_note_nodes.map { |node| common_note_for(node) } + \
+            other_note_nodes.map { |node| common_note_for(node) } +
               altrepgroup_note_nodes.map { |parallel_nodes| parallel_note_for(parallel_nodes) }
           end
 
@@ -123,7 +123,7 @@ module Cocina
               note_present?(node)
             end
             altrepgroup_toc_nodes, other_toc_nodes = AltRepGroup.split(nodes: all_toc_nodes)
-            other_toc_nodes.map { |node| toc_for(node).merge({ type: 'table of contents' }) } + \
+            other_toc_nodes.map { |node| toc_for(node).merge({ type: 'table of contents' }) } +
               altrepgroup_toc_nodes.map { |parallel_nodes| parallel_toc_for(parallel_nodes) }
           end
 

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Validates that bare external identifier not used as a root filename or directory.
+      # This is necessary due to the bare druid being used as part of the Stacks file layout.
+      class ReservedFilenameValidator
+        def self.validate(clazz, attributes)
+          new(clazz, attributes).validate
+        end
+
+        def initialize(clazz, attributes)
+          @clazz = clazz
+          @attributes = attributes
+        end
+
+        def validate
+          return unless dro?
+
+          return if filenames.none? { |filename| reserved?(filename) }
+
+          raise ValidationError, 'Bare druid may not be used as a filename or a base directory'
+        end
+
+        private
+
+        attr_reader :clazz, :attributes
+
+        def dro?
+          (clazz::TYPES & DRO::TYPES).any? && attributes[:externalIdentifier].present?
+        rescue NameError
+          false
+        end
+
+        def reserved?(filename)
+          filename == bare_external_identifier || filename.start_with?("#{bare_external_identifier}/")
+        end
+
+        def bare_external_identifier
+          @bare_external_identifier ||= attributes[:externalIdentifier].delete_prefix('druid:')
+        end
+
+        def filenames
+          [].tap do |filenames|
+            next if attributes.dig(:structural, :contains).nil?
+
+            attributes[:structural][:contains].each do |fileset|
+              next if fileset.dig(:structural, :contains).nil?
+
+              fileset[:structural][:contains].each do |file|
+                filenames << file[:filename] if file[:filename].present?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,8 @@ module Cocina
           DescriptionTypesValidator,
           DescriptionValuesValidator,
           DateTimeValidator,
-          LanguageTagValidator
+          LanguageTagValidator,
+          ReservedFilenameValidator
         ].freeze
 
         def self.validate(clazz, attributes)

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.98.1'
+    VERSION = '0.99.1'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -62,7 +62,8 @@ module Cocina
         version: 1,
         label: 'factory collection label',
         title: 'factory collection title',
-        admin_policy_id: 'druid:hv992ry2431'
+        admin_policy_id: 'druid:hv992ry2431',
+        source_id: 'sulcollection:1234'
       }.freeze
 
       REQUEST_COLLECTION_DEFAULTS = COLLECTION_DEFAULTS.except(:id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.98.1
+  version: 0.99.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -521,6 +521,7 @@ files:
 - lib/cocina/models/validators/language_tag_validator.rb
 - lib/cocina/models/validators/open_api_validator.rb
 - lib/cocina/models/validators/purl_validator.rb
+- lib/cocina/models/validators/reserved_filename_validator.rb
 - lib/cocina/models/validators/validator.rb
 - lib/cocina/models/validators/w3cdtf_validator.rb
 - lib/cocina/models/version.rb
@@ -549,7 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Data models for the SDR