cocina-models 0.132.0 → 0.133.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a61867c1ae0703869cce27ced15c5698d5e4e93b5792e6e1ae559ca55965d39
-  data.tar.gz: e091f101f3922c69833aca4117f4d8d011f55d0959e2463e8f151bf1ba6f8d6a
+  metadata.gz: 7b806e4bcc314de6d4a213bfbbb889f4b431ccd7f674699d3b5affd65e1729c9
+  data.tar.gz: 291cf8886445c123942797831ed7045c8bce623ce5834cd4f77f2eda54152ab0
 SHA512:
-  metadata.gz: b8b8e322eeed3c9a59831ef76a664c79cd6438224e4ec92de4448c9da17ea10c20874758fd968e270523ceb13acce529cc6b13e596b925b05aac77ba93accfa9
-  data.tar.gz: bace81574ac19ed81b453caeec3530c940e1c4bc41d94e316726ea5f42092092363e0c4138fb51fe693732af3f74db5bea5b629f0ab5a60b1db57cf3ca05c802
+  metadata.gz: 798b0ba266e87554a519d5c6246b327e47b07f5591b86661040d2435ebb499bde858cbcc4c168786dc975c47b6b62eb4544aa5045d4f5409e7eaba1e0f031bef
+  data.tar.gz: e590597ff938d9ffe8e2fa1df0aca395e2547fb7d0938e1735dd14d9beeeb1bf1ee9441af323a79d122600eca7c813c0afa398611eccda5f68d64759512ef614

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.132.0)
+    cocina-models (0.133.0)
       activesupport
       cocina_display
       deprecation
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.3)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -37,7 +37,7 @@ GEM
     base64 (0.3.0)
     bigdecimal (4.1.2)
     builder (3.3.0)
-    cocina_display (2.9.0)
+    cocina_display (2.10.0)
       activesupport (>= 7)
       edtf (~> 3.2)
       geo_coord (~> 0.2)
@@ -99,11 +99,11 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
-    janeway-jsonpath (1.0.0)
-    json (2.21.1)
-    jsonschema_rs (0.49.1-arm64-darwin)
+    janeway-jsonpath (1.1.0)
+    json (2.21.2)
+    jsonschema_rs (0.49.3-arm64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.1-x86_64-linux)
+    jsonschema_rs (0.49.3-x86_64-linux)
       bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
@@ -131,7 +131,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.1.0)
+    rbs (4.1.2)
       logger
       prism (>= 1.6.0)
       tsort
@@ -197,7 +197,7 @@ GEM
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
     uri (1.1.1)
-    zeitwerk (2.8.2)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   arm64-darwin
@@ -219,15 +219,15 @@ DEPENDENCIES
   simplecov
 
 CHECKSUMS
-  activesupport (8.1.3) sha256=21a5e0dfbd4c3ddd9e1317ec6a4d782fa226e7867dc70b0743acda81a1dca20e
+  activesupport (8.1.3.1) sha256=85458765f25ea48b9019c46b6bb3fa5683197bf4280d9f06710a6e8d7a831376
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
   bundler (4.0.17) sha256=214e21431b5665dd2f99df8a5511c6b151d7a72e8015c8b38f8b775b61cbb6c1
-  cocina-models (0.132.0)
-  cocina_display (2.9.0) sha256=00e97cf826dafd5c547ca87b58e55f1d3bfa68fa4ddcddbbe25b4d9d9ed05d8f
+  cocina-models (0.133.0)
+  cocina_display (2.10.0) sha256=846b6c1608154f5f7c8130cfc0b8c956af7ddb427da37b2e8d5ca9cd05401274
   concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   csv (3.3.6) sha256=aba61e7e507a66f03d45cb1f3c4b6359861c3504038b422962875dce099e4456
