cocina-models 0.106.0 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e344b96eb11f904d0730963727606fed5046857f72901761c7e75a1101992086
-  data.tar.gz: 1d446ff09f267b94684b57afeada1be9f393fd99874ed360c5c67f6e2d35051c
+  metadata.gz: 5274bff6327cebe2e04f7cc145fde055203131ae9885b4f654ff83dbbbe57408
+  data.tar.gz: 2cf28892860fdf3eb011a54aaaf4f6a25663f85cf66b8a1b15280b4165fe52f3
 SHA512:
-  metadata.gz: 3941a79c6c26af81128ed0face784ce398c5b343970c5511d5da8cf8aad9dde10d1ea6fe19dad6122e6d460b2a53c3f1bcd9ca800dfbb2885e98d9d37a4e588f
-  data.tar.gz: 4df7a5daf531751de3e26bb168f498a0b07042e039ea6797ee0f42e18893b74a464f72fc7ced0e6625818964f2e67d159bfa133878aa83f4c1410b6e67b0a076
+  metadata.gz: 46b42f34df5bf8aba16f2d47110f8d81ae5f1be62b0b5aeda6fba9898b911540788a6f9ff23318cc7e0870a6c57a8dc95a14b50ced333628ef6f703fd842872f
+  data.tar.gz: a769621283a3433cebb98fff0e3a872f21016050e38770932af0aafc1634993631d31e50bddc58cc0720c6002fcaa9ae48fac840aa6042f39d55a745c6a7ec0b

data/.rubocop.yml

@@ -6,7 +6,7 @@ plugins:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.4
 
 # ----- Layout ------
 
@@ -110,7 +110,7 @@ Metrics/PerceivedComplexity:
     - 'lib/cocina/models/mapping/to_mods/*'
     - 'lib/cocina/models/mapping/normalizers/**/*'
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - is_
 
@@ -521,3 +521,20 @@ Style/ItBlockParameter: # new in 1.75
   Enabled: true
 RSpec/IncludeExamples: # new in 3.6
   Enabled: true
+
+Gemspec/AttributeAssignment: # new in 1.77
+  Enabled: true
+Layout/EmptyLinesAfterModuleInclusion: # new in 1.79
+  Enabled: true
+Lint/UselessDefaultValueArgument: # new in 1.76
+  Enabled: true
+Lint/UselessOr: # new in 1.76
+  Enabled: true
+Naming/PredicateMethod: # new in 1.76
+  Enabled: true
+Style/CollectionQuerying: # new in 1.77
+  Enabled: true
+Style/EmptyStringInsideInterpolation: # new in 1.76
+  Enabled: true
+Style/RedundantArrayFlatten: # new in 1.76
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.106.0)
+    cocina-models (0.107.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2.1)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -78,7 +78,7 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.13.2)
+    json (2.15.0)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
@@ -117,10 +117,10 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.5)
+    rspec-support (3.13.6)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.80.2)
+    rubocop (1.81.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -128,10 +128,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.7.1)

data/cocina-models.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.4'
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'deprecation'

data/lib/cocina/generator/schema_base.rb

@@ -22,7 +22,7 @@ module Cocina
       end
 
       def name
-        "#{key || schema_doc.name}#{lite ? 'Lite' : ''}"
+        "#{key || schema_doc.name}#{'Lite' if lite}"
       end
 
       # Allows nullable values to be set to nil. This is useful when doing an

data/lib/cocina/models/builders/title_builder.rb

@@ -8,6 +8,7 @@ module Cocina
       # TitleBuilder selects the prefered title from the cocina object for solr indexing
       class TitleBuilder # rubocop:disable Metrics/ClassLength
         extend Deprecation
+
         # @param [Array<Cocina::Models::Title,Cocina::Models::DescriptiveValue>] titles the titles to consider
         # @param [Array<Cocina::Models::FolioCatalogLink>] catalog_links the folio catalog links to check for digital serials part labels
         # @param [Symbol] strategy ":first" is the strategy for selection when primary or display

data/lib/cocina/models/checkable.rb

@@ -5,23 +5,23 @@ module Cocina
     # A common interface for interrogating a model instance's type
     module Checkable
       def admin_policy?
-        (self.class::TYPES & AdminPolicy::TYPES).any?
+        self.class::TYPES.intersect?(AdminPolicy::TYPES)
       end
 
       def collection?
-        (self.class::TYPES & Collection::TYPES).any?
+        self.class::TYPES.intersect?(Collection::TYPES)
       end
 
       def dro?
-        (self.class::TYPES & DRO::TYPES).any?
+        self.class::TYPES.intersect?(DRO::TYPES)
       end
 
       def file?
-        (self.class::TYPES & File::TYPES).any?
+        self.class::TYPES.intersect?(File::TYPES)
       end
 
       def file_set?
-        (self.class::TYPES & FileSet::TYPES).any?
+        self.class::TYPES.intersect?(FileSet::TYPES)
       end
     end
   end

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

@@ -91,8 +91,8 @@ module Cocina
 
           def geographic_and_geographic_code?(subject, subject_values)
             subject.type == 'place' &&
