cocina-models 0.109.0 → 0.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84997ec614fd5688aafaecffc4e76731ccebe63129e215ad77bf8d13a9e8e4f
-  data.tar.gz: 8018ef77c9f21f189f2ec1d3fdeeba8c6b7638023beca2b1b4ca99e15e7bd910
+  metadata.gz: 8b9fe9682c10921ac206fea73e6526883ba31fe7fb08f720f17ff7601e54e0d4
+  data.tar.gz: c854536af0b5c26c355129317c6331ae0ff9c772edc666a03a1f68cde97c0c8e
 SHA512:
-  metadata.gz: 44c4c1c7070a6d5ad8f1122eecce1eb45809f567f20086b46bf096fb07a66590adf8b51ae307994c9edbf80f837082121a584b3a1884fd151578f63c0991b101
-  data.tar.gz: 274a80c4ce5f170f468a4416a0f3948ee65a678136458f4bf4ed255676e5b1950c7f317f74f30752667f4943164ec42c0a1fcc25582d8adf50024d47a67766bf
+  metadata.gz: cfe6d191ba1e17e102788fca888c4bd5e099eca554bd38e3642b155b453c26d4cba11f1dbc2b1e02547fe8d682a5382224eb0650d7c6be8dc3abb1636e968f25
+  data.tar.gz: adb832be7b97215ff35647f94fa20bc86eab92d7045a52e7e81d3274b935fc8156b11c250b0fd9079ac3d0197b266e628693a138aec84ba962791df720a6f79d

data/.rubocop.yml

@@ -540,3 +540,16 @@ Style/RedundantArrayFlatten: # new in 1.76
   Enabled: true
 Style/ArrayIntersectWithSingleElement: # new in 1.81
   Enabled: true
+
+Style/EmptyClassDefinition: # new in 1.83
+  Enabled: true
+Style/ModuleMemberExistenceCheck: # new in 1.82
+  Enabled: true
+Style/NegativeArrayIndex: # new in 1.83
+  Enabled: true
+Style/ReverseFind: # new in 1.83
+  Enabled: true
+RSpec/LeakyLocalVariable: # new in 3.8
+  Enabled: true
+RSpec/Output: # new in 3.9
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.109.0)
+    cocina-models (0.110.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -9,9 +9,10 @@ PATH
       edtf
       equivalent-xml
       i18n
+      json_schemer (~> 2.0)
       jsonpath
+      marc (~> 1.3)
       nokogiri
-      openapi_parser (~> 1.0)
       super_diff
       thor
       zeitwerk (~> 2.1)
@@ -36,10 +37,6 @@ GEM
     attr_extras (7.1.0)
     base64 (0.3.0)
     bigdecimal (4.0.1)
-    committee (5.0.0)
-      json_schema (~> 0.14, >= 0.14.3)
-      openapi_parser (~> 1.0)
-      rack (>= 1.5)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     date (3.5.1)
@@ -66,7 +63,7 @@ GEM
       dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.9.0)
+    dry-types (1.9.1)
       bigdecimal (>= 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -78,6 +75,7 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erb (6.0.1)
+    hana (1.3.7)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -86,21 +84,27 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.0)
-    json_schema (0.21.0)
+    json (2.18.1)
+    json_schemer (2.5.0)
+      bigdecimal
+      hana (~> 1.3)
+      regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    mini_portile2 (2.8.9)
+    marc (1.4.0)
+      nokogiri (~> 1.0)
+      rexml
     minitest (6.0.1)
       prism (~> 1.5)
     multi_json (1.19.1)
-    nokogiri (1.19.0)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.19.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.0-x86_64-linux-gnu)
       racc (~> 1.4)
-    openapi_parser (1.0.0)
     optimist (3.2.1)
     parallel (1.27.0)
     parser (3.3.10.1)
@@ -111,12 +115,11 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.8.0)
+    prism (1.9.0)
     psych (5.3.1)
       date
       stringio
     racc (1.8.1)
-    rack (3.2.4)
     rainbow (3.1.1)
     rake (13.3.1)
     rdoc (7.1.0)
@@ -126,6 +129,7 @@ GEM
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
+    rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -138,10 +142,10 @@ GEM
     rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
+    rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.82.1)
+    rubocop (1.84.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -149,7 +153,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)
@@ -169,6 +173,7 @@ 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.18.0)
       attr_extras (>= 6.2.4)
@@ -185,12 +190,12 @@ GEM
     zeitwerk (2.7.4)
 
 PLATFORMS
