cocina-models 0.118.1 → 0.120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980d1887539c11b65c897fc0f48a6d5529b8bb9e23821f9f87ac677623c7a05a
-  data.tar.gz: 58b30197236ad99946ec8598fd84b03e8e8ea804a9625483ef4d678d93972dd9
+  metadata.gz: 36dff333c23753eed79b03fd9f4442339d677ba28baaf396408049bedd4ffc69
+  data.tar.gz: 3235a1280a037df4570e19de4f98f86577f6e048c7bb5b00d3c7f6a69dc2b377
 SHA512:
-  metadata.gz: 8e599c4ce9337e1ef65ece3c33522f3efa88ee986b048d628889e329aaee752616208eb4e048193f2a5173fa506b9c8170b9032129418d9434f32e60f7c625d4
-  data.tar.gz: 07ab88971c0c7a3d2810d9db68c3423755c421d96d7d778339350a64348a2d39a7c021719639fad4a05fdb14b08e4a5313953c3b62865521b7249b2b0a63059b
+  metadata.gz: 79466fddfa3fe42db002704a4d8f1e62e282e85dfe593aa7a6e58aea0449a247304d7b96596b15809f5a7f5ced5d0308160afee3efc95f3ec9051354e02e8eb2
+  data.tar.gz: b22313bbb8cea20829173cbf8569b5402472a7e01354a5e2790290771ecbb59e20eca361a94307b15fd2674f04ecfe62d7b57304eda8fb514bc0af7b35d9e832

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.8.0
+  ruby-rails: sul-dlss/ruby-rails@4.10.0
 workflows:
   build:
     jobs:

data/.rubocop.yml

@@ -14,11 +14,12 @@ Layout/BeginEndAlignment: # (new in 0.91)
   Enabled: true
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
 Layout/LineLength:
   Exclude:
     - lib/cocina/models/*
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
+    - spec/**/*
 
 # This cop throws an error in 1.37.1
 Layout/SpaceInsideHashLiteralBraces:
@@ -80,35 +81,35 @@ Metrics/BlockLength:
     - cocina-models.gemspec
     - spec/cocina/**/*
     - lib/cocina/rspec/matchers.rb
-    - 'spec/support/mods_mapping_spec_helper.rb'
+    - "spec/support/mods_mapping_spec_helper.rb"
 
 # Offense count: 16
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 100
   Exclude:
-    - 'lib/cocina/rspec/factories.rb'
+    - "lib/cocina/rspec/factories.rb"
 
 Metrics/MethodLength:
   Max: 14
   Exclude:
-    - 'spec/cocina/models/file_access_spec.rb'
-    - 'spec/cocina/models/dro_access_spec.rb'
-    - 'lib/cocina/rspec/factories.rb'
-    - 'lib/cocina/models/mapping/to_mods/*'
-    - 'lib/cocina/models/mapping/from_mods/*'
-    - 'lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
+    - "spec/cocina/models/file_access_spec.rb"
+    - "spec/cocina/models/dro_access_spec.rb"
+    - "lib/cocina/rspec/factories.rb"
+    - "lib/cocina/models/mapping/to_mods/*"
+    - "lib/cocina/models/mapping/from_mods/*"
+    - "lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb"
+    - "lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb"
+    - "lib/cocina/models/mapping/normalizers/mods_normalizer.rb"
 
 # Offense count: 37
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   # Max: 20
   Exclude:
-    - 'lib/cocina/models/mapping/from_mods/*'
-    - 'lib/cocina/models/mapping/to_mods/*'
-    - 'lib/cocina/models/mapping/normalizers/**/*'
+    - "lib/cocina/models/mapping/from_mods/*"
+    - "lib/cocina/models/mapping/to_mods/*"
+    - "lib/cocina/models/mapping/normalizers/**/*"
 
 Naming/PredicatePrefix:
   ForbiddenPrefixes:
@@ -125,6 +126,12 @@ RSpec/BeEq: # new in 2.9.0
 RSpec/BeNil: # new in 2.9.0
   Enabled: true
 
+RSpec/DiscardedMatcher: # new in 3.10
+  Enabled: true
+
+RSpec/MatchWithSimpleRegex: # new in 3.10
+  Enabled: true
+
 RSpec/MultipleExpectations:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,27 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2023-11-01 19:51:40 UTC using RuboCop version 1.57.2.
+# on 2026-06-02 13:55:43 UTC using RuboCop version 1.87.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
-# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, AllowedGems.
 # SupportedStyles: Gemfile, gems.rb, gemspec
-# Include: **/*.gemspec, **/Gemfile, **/gems.rb
 Gemspec/DevelopmentDependencies:
   Exclude:
     - 'cocina-models.gemspec'
 
