cocina-models 0.99.0 → 0.99.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +1 -1
  3. data/.rubocop.yml +21 -0
  4. data/Gemfile.lock +48 -42
  5. data/cocina-models.gemspec +1 -0
  6. data/lib/cocina/models/mapping/from_mods/name_builder.rb +2 -4
  7. data/lib/cocina/models/mapping/from_mods/note.rb +3 -3
  8. data/lib/cocina/models/version.rb +1 -1
  9. data/lib/cocina/rspec/factories.rb +2 -1
  10. metadata +17 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 763a8aa5a80317a106b9c038a61886460e88b6e8e160304f9250b0e5a56bdf1b
4
- data.tar.gz: 5c73044a3a7859474e45edce5575445d6fcd2f23f362dafac3b2f417dd8ac5ec
3
+ metadata.gz: 359f5d4b2c40c778c96778e6595b629d62713b78ea933da12227cf6ece72d9c1
4
+ data.tar.gz: 8492b6d7101cae1c53c4854fa390f7a1d3812a87328b364f0ebb9466edb12d4b
5
5
  SHA512:
6
- metadata.gz: 584c7fe2ff82aee2afd09ca4873664c8d315410a02fa7f6248bc2e6b59fdf5d8eda869737c2788e910fc294c869e908762afc1467d730f0a938f120f519bc787
7
- data.tar.gz: 9efc6b6dfe0141c1de7915e70299ba7ac6586364094dcb5b0c69643486cef911d38725eb89dfa0e38abba10410b15e609449344f19e5c425b1b789faa191e5e3
6
+ metadata.gz: 424c7c15cb8ecd2e0831ce12c0fadf7bc40e99603213ff337fbd35a14252f58f33a248e1954eed55a1be253ee77be9f411517cb89537b9edc19c4d00941e0639
7
+ data.tar.gz: d7a01272dfad0e8dc7660af2db1ac9e50c784d91d870a0af5c71c0a02463dd7b4bc49b406e8f79725e1fe5294c6887b8a711dae5f00b233d58fc3f6c0dc61fe3
data/.circleci/config.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  version: 2.1
2
2
  orbs:
3
- ruby-rails: sul-dlss/ruby-rails@4.2.2
3
+ ruby-rails: sul-dlss/ruby-rails@4.2.3
4
4
  workflows:
5
5
  build:
6
6
  jobs:
data/.rubocop.yml CHANGED
@@ -511,3 +511,24 @@ RSpec/ExpectInLet: # new in 2.30
511
511
  Enabled: true
512
512
  RSpec/UndescriptiveLiteralsDescription: # new in 2.29
513
513
  Enabled: true
514
+
515
+ Gemspec/AddRuntimeDependency: # new in 1.65
516
+ Enabled: true
517
+ Lint/DuplicateSetElement: # new in 1.67
518
+ Enabled: true
519
+ Lint/UnescapedBracketInRegexp: # new in 1.68
520
+ Enabled: true
521
+ Lint/UselessNumericOperation: # new in 1.66
522
+ Enabled: true
523
+ Style/AmbiguousEndlessMethodDefinition: # new in 1.68
524
+ Enabled: true
525
+ Style/BitwisePredicate: # new in 1.68
526
+ Enabled: true
527
+ Style/CombinableDefined: # new in 1.68
528
+ Enabled: true
529
+ Style/KeywordArgumentsMerging: # new in 1.68
530
+ Enabled: false
531
+ Style/RedundantInterpolationUnfreeze: # new in 1.66
532
+ Enabled: true
533
+ Style/SafeNavigationChainLength: # new in 1.68
534
+ Enabled: false
data/Gemfile.lock CHANGED
@@ -1,8 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cocina-models (0.99.0)
4
+ cocina-models (0.99.2)
5
5
  activesupport
6
+ commonmarker (= 2.0.1)
6
7
  deprecation
7
8
  dry-struct (~> 1.0)
8
9
  dry-types (~> 1.1)
@@ -20,36 +21,41 @@ PATH
20
21
  GEM
21
22
  remote: https://rubygems.org/
22
23
  specs:
