cocina-models 0.99.3 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7084352ad6644805e589d4326dc33d8fa24bf552e2477388f214a631787a6c1c
-  data.tar.gz: 9f79866b2045957d92b106951c56d1b9921c5f73e0c402cace570bfc5b1d1b8b
+  metadata.gz: bf0adcf9839eca5b38d5ea38c28b9ee8d853e0f5cdec7b35a2c8fee57e3081fd
+  data.tar.gz: 8824e1540a5d8eb2fca36f8afbeeb340f4b134385075af10dac74408c7e35598
 SHA512:
-  metadata.gz: 10d995ae9c4e178cab0217cda005fd017f94c07f46430e9e0553adbcc58f143602b7cf8c12c180c3d1f571be44f1acb27f045360a3dc0615158c3b794e4b1b5d
-  data.tar.gz: 172a116805b32a6ee40a1a14fde6e4f87b95359e59d1ee0604c0205bb33b19e3ff7fe20ce262742803b88e80794055c2aaeaa947767cb10cc6bde6ab8ba03c7c
+  metadata.gz: 96f4f445895f8be40633be3caf07455fc72ac83fdf592996c38510faef3367c3c32b529f0a3c865385522833802e5e02a608b6918ec2a05905911d436f6a0d4b
+  data.tar.gz: ef3acb51f35dea27da4f6378d625a4872a07652bb4cd1a2f4d40162adc1b6d8682d86bc4253639dff56ef66abbd4513ea6ba810fbc34b49e6a8008280c399bfc

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.2.3
+  ruby-rails: sul-dlss/ruby-rails@4.5.0
 workflows:
   build:
     jobs:
@@ -10,3 +10,5 @@ workflows:
           name: lint
       - ruby-rails/test-gem:
           name: test
+          context: dlss
+          use-codecov: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.99.3)
+    cocina-models (0.100.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -42,8 +42,8 @@ GEM
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.1)
@@ -59,12 +59,12 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.6.0)
-      dry-core (~> 1.0, < 2)
-      dry-types (>= 1.7, < 2)
+    dry-struct (1.7.1)
+      dry-core (~> 1.1)
+      dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.7.2)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -75,31 +75,31 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.9.1)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
-    language_server-protocol (3.17.0.3)
-    logger (1.6.4)
+    language_server-protocol (3.17.0.4)
+    logger (1.6.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
     multi_json (1.15.0)
-    nokogiri (1.18.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openapi_parser (1.0.0)
     optimist (3.2.0)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.9)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.10.0)
@@ -107,7 +107,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -118,17 +118,17 @@ GEM
     rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.69.2)
+    rubocop (1.71.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.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -151,14 +151,14 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    super_diff (0.14.0)
+    super_diff (0.15.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
     thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.3)
+    unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.2)

data/README.md