-# Offense count: 1
-Lint/NoReturnInBeginEndBlocks:
-  Exclude:
-    - 'lib/cocina/models/mapping/to_mods/description.rb'
+# Offense count: 55
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 159
 
-# Offense count: 13
+# Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/cocina/models/mapping/from_mods/admin_metadata.rb'
@@ -34,17 +36,27 @@ Lint/UnusedMethodArgument:
     - 'lib/cocina/models/mapping/from_mods/language.rb'
     - 'lib/cocina/models/mapping/from_mods/note.rb'
     - 'lib/cocina/models/mapping/from_mods/subject.rb'
-    - 'lib/cocina/models/mapping/to_mods/event.rb'
 
-# Offense count: 98
+# Offense count: 62
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 40
+  Max: 48
 
-# Offense count: 43
-# Configuration parameters: AllowedMethods, AllowedPatterns.
+# Offense count: 27
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
-  Max: 12
+  Exclude:
+    - 'lib/cocina/generator/generator.rb'
+    - 'lib/cocina/models/builders/title_builder.rb'
+    - 'lib/cocina/models/mapping/from_mods/event.rb'
+    - 'lib/cocina/models/mapping/from_mods/form.rb'
+    - 'lib/cocina/models/mapping/from_mods/identifier_type.rb'
+    - 'lib/cocina/models/mapping/from_mods/language_term.rb'
+    - 'lib/cocina/models/mapping/from_mods/name_builder.rb'
+    - 'lib/cocina/models/mapping/from_mods/subject.rb'
+    - 'lib/cocina/models/mapping/from_mods/title.rb'
+    - 'lib/cocina/models/mapping/from_mods/title_builder.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
 
 # Offense count: 1
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
@@ -52,12 +64,12 @@ Metrics/ParameterLists:
   Exclude:
     - 'lib/cocina/generator/schema_base.rb'
 
-# Offense count: 41
+# Offense count: 32
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 224
+# Offense count: 95
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 103
@@ -78,23 +90,9 @@ RSpec/PendingWithoutReason:
     - 'spec/cocina/models/mapping/descriptive/mods/title_info_spec.rb'
     - 'spec/cocina/models/mapping/descriptive/mods/type_of_resource_spec.rb'
 
-# Offense count: 1
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
-    - 'lib/cocina/models/validators/open_api_validator.rb'
-
-# Offense count: 9
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/cocina/models/mapping/to_mods/access.rb'
-    - 'lib/cocina/models/mapping/to_mods/contributor.rb'
-    - 'lib/cocina/models/mapping/to_mods/form.rb'
-    - 'lib/cocina/models/mapping/to_mods/subject.rb'
-
-# Offense count: 249
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 267
+    - 'lib/cocina/models/mapping/from_mods/name_builder.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.118.1)
+    cocina-models (0.120.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -9,8 +9,7 @@ PATH
       edtf
       equivalent-xml
       i18n
-      json_schemer (~> 2.0)
-      jsonpath
+      jsonschema_rs
       nokogiri
       super_diff
       thor
@@ -74,7 +73,6 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erb (6.0.4)
-    hana (1.3.7)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -84,21 +82,17 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.5)
-    json_schemer (2.5.0)
-      bigdecimal
-      hana (~> 1.3)
-      regexp_parser (~> 2.0)
-      simpleidn (~> 0.2)
-    jsonpath (1.1.5)
-      multi_json
+    json (2.19.8)
+    jsonschema_rs (0.46.5-arm64-darwin)
+      bigdecimal (>= 3.1, < 5)
+    jsonschema_rs (0.46.5-x86_64-linux)
+      bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    multi_json (1.21.1)
     nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.19.3-x86_64-linux-gnu)
@@ -114,7 +108,7 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
-    psych (5.3.1)
+    psych (5.4.0)
       date
       stringio
     racc (1.8.1)
@@ -142,7 +136,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.86.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -159,9 +153,10 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.9.0)
+    rubocop-rspec (3.10.2)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      regexp_parser (>= 2.0)
+      rubocop (~> 1.86, >= 1.86.2)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
@@ -170,7 +165,6 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    simpleidn (0.2.3)
     stringio (3.2.0)
     super_diff (0.19.0)
       attr_extras (>= 6.2.4, < 8)