-  ruby
+  arm64-darwin
+  x86_64-linux-gnu
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (>= 2.0, < 5)
   cocina-models!
-  committee
   debug
   rake (~> 13.0)
   rspec (~> 3.0)
@@ -200,5 +205,85 @@ DEPENDENCIES
   rubocop-rspec
   simplecov
 
+CHECKSUMS
+  activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
+  cocina-models (0.110.0)
+  concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
+  connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
+  date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
+  debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6
+  deprecation (1.1.0) sha256=01707cea9a6ed2d7270377457941f43394a345e6dd8048e1be6d18ff2f2a01e1
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1
+  dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc
+  dry-logic (1.6.0) sha256=da6fedbc0f90fc41f9b0cc7e6f05f5d529d1efaef6c8dcc8e0733f685745cea2
+  dry-struct (1.8.0) sha256=74c38b559924fb6462ac43ec780c4533a082d7b1d238a8d7857b773b3b8e2966
+  dry-types (1.9.1) sha256=baebeecdb9f8395d6c9d227b62011279440943e3ef2468fe8ccc1ba11467f178
+  edtf (3.2.0) sha256=a15a0ee274e49c8047a3ebb5d61d793ba44f7f8ffbf0595392c467e3ea8d2447
+  equivalent-xml (0.6.0) sha256=8919761efa848ad0846369ff8be1f646b17e5061698c4867b09829000cc3f487
+  erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5
+  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.16.0) sha256=2abe56c9ac947cdcb2f150572904ba798c1e93c890c256f8429981a7675b0806
+  json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
+  jsonpath (1.1.5) sha256=29f70467193a2dc93ab864ec3d3326d54267961acc623f487340eb9c34931dbe
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  marc (1.4.0) sha256=89f31a66c21f5a11e8fcf65fe06d207e121fb45ac6b23abef403f9ce912c7d10
+  minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb
+  multi_json (1.19.1) sha256=7aefeff8f2c854bf739931a238e4aea64592845e0c0395c8a7d2eea7fdd631b7
+  nokogiri (1.19.0-arm64-darwin) sha256=0811dfd936d5f6dd3f6d32ef790568bf29b2b7bead9ba68866847b33c9cf5810
+  nokogiri (1.19.0-x86_64-linux-gnu) sha256=f482b95c713d60031d48c44ce14562f8d2ce31e3a9e8dd0ccb131e9e5a68b58c
+  optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
+  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
+  parser (3.3.10.1) sha256=06f6a725d2cd91e5e7f2b7c32ba143631e1f7c8ae2fb918fc4cebec187e6a688
+  patience_diff (1.2.0) sha256=f492094486af02fff4a80070fa6b4d0ebbcf4d42fb38bba29d095eef43f6822c
+  pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
+  rdoc (7.1.0) sha256=494899df0706c178596ca6e1d50f1b7eb285a9b2aae715be5abd742734f17363
+  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
+  reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
+  rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
+  rubocop (1.84.1) sha256=14cc626f355141f5a2ef53c10a68d66b13bb30639b26370a76559096cc6bcc1a
+  rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
+  rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
+  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
+  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.18.0) sha256=9f5e77464fa75150619f7783174fbbe1bbac50a1eaf157cd39ad5584b0eac142
+  thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
+  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
+  unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  zeitwerk (2.7.4) sha256=2bef90f356bdafe9a6c2bd32bcd804f83a4f9b8bc27f3600fff051eb3edcec8b
+
 BUNDLED WITH
-   2.7.2
+  4.0.6

data/cocina-models.gemspec

@@ -32,16 +32,14 @@ Gem::Specification.new do |spec|
   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 'marc', '~> 1.3'
   spec.add_dependency 'nokogiri'
-  # Match these version requirements to what committee wants,
-  # so that our client (non-committee) users have the same dependencies.
-  spec.add_dependency 'openapi_parser', '~> 1.0'
   spec.add_dependency 'super_diff'
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk', '~> 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'committee'
+  spec.add_development_dependency 'bundler', '>= 2.0', '< 5'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.24'

data/description_types.yml

@@ -347,7 +347,6 @@ identifier:
     use: accession number
   - value: accession number
   - value: alternate case number
-  - value: anchor
   - value: Apis ID
     code: apis
   - value: ARK
@@ -430,7 +429,7 @@ identifier:
     code: urn
   - value: videorecording identifier
     code: videorecording-identifier