@@ -251,10 +251,10 @@ CHECKSUMS
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
-  janeway-jsonpath (1.0.0) sha256=c8293f009f2aea9487ddee3067ca735a1f758eb1c8834ff4fab3ffd06c56d0a3
-  json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583
-  jsonschema_rs (0.49.1-arm64-darwin) sha256=1c3a72c95f60e6c1dad6873b206eebaaa57ac947049675d0504bddc79be6db67
-  jsonschema_rs (0.49.1-x86_64-linux) sha256=de9c96bc0d68f818b1dd59fba09d954a13e02deaf2121aef803ad9c47dc3204b
+  janeway-jsonpath (1.1.0) sha256=82f71dccbdc29bf788815bc3b66e7ab5ddee2bdeea3a3121512aca63cfbcd9a9
+  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
+  jsonschema_rs (0.49.3-arm64-darwin) sha256=427e4c08b05adb1a5ff1f471e663dfd57b4372ae8bf314a12369d7bca3f94f0d
+  jsonschema_rs (0.49.3-x86_64-linux) sha256=392d3ea2f86a3f4fbf288154fdecccce1c599d225541101d8058b52a4d9ee3f7
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
@@ -272,7 +272,7 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rbs (4.1.0) sha256=8baba59008b0643b4ba2090e9b1d0149655b0bbd42eb2ffe42b1d0eb6923fd72
+  rbs (4.1.2) sha256=050eb1d8b508f1233bed929c0f2c7052302f7adf295230d9cb314e9024078f48
   rdoc (8.0.0) sha256=03bf8c08a9639658855a0cfd77c0abca8325c227693f7f33f82957811348c469
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
@@ -297,7 +297,7 @@ CHECKSUMS
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
-  zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
+  zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
 
 BUNDLED WITH
   4.0.17

data/{description_types.yml → config/description_types.yml}

@@ -93,8 +93,6 @@ contributor.name.groupedValue:
   - value: pseudonym
     description: Name used that differs from legal or primary form of name.
 contributor.note:
-  - value: affiliation
-    description: Institution with which the contributor is associated.
   - value: citation status
     description: Indicator of whether the contributor should be included in the citation.
   - value: contact email

data/docs/description_types.md

@@ -100,8 +100,6 @@ _Path: contributor.name.groupedValue.type_
     * Name used that differs from legal or primary form of name.
 ## Contributor note types
 _Path: contributor.note.type_
-  * affiliation
-    * Institution with which the contributor is associated.
   * citation status
     * Indicator of whether the contributor should be included in the citation.
   * contact email

data/lib/cocina/generator/generator.rb

@@ -52,7 +52,7 @@ module Cocina
 
       desc 'generate_descriptive_docs', 'generate descriptive documentation'
       def generate_descriptive_docs
-        markdown = YAML.load_file('description_types.yml').map do |field, types|
+        markdown = YAML.load_file('config/description_types.yml').map do |field, types|
           header_markdown = field_markdown_from(field)
           types_markdown = types_markdown_from(types)
 

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

@@ -42,7 +42,7 @@ module Cocina
             }.compact
             { name: [names] }.tap do |attrs|
               attrs[:role] = name_elements.flat_map { |name_node| build_roles(name_node) }.compact.uniq.presence
-              attrs[:note] = name_elements.flat_map { |name_node| build_affiliation_notes(name_node) }.compact.uniq.presence
+              attrs[:affiliation] = name_elements.flat_map { |name_node| build_affiliations(name_node) }.compact.uniq.presence
             end.compact
           end
 
@@ -87,11 +87,12 @@ module Cocina
 
           def common_name(name_node, name, is_parallel: false)
             {
-              note: build_notes(name_node, is_parallel: is_parallel),
+              note: build_notes(name_node),
               identifier: build_identifier(name_node)
             }.tap do |attrs|
               roles = build_roles(name_node)
               attrs[:role] = roles unless name.nil?
+              attrs[:affiliation] = build_affiliations(name_node).presence unless is_parallel
             end.compact
           end
 
@@ -277,7 +278,7 @@ module Cocina
             end.presence
           end
 
-          def build_notes(name_node, is_parallel:)
+          def build_notes(name_node)
             [].tap do |parts|
               description = name_node.xpath('mods:description', mods: Description::DESC_METADATA_NS).first
               if description
@@ -287,13 +288,12 @@ module Cocina
                            { value: description.text, type: 'description' }
                          end
               end
-              parts.concat(build_affiliation_notes(name_node)) unless is_parallel
             end.presence
           end
 
-          def build_affiliation_notes(name_node)
+          def build_affiliations(name_node)
             name_node.xpath('mods:affiliation', mods: Description::DESC_METADATA_NS).map do |affiliation_node|
-              { value: affiliation_node.text, type: 'affiliation' }
+              { value: affiliation_node.text }
             end
           end
 

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