@@ -209,8 +203,8 @@ CHECKSUMS
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  bundler (4.0.12) sha256=7f8b757d28dfb636e7b24fba2344ac6dd13b5b24f4b46d62573d483f211825ac
-  cocina-models (0.118.1)
+  bundler (4.0.13) sha256=19f08be7f27022cf0b89f27da0b044ae075e8270a9ef44ad248a932614e1ca3b
+  cocina-models (0.120.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -227,19 +221,17 @@ CHECKSUMS
   edtf (3.2.0) sha256=a15a0ee274e49c8047a3ebb5d61d793ba44f7f8ffbf0595392c467e3ea8d2447
   equivalent-xml (0.6.0) sha256=8919761efa848ad0846369ff8be1f646b17e5061698c4867b09829000cc3f487
   erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
-  hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
-  json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
-  jsonpath (1.1.5) sha256=29f70467193a2dc93ab864ec3d3326d54267961acc623f487340eb9c34931dbe
+  json (2.19.8) sha256=6354310fd76ef69b87d5bd1f38b40d730613baf90b6803d2d0a48f618d32dfaa
+  jsonschema_rs (0.46.5-arm64-darwin) sha256=e80414ed67f0956d3e06474a2fa076fc4a7b722f00e5d7142b70289c016ac6f1
+  jsonschema_rs (0.46.5-x86_64-linux) sha256=345c65ec7a5abf8879b9c9356752f0fdf4c9926f6480458fc32803a871b5cbb3
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
-  multi_json (1.21.1) sha256=e6126a31808e3b4d19f483c775ceac34df190dffa62adfb63a165ee14ba68080
   nokogiri (1.19.3-arm64-darwin) sha256=71b9bd424b1b7abc18b05052a1a3cfd3627abdca62be280854cc411791357e42
   nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976
   optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
@@ -249,7 +241,7 @@ CHECKSUMS
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
-  psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
+  psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
@@ -262,16 +254,15 @@ CHECKSUMS
   rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
-  rubocop (1.86.2) sha256=bb2e97f635eda42c448f2588f4a6ff78f221b8bdfdf65b1e9b07fbd57521b45d
+  rubocop (1.87.0) sha256=b9d9ddf55116a513f8ef2c7ae660662d8b49301f118d3f0df61865b33a5c188d
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
-  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
+  rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
-  simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
   super_diff (0.19.0) sha256=c35fc1c0daa223d67b203fe3fb49a6cfd67850a53920319565c3c654e03ec902
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
@@ -283,4 +274,4 @@ CHECKSUMS
   zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
 
 BUNDLED WITH
-  4.0.12
+  4.0.13

data/bin/validate-data

@@ -191,6 +191,8 @@ def distribute_work(filename, workers, batch_size, total_lines) # rubocop:disabl
 
       # Update progress bar
       progressbar.increment
+
+      break if line_number >= total_lines
     end
   end
 

data/bin/validate-schema

@@ -5,4 +5,9 @@ require 'bundler/setup'
 require 'cocina/models'
 
 filepath = ARGV[0]
-exit(1) unless JSONSchemer.valid_schema?(Pathname.new(filepath))
+begin
+  JSONSchema.validator_for(JSON.parse(File.read(filepath)))
+rescue StandardError => e
+  warn e.message
+  exit(1)
+end

data/cocina-models.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'edtf' # used for date/time validation
   spec.add_dependency 'equivalent-xml' # for diffing MODS
   spec.add_dependency 'i18n' # for validating BCP 47 language tags, according to RFC 4646
-  spec.add_dependency 'jsonpath' # used for date/time validation
-  spec.add_dependency 'json_schemer', '~> 2.0'
+  spec.add_dependency 'jsonschema_rs'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'super_diff'
   spec.add_dependency 'thor'

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

@@ -227,8 +227,6 @@ module Cocina
         #
         # for punctuaion funky town, thank MARC and catalog cards
         #
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/PerceivedComplexity
         def rebuild_structured_value(cocina_title)
@@ -283,8 +281,6 @@ module Cocina
 
           result
         end
-        # rubocop:enable Metrics/AbcSize
-        # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Metrics/PerceivedComplexity
 

data/lib/cocina/models/california_historical_society_barcode.rb

@@ -4,6 +4,6 @@ module Cocina
   module Models
     # The barcode associated with a CHS DRO, prefixed with 405
     # example: 405000111956
-    CaliforniaHistoricalSocietyBarcode = Types::String.constrained(format: /^405[0-9]+$/)
+    CaliforniaHistoricalSocietyBarcode = Types::String.constrained(format: /^405[0-9]{9}$/)
   end
 end

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

@@ -435,7 +435,7 @@ module Cocina
               new_node = node.deep_dup
               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)
+              build_date(new_node, encoding: common_attribs.dig(:encoding, :code))
             end
             { structuredValue: dates }.merge(common_attribs).compact
           end
