cocina-models 0.100.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0adcf9839eca5b38d5ea38c28b9ee8d853e0f5cdec7b35a2c8fee57e3081fd
-  data.tar.gz: 8824e1540a5d8eb2fca36f8afbeeb340f4b134385075af10dac74408c7e35598
+  metadata.gz: 2198f8b258a6cae8fe0a3569eb5e36a400964d9ea0d05c6ec7bb19a761071e42
+  data.tar.gz: 31b0657ba52c6f143b7cbceadb585f8710ff8f8d24410101a2daa22a7ad5ce56
 SHA512:
-  metadata.gz: 96f4f445895f8be40633be3caf07455fc72ac83fdf592996c38510faef3367c3c32b529f0a3c865385522833802e5e02a608b6918ec2a05905911d436f6a0d4b
-  data.tar.gz: ef3acb51f35dea27da4f6378d625a4872a07652bb4cd1a2f4d40162adc1b6d8682d86bc4253639dff56ef66abbd4513ea6ba810fbc34b49e6a8008280c399bfc
+  metadata.gz: 532777c074a4edcd3116bc6df43bf189b554e8b10bd63531940e9bf2019262989ae925a02582b2a51dac96dcb5f275edd686728d11f28ec33a2e8d95350d095c
+  data.tar.gz: aa06744ae066e38d1f4c1cc8094c0bd39ef789008971ff51c0d0eb0315333cf65117a1f539b241fd91c82313d3299b4a73bd286f1d89f9f0b388b98f31aaa829

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.5.0
+  ruby-rails: sul-dlss/ruby-rails@4.6.0
 workflows:
   build:
     jobs:
@@ -11,4 +11,3 @@ workflows:
       - ruby-rails/test-gem:
           name: test
           context: dlss
-          use-codecov: true

data/.rubocop.yml

@@ -1,9 +1,9 @@
 # This is the configuration used to check the rubocop source code.
 
 inherit_from: .rubocop_todo.yml
-require:
-  - rubocop-rspec
+plugins:
   - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   TargetRubyVersion: 3.0
@@ -301,10 +301,6 @@ RSpec/IdenticalEqualityAssertion: # new in 2.4
   Enabled: true
 RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
-FactoryBot/SyntaxMethods: # new in 2.7
-  Enabled: true
-RSpecRails/AvoidSetupHook: # new in 2.4
-  Enabled: true
 Style/NestedFileDirname: # new in 1.26
   Enabled: true
 
@@ -341,17 +337,10 @@ Style/MapCompactWithConditionalBlock: # new in 1.30
   Enabled: true
 RSpec/ChangeByZero: # new in 2.11.0
   Enabled: true
-Capybara/SpecificMatcher: # new in 2.12
-  Enabled: false
-RSpecRails/HaveHttpStatus: # new in 2.12
-  Enabled: false
-
 RSpec/ClassCheck: # new in 2.13
   Enabled: true
 RSpec/NoExpectationExample: # new in 2.13
   Enabled: true
-Capybara/SpecificFinders: # new in 2.13
-  Enabled: true
 Gemspec/DevelopmentDependencies: # new in 1.44
   Enabled: true
 Lint/DuplicateMagicComment: # new in 1.37
@@ -378,29 +367,14 @@ Style/RedundantEach: # new in 1.38
   Enabled: true
 Style/RedundantStringEscape: # new in 1.37
   Enabled: true
-Capybara/MatchStyle: # new in <<next>>
-  Enabled: true
-Capybara/NegationMatcher: # new in 2.14
-  Enabled: true
-Capybara/SpecificActions: # new in 2.14
-  Enabled: true
 RSpec/DuplicatedMetadata: # new in 2.16
   Enabled: true
 RSpec/PendingWithoutReason: # new in 2.16
   Enabled: true
 RSpec/SortMetadata: # new in 2.14
   Enabled: true
-FactoryBot/ConsistentParenthesesStyle: # new in 2.14
-  Enabled: true
-FactoryBot/FactoryNameStyle: # new in 2.16
-  Enabled: true
-RSpecRails/InferredSpecType: # new in 2.14
-  Enabled: true
-RSpecRails/MinitestAssertions: # new in 2.17
-  Enabled: true
 Style/RedundantHeredocDelimiterQuotes: # new in 1.45
   Enabled: true
-
 Metrics/CollectionLiteralLength: # new in 1.47
   Enabled: true
 Style/DirEmpty: # new in 1.48
@@ -411,9 +385,6 @@ RSpec/RedundantAround: # new in 2.19
   Enabled: true
 RSpec/SkipBlockInsideExample: # new in 2.19
   Enabled: true