@@ -37,7 +37,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_values_by_source
-          @@valid_values_by_source ||= YAML.load_file(::File.expand_path('../../../../resource_type_values.yml', __dir__))
+          @@valid_values_by_source ||= YAML.load_file(::File.expand_path('../../../../config/resource_type_values.yml', __dir__))
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -32,7 +32,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../form_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/form_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -32,7 +32,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../identifier_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/identifier_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -45,7 +45,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../language_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/language_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -70,13 +70,13 @@ module Cocina
         # rubocop:disable Style/ClassVars
         def valid_iso639_2_codes
           @@valid_iso639_2_codes ||= YAML.load_file(
-            ::File.expand_path('../../../../language_uri_iso639_2_codes.yml', __dir__)
+            ::File.expand_path('../../../../config/language_uri_iso639_2_codes.yml', __dir__)
           ).to_set(&:downcase)
         end
 
         def valid_languages_codes
           @@valid_languages_codes ||= YAML.load_file(
-            ::File.expand_path('../../../../language_uri_languages_codes.yml', __dir__)
+            ::File.expand_path('../../../../config/language_uri_languages_codes.yml', __dir__)
           ).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars

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

@@ -46,7 +46,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../location_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/location_source_codes.yml', __dir__)).to_set(&:downcase)
         end
 
         def valid_marc_country_codes

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

@@ -36,7 +36,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../name_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/name_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -65,7 +65,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_script_codes
-          @@valid_script_codes ||= YAML.load_file(::File.expand_path('../../../../iso15924_codes.yml', __dir__)).to_set
+          @@valid_script_codes ||= YAML.load_file(::File.expand_path('../../../../config/iso15924_codes.yml', __dir__)).to_set
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -32,7 +32,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../subject_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/subject_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -34,7 +34,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../temporal_subject_encoding_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/temporal_subject_encoding_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -34,7 +34,7 @@ module Cocina
 
         # rubocop:disable Style/ClassVars
         def valid_codes
-          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../name_title_source_codes.yml', __dir__)).to_set(&:downcase)
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../config/name_title_source_codes.yml', __dir__)).to_set(&:downcase)
         end
         # rubocop:enable Style/ClassVars
       end

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

@@ -66,7 +66,7 @@ module Cocina
         # rubocop:enable Style/ClassVars
 
         def types_yaml
-          YAML.load_file(::File.expand_path('../../../../description_types.yml', __dir__))
+          YAML.load_file(::File.expand_path('../../../../config/description_types.yml', __dir__))
         end
       end
     end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.132.0'
+    VERSION = '0.133.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.132.0
+  version: 0.133.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -322,16 +322,22 @@ files:
 - bin/validate-data
 - bin/validate-schema
 - cocina-models.gemspec
-- description_types.yml
+- config/description_types.yml
+- config/form_source_codes.yml
+- config/identifier_source_codes.yml
+- config/iso15924_codes.yml
+- config/language_source_codes.yml
+- config/language_uri_iso639_2_codes.yml
+- config/language_uri_languages_codes.yml
+- config/location_source_codes.yml
+- config/name_source_codes.yml
+- config/name_title_source_codes.yml
+- config/resource_type_values.yml
+- config/subject_source_codes.yml
+- config/temporal_subject_encoding_codes.yml
 - docs/cocina-base.jsonld
 - docs/description_types.md
 - exe/generator
-- form_source_codes.yml
-- identifier_source_codes.yml
-- iso15924_codes.yml
-- language_source_codes.yml
-- language_uri_iso639_2_codes.yml
-- language_uri_languages_codes.yml
 - lib/cocina/generator.rb
 - lib/cocina/generator/datatype.rb
 - lib/cocina/generator/generator.rb
@@ -514,13 +520,7 @@ files:
 - lib/cocina/rspec.rb
 - lib/cocina/rspec/factories.rb
 - lib/cocina/rspec/matchers.rb
-- location_source_codes.yml
-- name_source_codes.yml
-- name_title_source_codes.yml
-- resource_type_values.yml
 - schema.json
-- subject_source_codes.yml
-- temporal_subject_encoding_codes.yml
 homepage: https://github.com/sul-dlss/cocina-models
 licenses: []
 metadata:
@@ -539,7 +539,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Data models for the SDR
 test_files: []