-  - value: 'West Mat #'
+  - value: "West Mat #"
   - value: Wikidata
     code: wikidata
 note:

data/docs/description_types.md

@@ -357,7 +357,6 @@ _Path: identifier.type_
     * Deprecated. Preferred usage: accession number
   * accession number
   * alternate case number
-  * anchor
   * Apis ID
   * ARK
   * arXiv

data/lib/cocina/generator/generator.rb

@@ -96,9 +96,9 @@ module Cocina
       end
 
       def schemas
-        @schemas ||= OpenAPIParser.parse(YAML.load_file(options[:openapi]), strict_reference_validation: true)
-                                  .find_object('#/components')
-                                  .schemas
+        @schemas ||= Cocina::OpenApiWrapper.parse(YAML.load_file(options[:openapi]), strict_reference_validation: true)
+                                           .components
+                                           .schemas
       end
 
       def schema_for(schema_name, lite: false)

data/lib/cocina/generator/schema_base.rb

@@ -110,7 +110,8 @@ module Cocina
       end
 
       def defined_datatypes?(doc)
-        doc.one_of&.map(&:name)&.all? { |name| name.present? && schemas.include?(name) }
+        doc.one_of.present? &&
+          doc.one_of.map(&:name)&.all? { |name| name.present? && schemas.include?(name) }
       end
 
       def any_datatype?(doc)

data/lib/cocina/models/mapping/from_marc/access.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Mapping
+      module FromMarc
+        # Maps Access to the cocina model
+        class Access
+          # @see #initialize
+          # @see #build
+          def self.build(...)
+            new(...).build
+          end
+
+          # @param [MARC::Record] marc MARC record from FOLIO
+          def initialize(marc:)
+            @marc = marc
+          end
+
+          # @return [Hash] a hash that can be mapped to a cocina model
+          def build
+            { url:, physicalLocation: physical_location }.compact_blank
+          end
+
+          private
+
+          def physical_location
+            field = marc['099']
+            return unless field
+
+            [{
+              value: field['a'],
+              type: 'shelf locator'
+            }]
+          end
+
+          def url
+            field = marc['856']
+            return unless field
+
+            notes = field.subfields.select { %(y z).include? it.code }.map { { value: it.value } }
+            [{ displayLabel: field['3'], value: field['u'], note: notes }.compact_blank]
+          end
+
+          attr_reader :marc
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/mapping/from_marc/admin_metadata.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Mapping
+      module FromMarc
+        # Maps AdminMetadata to the cocina model
+        class AdminMetadata
+          # @see #initialize
+          # @see #build
+          def self.build(...)
+            new(...).build
+          end
+
+          # @param [MARC::Record] marc MARC record from FOLIO
+          def initialize(marc:)
+            @marc = marc
+          end
+
+          # @return [Hash] a hash that can be mapped to a cocina model
+          def build
+            { contributor:, event:, identifier:, note: }.compact_blank
+          end
+
+          private
+
+          def contributor
+            field = marc['040']
+            return unless field
+
+            [{
+              type: 'organization',
+              name: [{ code: field['a'], source: { code: 'marcorg' } }]
+            }]
+          end
+
+          def event
+            [creation, modification].compact
+          end
+
+          def creation
+            field = marc['008']
+            return unless field
+
+            {
+              type: 'creation',
+              date: [{ value: field.value[0..5], encoding: { code: 'marc' } }]
+            }
+          end
+
+          def modification
+            field = marc['005']
+            return unless field
+
+            {
+              type: 'modification',
+              date: [{ value: field.value[0..7], encoding: { code: 'iso8601' } }]
+            }
+          end
+
+          def identifier
+            field = marc['001']
+            return unless field
+
+            [{ value: field.value, type: 'FOLIO' }]
+          end
+
+          def note
+            [{ value: "Converted from MARC to Cocina #{Date.today.iso8601}", type: 'record origin' }]
+          end
+
+          attr_reader :marc
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/mapping/from_marc/contributor.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require_relative 'marc_relators'
+
+module Cocina
+  module Models
+    module Mapping
+      module FromMarc
+        # Maps contributor information from MARC records to Cocina models.
+        class Contributor
+          # @see #initialize
+          # @see #build
+          def self.build(...)
+            new(...).build
+          end
+
+          # @param [MARC::Record] marc MARC record from FOLIO
+          def initialize(marc:)
+            @marc = marc
+          end
+
+          # @return [Array<Hash>] an array of contributor hashes
+          def build
+            linked_100_field = Util.linked_field(marc, marc['100']) if marc['100']
+            linked_700_field = Util.linked_field(marc, marc['700']) if marc['700']
+
+            [
+              build_personal(marc['100'], primary: true),
+              build_personal(linked_100_field),
+              build_corporate(marc['110'], primary: true),
+              build_event(marc['111'], primary: true),
+              build_personal(marc['700']),
+              build_personal(linked_700_field),
+              build_corporate(marc['710']),
+              build_event(marc['711']),
+              build_personal(marc['720'])
+
+            ].compact
+          end
+
+          private
+
+          def build_personal(field, primary: false)
+            return unless field
+
+            name_type = case field.indicator1
+                        when '1', '2'
+                          'person'
+                        when '3'
+                          'family'
+                        end
+            contributor = { type: name_type }.compact
+            contributor[:name] = [build_personal_name(field)]
+            contributor[:role] = build_roles(field)
+            id = build_id(field).first
+            contributor[:identifier] = [{ value: id.delete_prefix('https://orcid.org/'), type: 'ORCID' }.compact_blank] if id&.start_with? 'https://orcid.org/'
+            contributor[:status] = 'primary' if primary
+            contributor.compact_blank
+          end
+
+          def build_personal_name(field)
+            return unless field
+
+            name = Util.strip_punctuation(field.subfields.select { |subfield| %w[a c q d].include? subfield.code }.map(&:value).join(' '))
+            { value: name }
+          end
+
+          def build_id(field)
+            field.subfields.select { |subfield| %w[1].include? subfield.code }.map(&:value)
+          end
+
+          def build_roles(field, code: 'e')
+            expanded = field.subfields.select { |sf| sf.code == '4' }.map { |role| { value: MARC_RELATORS[role.value] }.compact_blank }
+
+            (field.subfields.select { |sf| sf.code == code }.map { |role| { value: role.value.sub(/.$/, '') } } +
+              expanded).uniq.compact_blank
+          end
+
+          def build_corporate(field, primary: false)
+            return unless field
+
+            contributor = { type: 'organization' }
+            name = field.subfields.select { |subfield| %w[a b q d].include? subfield.code }.map(&:value).join(' ')
+            contributor[:name] = [{ value: name }]
+            id = build_id(field).first
+            contributor[:identifier] = [{ uri: id }] if id
+
+            contributor[:status] = 'primary' if primary
+            contributor
+          end
+
+          def build_event(field, primary: false)
+            return unless field
+
+            contributor = { type: 'event' }
+            name = field.subfields.select { |subfield| %w[a n d c].include? subfield.code }.map(&:value).join(' ')
+            contributor[:name] = [{ value: name }]
+            roles = build_roles(field, code: 'j')
+            contributor[:role] = roles if roles.present?
+            contributor[:status] = 'primary' if primary
+            contributor
+          end
+
+          attr_reader :marc
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/mapping/from_marc/description.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'marc'
+
 module Cocina
   module Models
     module Mapping