-              subject_values.count(&:value) == 1 &&
-              subject_values.count(&:code) == 1
+              subject_values.one?(&:value) &&
+              subject_values.one?(&:code)
           end
 
           # rubocop:disable Metrics/CyclomaticComplexity

data/lib/cocina/models/validatable.rb

@@ -7,9 +7,9 @@ module Cocina
       extend ActiveSupport::Concern
 
       class_methods do
-        def new(attributes = default_attributes, safe = false, validate = true, &block)
+        def new(attributes = default_attributes, safe = false, validate = true, &)
           Validators::Validator.validate(self, attributes) if validate
-          super(attributes, safe, &block)
+          super(attributes, safe, &)
         end
       end
 

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

@@ -61,13 +61,13 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end
 
         def collection?
-          (clazz::TYPES & Collection::TYPES).any?
+          clazz::TYPES.intersect?(Collection::TYPES)
         rescue NameError
           false
         end

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

@@ -33,7 +33,7 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end

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

@@ -62,22 +62,30 @@ module Cocina
         end
 
         def validate_values_for_multiples(hash, path)
-          return unless hash.count { |key, value| %i[value groupedValue structuredValue parallelValue].include?(key) && value.present? } > 1
+          return unless hash.count { |key, value| %w[value groupedValue structuredValue parallelValue].include?(key) && value.present? } > 1
 
           error_paths_multiple << path_to_s(path)
         end
 
         def validate_title_type(hash, path)
           # only apply to title.structuredValue, title.parallelValue.structuredValue, or relatedResource.title with a value
-          return unless hash[:value] && (path.first == :title || related_resource_title?(path)) && path.include?(:structuredValue)
+          return unless hash[:value] && (structured_value_title?(path) || related_resource_title?(path))
 
           # if there is a "value" key, make sure there is also a "type" key, only for title.structuredValue
           error_paths_missing_title_type << path_to_s(path) unless hash[:type]
         end
 
         def related_resource_title?(path)
-          # title is directly within relatedResource, e.g [:relatedResource, 0, :title, 0, :structuredValue, 0])
-          path.first == :relatedResource && path[2] == :title
+          # title is within relatedResource, e.g ["relatedResource", 0, "title", 0, "structuredValue", 0])
+          structured_value_path = path[4] == 'structuredValue' || (path[4] == 'parallelValue' && path[6] == 'structuredValue')
+          path.first == 'relatedResource' && path[2] == 'title' && structured_value_path
+        end
+
+        def structured_value_title?(path)
+          # title path includes a structuredValue directly or within a parallelValue
+          # e.g. ["title", 0, "structuredValue", 0] or ["title", 0, "parallelValue", 0, "structuredValue", 0])
+          structured_value_path = path[2] == 'structuredValue' || (path[2] == 'parallelValue' && path[4] == 'structuredValue')
+          path.first == 'title' && structured_value_path
         end
 
         def path_to_s(path)

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

@@ -32,7 +32,7 @@ module Cocina
         end
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any?
+          clazz::TYPES.intersect?(DRO::TYPES)
         rescue NameError
           false
         end

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

@@ -28,7 +28,7 @@ module Cocina
         attr_reader :clazz, :attributes
 
         def dro?
-          (clazz::TYPES & DRO::TYPES).any? && attributes[:externalIdentifier].present?
+          clazz::TYPES.intersect?(DRO::TYPES) && attributes[:externalIdentifier].present?
         rescue NameError
           false
         end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.106.0'
+    VERSION = '0.107.0'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -80,8 +80,8 @@ module Cocina
 
       REQUEST_ADMIN_POLICY_DEFAULTS = ADMIN_POLICY_DEFAULTS.except(:id)
 
-      def self.build_dro_properties(id:, **kwargs)
-        build_request_dro_properties(**kwargs)
+      def self.build_dro_properties(id:, **)
+        build_request_dro_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
@@ -134,8 +134,8 @@ module Cocina
         Cocina::Models.build_request(build_request_dro_properties(**REQUEST_DRO_DEFAULTS.merge(attributes)))
       end
 
-      def self.build_collection_properties(id:, **kwargs)
-        build_request_collection_properties(**kwargs)
+      def self.build_collection_properties(id:, **)
+        build_request_collection_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"
@@ -194,8 +194,8 @@ module Cocina
         Cocina::Models.build_request(build_request_admin_policy_properties(**REQUEST_ADMIN_POLICY_DEFAULTS.merge(attributes)))
       end
 
-      def self.build_admin_policy_properties(id:, **kwargs)
-        build_request_admin_policy_properties(**kwargs)
+      def self.build_admin_policy_properties(id:, **)
+        build_request_admin_policy_properties(**)
           .merge(externalIdentifier: id)
           .tap do |props|
           props[:description][:purl] = "https://purl.stanford.edu/#{id.delete_prefix('druid:')}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.106.0
+  version: 0.107.0
 platform: ruby
 authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -528,14 +528,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Data models for the SDR
 test_files: []