@@ -1,6 +1,5 @@
 [![CircleCI](https://circleci.com/gh/sul-dlss/cocina-models.svg?style=svg)](https://circleci.com/gh/sul-dlss/cocina-models)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/test_coverage)](https://codeclimate.com/github/sul-dlss/cocina-models/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/maintainability)](https://codeclimate.com/github/sul-dlss/cocina-models/maintainability)
+[![Test Coverage](https://codecov.io/github/sul-dlss/cocina-models/graph/badge.svg?token=FG1SRYCME2)](https://codecov.io/github/sul-dlss/cocina-models)
 [![Gem Version](https://badge.fury.io/rb/cocina-models.svg)](https://badge.fury.io/rb/cocina-models)
 [![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/main/openapi.yml)
 

data/description_types.yml

@@ -51,6 +51,8 @@ contributor:
 contributor.identifier:
   - value: ORCID
     description: Identifier from orcid.org.
+  - value: ROR
+    code: ror
   - value: Wikidata
     description: Identifier from wikidata.org.
 contributor.name:
@@ -599,6 +601,8 @@ note.groupedValue:
   - value: title
   - value: text
 relatedResource:
+  - value: derived from
+    description: The source from which the resource was derived, such as a raw data set before processing.
   - value: has original version
     description: An initial form of the resource.
   - value: has other format
@@ -607,6 +611,8 @@ relatedResource:
     description: A constituent unit of the resource.
   - value: has version
     description: A version of the resource with different intellectual content.
+  - value: identical to
+    description: A version of the resource with the same content and format.
   - value: in series
     description: The name of a series of publications to which the resource belongs.
   - value: other relation type
@@ -623,8 +629,16 @@ relatedResource:
     description: A generically related resource.
   - value: reviewed by
     description: A review of the resource.
+  - value: source of
+    description: Additional materials derived from the resource, such as a processed data set.
   - value: succeeded by
     description: A successor to the resource, such as a subsequent journal title.
+  - value: supplemented by
+    description: An auxiliary supplement to the resource.
+  - value: supplement to
+    description: The primary object which the resource supplements.
+  - value: version of record
+    description: The version of the resource that is preferred for citation and reference.
 subject:
   - value: classification
     description: A coded reference to the main subjects of the resource according to a larger system.

data/docs/description_types.md

@@ -55,6 +55,7 @@ _Path: contributor.type_
 _Path: contributor.identifier.type_
   * ORCID
     * Identifier from orcid.org.
+  * ROR
   * Wikidata
     * Identifier from wikidata.org.
 ## Contributor name types
@@ -576,6 +577,8 @@ _Path: note.groupedValue.type_
   * text
 # RelatedResource types
 _Path: relatedResource.type_
+  * derived from
+    * The source from which the resource was derived, such as a raw data set before processing.
   * has original version
     * An initial form of the resource.
   * has other format
@@ -584,6 +587,8 @@ _Path: relatedResource.type_
     * A constituent unit of the resource.
   * has version
     * A version of the resource with different intellectual content.
+  * identical to
+    * A version of the resource with the same content and format.
   * in series
     * The name of a series of publications to which the resource belongs.
   * other relation type
@@ -600,8 +605,16 @@ _Path: relatedResource.type_
     * A generically related resource.
   * reviewed by
     * A review of the resource.
+  * source of
+    * Additional materials derived from the resource, such as a processed data set.
   * succeeded by
     * A successor to the resource, such as a subsequent journal title.
+  * supplemented by
+    * An auxiliary supplement to the resource.
+  * supplement to
+    * The primary object which the resource supplements.
+  * version of record
+    * The version of the resource that is preferred for citation and reference.
 # Subject types
 _Path: subject.type_
   * classification

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

@@ -51,14 +51,18 @@ module Cocina
               item[:displayLabel] = related_item['displayLabel']
               if related_item['type']
                 item[:type] = normalized_type_for(related_item['type'])
-              elsif related_item['otherType']
-                item[:type] = 'related to'
-                item[:note] ||= []
-                item[:note] <<
-                  { type: 'other relation type', value: related_item['otherType'] }.tap do |note|
-                    note[:uri] = related_item['otherTypeURI'] if related_item['otherTypeURI']
-                    note[:source] = { value: related_item['otherTypeAuth'] } if related_item['otherTypeAuth']
-                  end
+              elsif (other_type = related_item['otherType'])
+                if Cocina::Models::Mapping::ToMods::RelatedResource::OTHER_TYPES.include?(other_type)
+                  item[:type] = other_type
+                else
+                  item[:type] = 'related to'
+                  item[:note] ||= []
+                  item[:note] <<
+                    { type: 'other relation type', value: related_item['otherType'] }.tap do |note|
+                      note[:uri] = related_item['otherTypeURI'] if related_item['otherTypeURI']
+                      note[:source] = { value: related_item['otherTypeAuth'] } if related_item['otherTypeAuth']
+                    end
+                end
               end
             end.compact
           end

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

@@ -22,6 +22,15 @@ module Cocina
             'succeeded by' => 'succeeding'
           }.freeze
 
+          OTHER_TYPES = [
+            'supplement to',
+            'supplemented by',
+            'derived from',
+            'source of',
+            'version of record',
+            'identical to'
+          ].freeze
+
           DETAIL_TYPES = {
             'location within source' => 'part',
             'volume' => 'volume',
@@ -85,7 +94,13 @@ module Cocina
 
           def attributes_for(related, other_type_note)
             {}.tap do |attrs|
-              attrs[:type] = TYPES.fetch(related.type) if related.type
+              if related.type
+                if (mapped_type = TYPES[related.type])
+                  attrs[:type] = mapped_type
+                elsif OTHER_TYPES.include?(related.type)
+                  attrs[:otherType] = related.type
+                end
+              end
               attrs[:displayLabel] = related.displayLabel
 
               if other_type_note

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.99.3'
+    VERSION = '0.100.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.99.3
+  version: 0.100.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -536,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Data models for the SDR