-RSpecRails/TravelAround: # new in 2.19
-  Enabled: true
-
 Lint/DuplicateMatchPattern: # new in 1.50
   Enabled: true
 Style/DataInheritance: # new in 1.49
@@ -428,12 +399,6 @@ Style/RedundantLineContinuation: # new in 1.49
   Enabled: true
 Style/RedundantRegexpConstructor: # new in 1.52
   Enabled: true
-FactoryBot/AssociationStyle: # new in 2.23
-  Enabled: true
-FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
-  Enabled: true
-FactoryBot/RedundantFactoryOption: # new in 2.23
-  Enabled: true
 RSpec/BeEmpty: # new in 2.20
   Enabled: true
 RSpec/ContainExactly: # new in 2.19
@@ -457,9 +422,6 @@ Style/YAMLFileRead: # new in 1.53
   Enabled: true
 RSpec/ReceiveMessages: # new in 2.23
   Enabled: true
-RSpecRails/NegationBeValid: # new in 2.23
-  Enabled: true
-
 Lint/ItWithoutArgumentsInBlock: # new in 1.59
   Enabled: true
 Lint/LiteralAssignmentInCondition: # new in 1.58
@@ -468,18 +430,6 @@ Style/SingleLineDoEndBlock: # new in 1.57
   Enabled: true
 Style/SuperWithArgsParentheses: # new in 1.58
   Enabled: true
-Capybara/ClickLinkOrButtonStyle: # new in 2.19
-  Enabled: true
-Capybara/RedundantWithinFind: # new in 2.20
-  Enabled: true
-Capybara/RSpec/HaveSelector: # new in 2.19
-  Enabled: true
-Capybara/RSpec/PredicateMatcher: # new in 2.19
-  Enabled: true
-FactoryBot/ExcessiveCreateList: # new in 2.25
-  Enabled: true
-FactoryBot/IdSequence: # new in 2.24
-  Enabled: true
 RSpec/EmptyMetadata: # new in 2.24
   Enabled: true
 RSpec/Eq: # new in 2.24
@@ -498,7 +448,6 @@ RSpec/IsExpectedSpecify: # new in 2.27
   Enabled: true
 RSpec/RepeatedSubjectCall: # new in 2.27
   Enabled: true
-
 Style/MapIntoArray: # new in 1.63
   Enabled: true
 Style/SendWithLiteralMethodName: # new in 1.64
@@ -511,7 +460,6 @@ 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
@@ -532,3 +480,35 @@ Style/RedundantInterpolationUnfreeze: # new in 1.66
   Enabled: true
 Style/SafeNavigationChainLength: # new in 1.68
   Enabled: false
+Lint/ArrayLiteralInRegexp: # new in 1.71
+  Enabled: true
+Lint/ConstantReassignment: # new in 1.70
+  Enabled: true
+Lint/CopDirectiveSyntax: # new in 1.72
+  Enabled: true
+Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
+  Enabled: true
+Lint/NumericOperationWithConstantResult: # new in 1.69
+  Enabled: true
+Lint/RedundantTypeConversion: # new in 1.72
+  Enabled: true
+Lint/SharedMutableDefault: # new in 1.70
+  Enabled: true
+Lint/SuppressedExceptionInNumberConversion: # new in 1.72
+  Enabled: true
+Lint/UselessConstantScoping: # new in 1.72
+  Enabled: true
+Lint/UselessDefined: # new in 1.69
+  Enabled: true
+Style/DigChain: # new in 1.69
+  Enabled: true
+Style/FileNull: # new in 1.69
+  Enabled: true
+Style/FileTouch: # new in 1.69
+  Enabled: true
+Style/HashSlice: # new in 1.71
+  Enabled: true
+Style/ItAssignment: # new in 1.70
+  Enabled: true
+Style/RedundantFormat: # new in 1.72
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.100.0)
+    cocina-models (0.101.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -32,12 +32,12 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    ast (2.4.2)
+    ast (2.4.3)
     attr_extras (7.1.0)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    byebug (11.1.3)
+    byebug (12.0.0)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
@@ -46,7 +46,7 @@ GEM
     connection_pool (2.5.0)
     deprecation (1.1.0)
       activesupport
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.1)
     docile (1.4.1)
     drb (2.2.1)
     dry-core (1.1.0)
@@ -59,7 +59,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.7.1)
+    dry-struct (1.8.0)
       dry-core (~> 1.1)
       dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
@@ -78,28 +78,30 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.9.1)
+    json (2.10.2)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.4)
-    logger (1.6.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
     mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    minitest (5.25.5)
     multi_json (1.15.0)
-    nokogiri (1.18.2)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openapi_parser (1.0.0)
-    optimist (3.2.0)
+    optimist (3.2.1)
     parallel (1.26.3)
-    parser (3.3.7.1)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
+    prism (1.4.0)
     racc (1.8.1)
-    rack (3.1.9)
+    rack (3.1.13)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.10.0)
@@ -118,31 +120,26 @@ GEM
     rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.71.2)
