cocina-models 0.99.0 → 0.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763a8aa5a80317a106b9c038a61886460e88b6e8e160304f9250b0e5a56bdf1b
-  data.tar.gz: 5c73044a3a7859474e45edce5575445d6fcd2f23f362dafac3b2f417dd8ac5ec
+  metadata.gz: 359f5d4b2c40c778c96778e6595b629d62713b78ea933da12227cf6ece72d9c1
+  data.tar.gz: 8492b6d7101cae1c53c4854fa390f7a1d3812a87328b364f0ebb9466edb12d4b
 SHA512:
-  metadata.gz: 584c7fe2ff82aee2afd09ca4873664c8d315410a02fa7f6248bc2e6b59fdf5d8eda869737c2788e910fc294c869e908762afc1467d730f0a938f120f519bc787
-  data.tar.gz: 9efc6b6dfe0141c1de7915e70299ba7ac6586364094dcb5b0c69643486cef911d38725eb89dfa0e38abba10410b15e609449344f19e5c425b1b789faa191e5e3
+  metadata.gz: 424c7c15cb8ecd2e0831ce12c0fadf7bc40e99603213ff337fbd35a14252f58f33a248e1954eed55a1be253ee77be9f411517cb89537b9edc19c4d00941e0639
+  data.tar.gz: d7a01272dfad0e8dc7660af2db1ac9e50c784d91d870a0af5c71c0a02463dd7b4bc49b406e8f79725e1fe5294c6887b8a711dae5f00b233d58fc3f6c0dc61fe3

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.2.2
+  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,8 +1,9 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.99.0)
+    cocina-models (0.99.2)
       activesupport
+      commonmarker (= 2.0.1)
       deprecation
       dry-struct (~> 1.0)
       dry-types (~> 1.1)
@@ -20,36 +21,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (8.0.1)
       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)
+      uri (>= 0.13.1)
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     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 (2.0.1)
       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.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.1.0)
     dry-logic (1.5.0)
@@ -68,70 +74,67 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    edtf (3.1.1)
-      activesupport (>= 3.0, < 8.0)
+    edtf (3.2.0)
+      activesupport (>= 3.0, < 9.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.9.1)
     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.1)
+    logger (1.6.4)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     multi_json (1.15.0)
-    mutex_m (0.2.0)
-    nokogiri (1.16.7)
+    nokogiri (1.18.1)
       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.4.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.7)
+    racc (1.8.1)
+    rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb_sys (0.9.99)
-    regexp_parser (2.9.2)
-    rexml (3.3.2)
-      strscan
+    rb_sys (0.9.105)
+    regexp_parser (2.10.0)
     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-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.65.0)
+    rubocop (1.69.2)
       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 (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -147,22 +150,25 @@ GEM
     rubocop-rspec_rails (2.29.1)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     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 (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   ruby

data/cocina-models.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'commonmarker', '2.0.1' # There is a breaking change in 2.0.2 with openapi3_parser
   spec.add_dependency 'deprecation'
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'

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/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.99.0'
+    VERSION = '0.99.2'
   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.99.0
+  version: 0.99.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commonmarker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -550,7 +564,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