@@ -462,9 +462,11 @@ module Cocina
             attribs.compact
           end
 
-          def build_date(date_node)
+          def build_date(date_node, encoding: nil)
+            effective_encoding = date_node['encoding'] || encoding
             {}.tap do |date|
-              date[:value] = clean_date(date_node.text) if date_node.text.present?
+              raw_value = clean_date(date_node.text)
+              date[:value] = effective_encoding == 'edtf' ? pad_edtf_year(raw_value) : raw_value if date_node.text.present?
               date[:encoding] = { code: date_node['encoding'] } if date_node['encoding']
               date[:status] = 'primary' if date_node['keyDate']
               date[:note] = build_date_note(date_node)
@@ -489,6 +491,13 @@ module Cocina
             date.delete_suffix('.')
           end
 
+          # Pads a 1-3 digit year to 4 digits, handling modifiers like ~,-.
+          def pad_edtf_year(value)
+            value.sub(%r{\A(-?)(\d{1,3})(?=[~?%/-]|\z)}) do
+              "#{::Regexp.last_match(1)}#{::Regexp.last_match(2).rjust(4, '0')}"
+            end
+          end
+
           # NOTE: Do any eventType/displayLabel transformations before determining role (i.e. with LEGACY_EVENT_TYPES_2_TYPE)
           def role_for(event)
             case event[:type]

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

@@ -9,6 +9,7 @@ module Cocina
         class Form
           # NOTE: H2 is the first case of structured form (genre/typeOfResource) values we're implementing
           H2_GENRE_TYPE_PREFIX = 'H2 '
+          H2_SOURCE_LABEL = 'Stanford self-deposit resource types'
 
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder
@@ -58,7 +59,8 @@ module Cocina
 
           def build_cartographics(subject_node)
             carto_forms = []
-            subject_node.xpath('mods:cartographics[mods:scale]', mods: Description::DESC_METADATA_NS).each do |carto_node|
+            subject_node.xpath('mods:cartographics[mods:scale]',
+                               mods: Description::DESC_METADATA_NS).each do |carto_node|
               scale_nodes = carto_node.xpath('mods:scale', mods: Description::DESC_METADATA_NS).reject do |scale_node|
                 scale_node.text.blank?
               end