@@ -12,34 +14,23 @@ module Cocina
             new(...).props
           end
 
-          # @param [Hash] marc MARC record from FOLIO
-          # @param [String] label
+          # @param [MARC::Record] marc MARC record from FOLIO
           # @param [String] druid
-          # @param [TitleBuilder] title_builder - defaults to Title class
           # @param [Cocina::Models::Mapping::ErrorNotifier] notifier
-          def initialize(marc:, label:, druid:, title_builder: nil, notifier: nil)
-            @title_builder = title_builder || Title
+          def initialize(marc:, druid:, notifier: nil)
             @marc = marc
-            @notifier = notifier || ErrorNotifier.new(druid: druid)
-            @druid = druid
-            @label = label
+            @notifier = notifier || ErrorNotifier.new(druid:)
+            @purl = Cocina::Models::Mapping::Purl.for(druid:) if druid
           end
 
           # @return [Hash] a hash that can be mapped to a Cocina Description model
           def props
-            return nil if marc.nil?
-
-            DescriptionBuilder.build(title_builder: title_builder,
-                                     marc: marc,
-                                     notifier: notifier,
-                                     purl: druid ? Cocina::Models::Mapping::Purl.for(druid: druid) : nil).tap do |properties|
-              properties[:title] = [{ value: label }] unless properties.key?(:title)
-            end
+            DescriptionBuilder.build(marc:, notifier:, purl:) if marc
           end
 
           private
 
-          attr_reader :title_builder, :marc, :notifier, :druid, :label
+          attr_reader :marc, :notifier, :purl
         end
       end
     end