23
- activesupport (7.1.3.4)
24
+ activesupport (8.0.1)
24
25
  base64
26
+ benchmark (>= 0.3)
25
27
  bigdecimal
26
- concurrent-ruby (~> 1.0, >= 1.0.2)
28
+ concurrent-ruby (~> 1.0, >= 1.3.1)
27
29
  connection_pool (>= 2.2.5)
28
30
  drb
29
31
  i18n (>= 1.6, < 2)
32
+ logger (>= 1.4.2)
30
33
  minitest (>= 5.1)
31
- mutex_m
32
- tzinfo (~> 2.0)
34
+ securerandom (>= 0.3)
35
+ tzinfo (~> 2.0, >= 2.0.5)
36
+ uri (>= 0.13.1)
33
37
  ast (2.4.2)
34
38
  attr_extras (7.1.0)
35
39
  base64 (0.2.0)
36
- bigdecimal (3.1.8)
40
+ benchmark (0.4.0)
41
+ bigdecimal (3.1.9)
37
42
  byebug (11.1.3)
38
43
  committee (5.0.0)
39
44
  json_schema (~> 0.14, >= 0.14.3)
40
45
  openapi_parser (~> 1.0)
41
46
  rack (>= 1.5)
42
- commonmarker (1.1.4)
47
+ commonmarker (2.0.1)
43
48
  rb_sys (~> 0.9)
44
- concurrent-ruby (1.3.3)
49
+ concurrent-ruby (1.3.4)
45
50
  connection_pool (2.4.1)
46
51
  deprecation (1.1.0)
47
52
  activesupport
48
53
  diff-lcs (1.5.1)
49
54
  docile (1.4.1)
50
55
  drb (2.2.1)
51
- dry-core (1.0.1)
56
+ dry-core (1.0.2)
52
57
  concurrent-ruby (~> 1.0)
58
+ logger
53
59
  zeitwerk (~> 2.6)
54
60
  dry-inflector (1.1.0)
55
61
  dry-logic (1.5.0)
@@ -68,70 +74,67 @@ GEM
68
74
  dry-inflector (~> 1.0)
69
75
  dry-logic (~> 1.4)
70
76
  zeitwerk (~> 2.6)
71
- edtf (3.1.1)
72
- activesupport (>= 3.0, < 8.0)
77
+ edtf (3.2.0)
78
+ activesupport (>= 3.0, < 9.0)
73
79
  equivalent-xml (0.6.0)
74
80
  nokogiri (>= 1.4.3)
75
- i18n (1.14.5)
81
+ i18n (1.14.6)
76
82
  concurrent-ruby (~> 1.0)
77
83
  ice_nine (0.11.2)
78
- json (2.7.2)
84
+ json (2.9.1)
79
85
  json_schema (0.21.0)
80
86
  jsonpath (1.1.5)
81
87
  multi_json
82
88
  language_server-protocol (3.17.0.3)
83
- mini_portile2 (2.8.7)
84
- minitest (5.24.1)
89
+ logger (1.6.4)
90
+ mini_portile2 (2.8.8)
91
+ minitest (5.25.4)
85
92
  multi_json (1.15.0)
86
- mutex_m (0.2.0)
87
- nokogiri (1.16.7)
93
+ nokogiri (1.18.1)
88
94
  mini_portile2 (~> 2.8.2)
89
95
  racc (~> 1.4)
90
96
  openapi3_parser (0.10.0)
91
97
  commonmarker (>= 1.0)
92
98
  openapi_parser (1.0.0)
93
- optimist (3.1.0)
94
- parallel (1.25.1)
95
- parser (3.3.4.0)
99
+ optimist (3.2.0)
100
+ parallel (1.26.3)
101
+ parser (3.3.6.0)
96
102
  ast (~> 2.4.1)
97
103
  racc
98
104
  patience_diff (1.2.0)
99
105
  optimist (~> 3.0)
100
- racc (1.8.0)
101
- rack (3.1.7)
106
+ racc (1.8.1)
107
+ rack (3.1.8)
102
108
  rainbow (3.1.1)
103
109
  rake (13.2.1)