@@ -142,7 +144,7 @@ module Cocina
             forms << {
               type: 'resource type',
               source: {
-                value: Cocina::Models::Mapping::ToMods::Form::H2_SOURCE_LABEL
+                value: H2_SOURCE_LABEL
               },
               structuredValue: structured_genre.map do |genre|
                 {

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

@@ -7,7 +7,7 @@ module Cocina
       module FromMods
         # Maps a name
         class NameBuilder
-          UNCITED_DESCRIPTION = Cocina::Models::Mapping::ToMods::NameWriter::UNCITED_DESCRIPTION
+          UNCITED_DESCRIPTION = 'not included in citation'
           TYPE_FOR_ROLES = Cocina::Models::Mapping::FromMods::Contributor::ROLES.merge('event' => 'event').freeze
 
           # @param [Array<Nokogiri::XML::Element>] name_elements (multiple if parallel)
@@ -154,7 +154,9 @@ module Cocina
           end
 
           def build_structured_value_name(name_node, name_part_nodes)
-            vals = name_part_nodes.filter_map { |name_part_node| build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence }
+            vals = name_part_nodes.filter_map do |name_part_node|
+              build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence
+            end
             display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
             if display_form_node.present?
               cocina_contrib_name =

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

@@ -6,6 +6,11 @@ module Cocina
       module FromMods
         # Maps notes
         class Note # rubocop:disable Metrics/ClassLength
+          # notes with these types will produce an `abstract` XML node
+          NOTE_TYPE_TO_ABSTRACT_TYPE = ['summary', 'abstract', 'scope and content'].freeze
+          DISPLAY_LABEL_TO_ABSTRACT_TYPE = ['Content advice', 'Subject', 'Abstract', 'Review', 'Summary', 'Scope and content',
+                                            'Scope and Content', 'Content Advice'].freeze
+
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder (not used, but passed in by DescriptionBuilder)
           # @param [String] purl (not used, but passed in by DescriptionBuilder)
@@ -28,7 +33,8 @@ module Cocina
           attr_reader :resource_element
 
           def abstracts
-            all_abstract_nodes = resource_element.xpath('mods:abstract', mods: Description::DESC_METADATA_NS).select do |node|
+            all_abstract_nodes = resource_element.xpath('mods:abstract',
+                                                        mods: Description::DESC_METADATA_NS).select do |node|
               note_present?(node)
             end
             altrepgroup_abstract_nodes, other_abstract_nodes = AltRepGroup.split(nodes: all_abstract_nodes)
@@ -58,13 +64,13 @@ module Cocina
           end
 
           def note_type(node)
-            return node['type'].downcase if Cocina::Models::Mapping::ToMods::Note.note_type_to_abstract_type.include?(node['type']&.downcase)
+            return node['type'].downcase if NOTE_TYPE_TO_ABSTRACT_TYPE.include?(node['type']&.downcase)
 
             node['type']
           end
 
           def display_label(node)
-            return node[:displayLabel].capitalize if Cocina::Models::Mapping::ToMods::Note.display_label_to_abstract_type.include? node[:displayLabel]
+            return node[:displayLabel].capitalize if DISPLAY_LABEL_TO_ABSTRACT_TYPE.include? node[:displayLabel]
 
             node[:displayLabel].presence
           end
@@ -72,7 +78,7 @@ module Cocina
           def abstract_type(node, parallel: false)
             if node['type'].present?
               { type: node['type'].downcase }
-            elsif Cocina::Models::Mapping::ToMods::Note.display_label_to_abstract_type.exclude?(node['displayLabel']) && !parallel
+            elsif DISPLAY_LABEL_TO_ABSTRACT_TYPE.exclude?(node['displayLabel']) && !parallel
               { type: 'abstract' }
             else
               {}
@@ -111,7 +117,8 @@ module Cocina
           end
 
           def table_of_contents
-            all_toc_nodes = resource_element.xpath('mods:tableOfContents', mods: Description::DESC_METADATA_NS).select do |node|
+            all_toc_nodes = resource_element.xpath('mods:tableOfContents',
+                                                   mods: Description::DESC_METADATA_NS).select do |node|
               note_present?(node)
             end
             altrepgroup_toc_nodes, other_toc_nodes = AltRepGroup.split(nodes: all_toc_nodes)

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

@@ -5,9 +5,42 @@ module Cocina
     module Mapping
       module FromMods
         # Maps MODS relatedItem to cocina relatedResource
-        class RelatedResource
-          TYPES = Cocina::Models::Mapping::ToMods::RelatedResource::TYPES.invert.freeze
-          DETAIL_TYPES = Cocina::Models::Mapping::ToMods::RelatedResource::DETAIL_TYPES.invert.freeze
+        class RelatedResource # rubocop:disable Metrics/ClassLength
+          # see https://docs.google.com/spreadsheets/d/1d5PokzgXqNykvQeckG2ND43B6i9_CsjfIVwS_IsphS8/edit#gid=0
+          TYPES = {
+            'has original version' => 'original',
+            'has other format' => 'otherFormat',
+            'has part' => 'constituent',
+            'has version' => 'otherVersion',
+            'in series' => 'series',
+            'part of' => 'host',
+            'preceded by' => 'preceding',
+            'related to' => nil, # 'related to' is a null type by design
+            'reviewed by' => 'reviewOf',
+            'referenced by' => 'isReferencedBy',
+            'references' => 'references',
+            'succeeded by' => 'succeeding'
+          }.invert.freeze
+
+          DETAIL_TYPES = {
+            'location within source' => 'part',
+            'volume' => 'volume',
+            'issue' => 'issue',
+            'chapter' => 'chapter',
+            'section' => 'section',
+            'paragraph' => 'paragraph',
+            'track' => 'track',
+            'marker' => 'marker'
+          }.invert.freeze
+
+          OTHER_TYPES = [
+            'supplement to',
+            'supplemented by',
+            'derived from',
+            'source of',
+            'version of record',
+            'identical to'
+          ].freeze
 
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder
@@ -52,7 +85,7 @@ module Cocina
               if related_item['type']
                 item[:type] = normalized_type_for(related_item['type'])
               elsif (other_type = related_item['otherType'])
-                if Cocina::Models::Mapping::ToMods::RelatedResource::OTHER_TYPES.include?(other_type)
+                if OTHER_TYPES.include?(other_type)
                   item[:type] = other_type
                 else
                   item[:type] = 'related to'

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

@@ -55,8 +55,6 @@ module Cocina
             }.compact.presence
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/AbcSize
           def build_subject(subject_node)
             if subject_node['xlink:href']
               return { valueAt: subject_node['xlink:href'] } if subject_node.elements.empty?
@@ -96,8 +94,6 @@ module Cocina
               simple_item(first_child_node, attrs)
             end
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
-          # rubocop:enable Metrics/AbcSize
 
           def temporal_range?(children_nodes)
             children_nodes.all? { |node| node.name == 'temporal' && node['point'] }