+    rubocop (1.75.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.1)
-      rubocop (~> 1.61)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
@@ -161,8 +158,8 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
-    zeitwerk (2.7.1)
+    uri (1.0.3)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   ruby
@@ -177,8 +174,8 @@ DEPENDENCIES
   rspec_junit_formatter
   rubocop (~> 1.24)
   rubocop-rake
-  rubocop-rspec (~> 2.1)
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH
-   2.4.13
+   2.6.8

data/cocina-models.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.24'
   spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.1'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/cocina/generator/generator.rb

@@ -136,6 +136,7 @@ module Cocina
         version.rb
         vocabulary.rb
       ].freeze
+      private_constant :NO_CLEAN
 
       def clean_output
         FileUtils.mkdir_p(options[:output])

data/lib/cocina/generator/vocab.rb

@@ -49,6 +49,7 @@ module Cocina
         'ObjectType' => BASE,
         'FileSetType' => "#{BASE}resources/"
       }.freeze
+      private_constant :BASE, :URIS
 
       def vocabs
         type_properties = schemas.values.map { |schema| schema.properties&.[]('type') }.compact

data/lib/cocina/models/folio_catalog_link.rb

@@ -11,6 +11,10 @@ module Cocina
       attribute :refresh, Types::Strict::Bool.default(false)
       # Record identifier that is unique within the context of the linked record's catalog.
       attribute :catalogRecordId, MigratedFromSymphonyIdentifier | MigratedFromVoyagerIdentifier | CreatedInFolioIdentifier
+      # Label for use in display of serials via Folio record
+      attribute? :partLabel, Types::Strict::String
+      # Sorting information for use in display of serials via Folio record
+      attribute? :sortKey, Types::Strict::String
     end
   end
 end

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

@@ -178,6 +178,7 @@ module Cocina
           end
 
           XPATH_HAS_CONTENT_PREDICATE = '[string-length(normalize-space()) > 0]'
+          private_constant :XPATH_HAS_CONTENT_PREDICATE
 
           def build_copyright_notice_event(origin_info_node)
             date_nodes = origin_info_node.xpath("mods:copyrightDate#{XPATH_HAS_CONTENT_PREDICATE}",

data/lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb

@@ -56,6 +56,7 @@ module Cocina
             end
 
             LEGACY_EVENT_TYPES_2_TYPE = Cocina::Models::Mapping::FromMods::Event::LEGACY_EVENT_TYPES_2_TYPE
+            private_constant :LEGACY_EVENT_TYPES_2_TYPE
 
             # because eventType is a relatively new addition to the MODS schema, records converted from MARC to MODS prior
             #   to its introduction used displayLabel as a stopgap measure, with certain values

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

@@ -21,6 +21,7 @@ module Cocina
 
           validate_catalog('symphony')
           validate_catalog('folio')
+          validate_sort_key
         end
 
         private
@@ -36,6 +37,17 @@ module Cocina
                                  "(only one allowed) #{refresh_catalog_links}"
         end
 
+        def validate_sort_key
+          # TODO: remove this validation once we upgrade to OpenAPI 3.1 and can use dependentRequired in openapi.yml
+          serials_links = catalog_links.select { |catalog_link| catalog_link[:catalog] == 'folio' && catalog_link[:sortKey].present? }
+          serials_links.each do |catalog_link|
+            # If partLabel is present, catalog_link is valid
+            next if catalog_link[:partLabel].present?
+
+            raise ValidationError, "partLabel must also be present if a sortKey is used in catalog link #{catalog_link}"
+          end
+        end
+
         def catalog_links
           @catalog_links ||= Array(attributes.dig(:identification, :catalogLinks))
         end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.100.0'
+    VERSION = '0.101.0'
   end
 end

data/openapi.yml

@@ -1174,6 +1174,12 @@ components:
             - $ref: '#/components/schemas/MigratedFromSymphonyIdentifier'
             - $ref: '#/components/schemas/MigratedFromVoyagerIdentifier'
             - $ref: '#/components/schemas/CreatedInFolioIdentifier'
+        partLabel:
+          description: Label for use in display of serials via Folio record
+          type: string
+        sortKey:
+          description: Sorting information for use in display of serials via Folio record
+          type: string
       required:
         - catalog
         - catalogRecordId

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.100.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -280,16 +279,16 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -521,7 +520,6 @@ homepage: https://github.com/sul-dlss/cocina-models
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -536,8 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Data models for the SDR
 test_files: []