104
- rb_sys (0.9.99)
105
- regexp_parser (2.9.2)
106
- rexml (3.3.2)
107
- strscan
110
+ rb_sys (0.9.105)
111
+ regexp_parser (2.10.0)
108
112
  rspec (3.13.0)
109
113
  rspec-core (~> 3.13.0)
110
114
  rspec-expectations (~> 3.13.0)
111
115
  rspec-mocks (~> 3.13.0)
112
- rspec-core (3.13.0)
116
+ rspec-core (3.13.2)
113
117
  rspec-support (~> 3.13.0)
114
- rspec-expectations (3.13.1)
118
+ rspec-expectations (3.13.3)
115
119
  diff-lcs (>= 1.2.0, < 2.0)
116
120
  rspec-support (~> 3.13.0)
117
- rspec-mocks (3.13.1)
121
+ rspec-mocks (3.13.2)
118
122
  diff-lcs (>= 1.2.0, < 2.0)
119
123
  rspec-support (~> 3.13.0)
120
- rspec-support (3.13.1)
124
+ rspec-support (3.13.2)
121
125
  rspec_junit_formatter (0.6.0)
122
126
  rspec-core (>= 2, < 4, != 2.12.0)
123
- rubocop (1.65.0)
127
+ rubocop (1.69.2)
124
128
  json (~> 2.3)
125
129
  language_server-protocol (>= 3.17.0)
126
130
  parallel (~> 1.10)
127
131
  parser (>= 3.3.0.2)
128
132
  rainbow (>= 2.2.2, < 4.0)
129
- regexp_parser (>= 2.4, < 3.0)
130
- rexml (>= 3.2.5, < 4.0)
131
- rubocop-ast (>= 1.31.1, < 2.0)
133
+ regexp_parser (>= 2.9.3, < 3.0)
134
+ rubocop-ast (>= 1.36.2, < 2.0)
132
135
  ruby-progressbar (~> 1.7)
133
- unicode-display_width (>= 2.4.0, < 3.0)
134
- rubocop-ast (1.31.3)
136
+ unicode-display_width (>= 2.4.0, < 4.0)
137
+ rubocop-ast (1.37.0)
135
138
  parser (>= 3.3.1.0)
136
139
  rubocop-capybara (2.21.0)
137
140
  rubocop (~> 1.41)
@@ -147,22 +150,25 @@ GEM
147
150
  rubocop-rspec_rails (2.29.1)
148
151
  rubocop (~> 1.61)
149
152
  ruby-progressbar (1.13.0)
153
+ securerandom (0.4.1)
150
154
  simplecov (0.22.0)
151
155
  docile (~> 1.1)
152
156
  simplecov-html (~> 0.11)
153
157
  simplecov_json_formatter (~> 0.1)
154
- simplecov-html (0.12.3)
158
+ simplecov-html (0.13.1)
155
159
  simplecov_json_formatter (0.1.4)
156
- strscan (3.1.0)
157
- super_diff (0.12.1)
160
+ super_diff (0.14.0)
158
161
  attr_extras (>= 6.2.4)
159
162
  diff-lcs
160
163
  patience_diff
161
- thor (1.3.1)
164
+ thor (1.3.2)
162
165
  tzinfo (2.0.6)
163
166
  concurrent-ruby (~> 1.0)
164
- unicode-display_width (2.5.0)
165
- zeitwerk (2.6.16)
167
+ unicode-display_width (3.1.3)
168
+ unicode-emoji (~> 4.0, >= 4.0.4)
169
+ unicode-emoji (4.0.4)
170
+ uri (1.0.2)
171
+ zeitwerk (2.7.1)
166
172
 
167
173
  PLATFORMS
168
174
  ruby
data/cocina-models.gemspec CHANGED
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.required_ruby_version = '>= 3.0'
26
26
 
27
27
  spec.add_dependency 'activesupport'
28
+ spec.add_dependency 'commonmarker', '2.0.1' # There is a breaking change in 2.0.2 with openapi3_parser
28
29
  spec.add_dependency 'deprecation'
