cocina-models 0.98.1 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc2be2ab60d4baa71e5d36e310afb176a649aa60fea3c566650975d4ffe4a6e
-  data.tar.gz: 6a63e80f2dc8f18e69a011c071b83ff8a268e011504cd413b3d4f341a853c5b2
+  metadata.gz: 763a8aa5a80317a106b9c038a61886460e88b6e8e160304f9250b0e5a56bdf1b
+  data.tar.gz: 5c73044a3a7859474e45edce5575445d6fcd2f23f362dafac3b2f417dd8ac5ec
 SHA512:
-  metadata.gz: 523922282cfcdbb335484dbb2c429561cc60250aa26dd31dbbb6c2823e95966cb5ce6cb00f4dc1c6943f1fb1d1ae1bce18e36c6ba9b0c1b9a44a87a5fa72fcff
-  data.tar.gz: 609e78a360608dcaa8234ccb34621822c61ccec96d28e2c53e5fea4fa38add47655f5ca627627af57b9409e5f106bb17c28b3bbe9aee46a73d51ef0a3e7d4c64
+  metadata.gz: 584c7fe2ff82aee2afd09ca4873664c8d315410a02fa7f6248bc2e6b59fdf5d8eda869737c2788e910fc294c869e908762afc1467d730f0a938f120f519bc787
+  data.tar.gz: 9efc6b6dfe0141c1de7915e70299ba7ac6586364094dcb5b0c69643486cef911d38725eb89dfa0e38abba10410b15e609449344f19e5c425b1b789faa191e5e3

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.2
 workflows:
   build:
     jobs:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.98.1)
+    cocina-models (0.99.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -46,12 +46,12 @@ GEM
     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)
       concurrent-ruby (~> 1.0)
       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)
@@ -81,10 +81,10 @@ GEM
       multi_json
     language_server-protocol (3.17.0.3)
     mini_portile2 (2.8.7)
-    minitest (5.24.0)
+    minitest (5.24.1)
     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)
@@ -92,18 +92,18 @@ GEM
     openapi_parser (1.0.0)
     optimist (3.1.0)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
     racc (1.8.0)
-    rack (3.1.4)
+    rack (3.1.7)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb_sys (0.9.97)
+    rb_sys (0.9.99)
     regexp_parser (2.9.2)
-    rexml (3.3.0)
+    rexml (3.3.2)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -120,13 +120,13 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.64.1)
+    rubocop (1.65.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)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)

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/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.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.98.1
+  version: 0.99.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-08-02 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