cocina-models 0.108.1 → 0.108.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4afcd46738fc91195733dc87097c0d582865df04246de6a92e8c11e7a813c6a
-  data.tar.gz: cd3301f2e60b80e0ca63ab8c2ae4ae36744e2b2ca1113466d44ca6dc59750130
+  metadata.gz: 4ac0ee1d7ed8ae53486e4b711aa05db3d73b2390a8083f9f1597f111ebbe3c9c
+  data.tar.gz: 33583ad6d49089fba2434b8924302cf9c3f4ee18150100e56db61d2bc36e3972
 SHA512:
-  metadata.gz: d2fee0029492cef4d925ae6d9e715a20d9e61b69cc2af48c1977e1ed5d74c548d0e8f49a014d4bb8d6cc047042438d83224ef9e43b4471b9199006b2b2a23c93
-  data.tar.gz: a758819e0df55773429f54d381243d831d511f45f156dd566fe1ff9d150a28bf2e095f029dd51175ccf2aaea90653bedad1e9f5b91e67d9838b7f07efbf8c4c7
+  metadata.gz: f57738f86a52485a98f8a6f6793a026a2a5e38d42e4cfd4c444891a3d1d115331e93d3e839d9e406550f07cd78db405111c91cb9701e5bc85b24eefb9cb7c8cd
+  data.tar.gz: 12de4f311c73204458f59af08db308bf83c7949b72378a3c4a044590c943a494db19a98f072e4691946dbd44ae1e0ba58174ae8fdcae1745ae688d0b9447022c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.108.1)
+    cocina-models (0.108.3)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.0)
+    activesupport (8.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -42,7 +42,7 @@ GEM
       rack (>= 1.5)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
-    date (3.4.1)
+    date (3.5.0)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -77,16 +77,16 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (5.1.1)
+    erb (6.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-console (0.8.1)
-    irb (1.15.2)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.15.2)
+    json (2.16.0)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
@@ -94,7 +94,7 @@ GEM
     lint_roller (1.1.0)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    minitest (5.26.0)
+    minitest (5.26.1)
     multi_json (1.17.0)
     nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
@@ -115,15 +115,15 @@ GEM
       date
       stringio
     racc (1.8.1)
-    rack (3.2.3)
+    rack (3.2.4)
     rainbow (3.1.1)
-    rake (13.3.0)
-    rdoc (6.15.0)
+    rake (13.3.1)
+    rdoc (6.15.1)
       erb
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -134,13 +134,13 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.6)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.81.6)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -151,15 +151,15 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
@@ -168,7 +168,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    stringio (3.1.7)
+    stringio (3.1.8)
     super_diff (0.17.0)
       attr_extras (>= 6.2.4)
       diff-lcs
@@ -180,7 +180,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
-    uri (1.0.4)
+    uri (1.1.1)
     zeitwerk (2.7.3)
 
 PLATFORMS

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

@@ -29,6 +29,7 @@ module Cocina
             add_types(forms)
             add_physical_descriptions(forms)
             add_subject_cartographics(forms)
+            add_etd_resource_type(forms)
             Primary.adjust(forms, 'genre', notifier, match_type: true)
             Primary.adjust(forms, 'resource type', notifier, match_type: true)
           end
@@ -187,6 +188,28 @@ module Cocina
             end
           end
 
+          def add_etd_resource_type(forms)
+            thesis_node = resource_element.xpath('mods:note[@type="thesis"]', mods: Description::DESC_METADATA_NS).first
+            return unless thesis_node
+
+            doi_node = resource_element.xpath('mods:identifier[@type="doi"]', mods: Description::DESC_METADATA_NS).first
+            return unless doi_node
+
+            forms.push({
+                         source: {
+                           value: 'DataCite resource types'
+                         },
+                         type: 'resource type',
+                         value: 'Dissertation'
+                       }, {
+                         source: {
+                           value: 'Stanford self-deposit resource types'
+                         },
+                         type: 'resource type',
+                         structuredValue: [{ type: 'subtype', value: 'Academic thesis' }]
+                       })
+          end
+
           def manuscript_form
             {
               value: 'manuscript',

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

@@ -6,6 +6,8 @@ module Cocina
       module FromMods
         # Builds cocina identifier
         class IdentifierBuilder
+          ORCID_PREFIX = 'https://orcid.org/'
+
           # @param [Nokogiri::XML::Element] identifier_element identifier element
           # @return [Hash] a hash that can be mapped to a cocina model
           def self.build_from_identifier(identifier_element:)
@@ -40,7 +42,7 @@ module Cocina
                 attrs[:uri] = identifier_element.text
               else
                 attrs[:type] = cocina_type
-                attrs[:value] = identifier_element.text
+                attrs[:value] = value
                 attrs[:source] = build_source
               end
               attrs[:status] = 'invalid' if identifier_element['invalid'] == 'yes'
@@ -54,16 +56,29 @@ module Cocina
           def types_for(type)
             return ['uri', 'uri', IdentifierType::STANDARD_IDENTIFIER_SCHEMES] if type == 'uri'
 
+            type = 'orcid' if orcid?
+
             IdentifierType.cocina_type_for_mods_type(type)
           end
 
+          def value
+            value = identifier_element.text
+            return value.delete_prefix(ORCID_PREFIX) if orcid?
+
+            value
+          end
+
           def build_source
             {
-              uri: identifier_element['typeURI']
+              uri: orcid? ? 'https://orcid.org' : identifier_element['typeURI']
             }.tap do |props|
               props[:code] = mods_type unless props[:uri]
             end.compact.presence
           end
+
+          def orcid?
+            identifier_element.text.starts_with?(ORCID_PREFIX)
+          end
         end
       end
     end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.108.1'
+    VERSION = '0.108.3'
   end
 end