29
30
  spec.add_dependency 'dry-struct', '~> 1.0'
30
31
  spec.add_dependency 'dry-types', '~> 1.1'
data/lib/cocina/models/mapping/from_mods/name_builder.rb CHANGED
@@ -290,10 +290,8 @@ module Cocina
290
290
  end
291
291
 
292
292
  def build_affiliation_notes(name_node)
293
- [].tap do |parts|
294
- name_node.xpath('mods:affiliation', mods: Description::DESC_METADATA_NS).each do |affiliation_node|
295
- parts << { value: affiliation_node.text, type: 'affiliation' }
296
- end
293
+ name_node.xpath('mods:affiliation', mods: Description::DESC_METADATA_NS).map do |affiliation_node|
294
+ { value: affiliation_node.text, type: 'affiliation' }
297
295
  end
298
296
  end
299
297
 
data/lib/cocina/models/mapping/from_mods/note.rb CHANGED
@@ -32,7 +32,7 @@ module Cocina
32
32
  note_present?(node)
33
33
  end
34
34
  altrepgroup_abstract_nodes, other_abstract_nodes = AltRepGroup.split(nodes: all_abstract_nodes)
35
- other_abstract_nodes.map { |node| common_note_for(node).merge(abstract_type(node)) } + \
35
+ other_abstract_nodes.map { |node| common_note_for(node).merge(abstract_type(node)) } +
36
36
  altrepgroup_abstract_nodes.map { |parallel_nodes| parallel_abstract_for(parallel_nodes) }
37
37
  end
38
38
 
@@ -92,7 +92,7 @@ module Cocina
92
92
  note_present?(node) && node[:type] != 'contact'
93
93
  end
94
94
  altrepgroup_note_nodes, other_note_nodes = AltRepGroup.split(nodes: all_note_nodes)
95
- other_note_nodes.map { |node| common_note_for(node) } + \
95
+ other_note_nodes.map { |node| common_note_for(node) } +
96
96
  altrepgroup_note_nodes.map { |parallel_nodes| parallel_note_for(parallel_nodes) }
97
97
  end
98
98
 
@@ -123,7 +123,7 @@ module Cocina
123
123
  note_present?(node)
124
124
  end
125
125
  altrepgroup_toc_nodes, other_toc_nodes = AltRepGroup.split(nodes: all_toc_nodes)
126
- other_toc_nodes.map { |node| toc_for(node).merge({ type: 'table of contents' }) } + \
126
+ other_toc_nodes.map { |node| toc_for(node).merge({ type: 'table of contents' }) } +
127
127
  altrepgroup_toc_nodes.map { |parallel_nodes| parallel_toc_for(parallel_nodes) }
128
128
  end
129
129
 
data/lib/cocina/models/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Cocina
4
4
  module Models
5
- VERSION = '0.99.0'
5
+ VERSION = '0.99.2'
6
6
  end
7
7
  end
data/lib/cocina/rspec/factories.rb CHANGED
@@ -62,7 +62,8 @@ module Cocina
62
62
  version: 1,
63
63
  label: 'factory collection label',
64
64
  title: 'factory collection title',
65
- admin_policy_id: 'druid:hv992ry2431'
65
+ admin_policy_id: 'druid:hv992ry2431',
66
+ source_id: 'sulcollection:1234'
66
67
  }.freeze
67
68
 
68
69
  REQUEST_COLLECTION_DEFAULTS = COLLECTION_DEFAULTS.except(:id)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocina-models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.99.0
4
+ version: 0.99.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-08-02 00:00:00.000000000 Z
11
+ date: 2024-12-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: commonmarker
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - '='
32
+ - !ruby/object:Gem::Version
33
+ version: 2.0.1
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - '='
39
+ - !ruby/object:Gem::Version
40
+ version: 2.0.1
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: deprecation
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -550,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
550
564
  - !ruby/object:Gem::Version
551
565
  version: '0'
552
566
  requirements: []
553
- rubygems_version: 3.4.19
567
+ rubygems_version: 3.5.16
554
568
  signing_key:
555
569
  specification_version: 4
556
570
  summary: Data models for the SDR