sul_orcid_client 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c69ff816dc3d9337266431f30425887794ef50077d5e66efa667b47c337704b6
-  data.tar.gz: c3b186808e1c8fa4f1ebda219f9b23fc313dfea14e87eec7025f10609d96a221
+  metadata.gz: a9f8c0cdbbd579e4e9922b2225c2780d8822b398e937ee1012d48dca1b00ad94
+  data.tar.gz: edb6936a029080f50ea8de31b2ea57f70a2f26ffe1c00570dd4283087ebaf5d1
 SHA512:
-  metadata.gz: c87d4cef98681e21bd0f3cc170f90dd3a4160f3e6162e32d9d5eff9bafe320688aeb45305402b1b364f4b167dd16c4cc08f9afeedfadb993a6058fa44a1cbb79
-  data.tar.gz: c6034b1e4f487acadce12faa1c296206faa9fdc5bcde86bf981dfd050f4e825f927947ef24683417fbf22c7a84af28e46cf2fa71d3df953c1231f840bd19e1b3
+  metadata.gz: 7b760b6a8c634233fa2eb71ed7c812226a2f948eaab2e32a5f9104df736bf50f733cad45c395b73d9997f4d95c1adbd0f7e28cb94fe581b63e89a6c9572057c0
+  data.tar.gz: 78991a512207404b5a3d456c5f3149f091a522c17b4bea4b656d20b2c33d8a182454b4a2fd003e734c0559b46d93e09273409480c26fecc7d60e66d18b4a7590

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sul_orcid_client (0.6.0)
+    sul_orcid_client (0.8.0)
       activesupport (>= 4.2)
       cocina-models (~> 0.90)
       faraday
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -31,9 +31,9 @@ GEM
     attr_extras (7.1.0)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     byebug (12.0.0)
-    cocina-models (0.104.1)
+    cocina-models (0.106.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -48,7 +48,7 @@ GEM
       thor
       zeitwerk (~> 2.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -83,7 +83,7 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -91,12 +91,12 @@ GEM
       net-http (>= 0.5.0)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.12.2)
+    json (2.14.1)
     jsonpath (1.1.5)
       multi_json
     jwt (3.1.2)
@@ -105,41 +105,41 @@ GEM
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (5.25.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    oauth2 (2.0.12)
+    oauth2 (2.0.17)
       faraday (>= 0.17.3, < 4.0)
       jwt (>= 1.0, < 4.0)
       logger (~> 1.2)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (>= 1.1.8, < 3)
+      version_gem (~> 1.1, >= 1.1.9)
     openapi_parser (1.0.0)
     optimist (3.2.1)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    prism (1.4.0)
+    prism (1.5.1)
     public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    regexp_parser (2.10.0)
-    rexml (3.4.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -152,8 +152,8 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    rubocop (1.77.0)
+    rspec-support (3.13.6)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -161,10 +161,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -173,11 +173,11 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.26.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.6.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -190,7 +190,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     snaky_hash (2.0.3)
       hashie (>= 0.1.0, < 6)
@@ -199,16 +199,16 @@ GEM
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.3.2)
+    thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uri (1.0.3)
     vcr (6.3.1)
       base64
-    version_gem (1.1.8)
+    version_gem (1.1.9)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -238,4 +238,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

data/lib/sul_orcid_client/contributor_mapper.rb

@@ -38,7 +38,6 @@ class SulOrcidClient
       }
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def name_from_structured_value(structured_value)
       forename = structured_value.find { |name_part| name_part.type == 'forename' }&.value
       surname = structured_value.find { |name_part| name_part.type == 'surname' }&.value
@@ -46,62 +45,22 @@ class SulOrcidClient
       if forename.present? || surname.present?
         [forename, surname].compact.join(' ')
       else
-        # take first value for the Stanford University organization. Do not map the department/institute suborganization for now.
-        structured_value.first&.value
+        structured_value.first.value
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-    IDENTIFIER_TYPES = %w[ORCID ROR].freeze
 
+    # find and map an ORCID from a contributor.identifier
     def map_orcid
-      if contributor.name.first&.structuredValue.present?
-        # there could be an identifier in the structuredValue if it has a suborganization
-        if contributor.name.first.structuredValue.first&.identifier.present?
-          orcid_from_structured_value
-        else
-          orcid_from_contributor
-        end
-      else
-        orcid_from_contributor
-      end
-    end
-
-    def identifier_from_structured_value(structured_value)
-      structured_value.identifier.find { |identifier| IDENTIFIER_TYPES.include?(identifier.type) }
-    end
-
-    # the identifier in the structuredValue has the uri in a different properties than a top-level contributor.identifier
-    def map_orcid_from_structured_value(identifier)
-      {
-        uri: identifier.uri || identifier.value,
-        path: URI(identifier.uri).path.split('/').last,
-        host: identifier.type == 'ORCID' ? 'orcid.org' : 'ror.org'
-      }
-    end
+      identifier = contributor.identifier.find { |check_identifier| check_identifier.type == 'ORCID' }
+      return unless identifier
 
-    def map_orcid_from_contributor(identifier)
       {
         uri: URI.join(identifier.source.uri, identifier.value).to_s,
         path: identifier.value,
-        host: identifier.type == 'ORCID' ? 'orcid.org' : 'ror.org'
+        host: 'orcid.org'
       }
     end
 
-    # find and map an orcid from a contributor.identifier
-    def orcid_from_contributor
-      identifier = contributor.identifier.find { |check_identifier| IDENTIFIER_TYPES.include?(check_identifier.type) }
-      return unless identifier
-
-      map_orcid_from_contributor(identifier)
-    end
-
-    # find and map an orcid from a contributor.structuredValue.identifier
-    def orcid_from_structured_value
-      identifier = identifier_from_structured_value(contributor.name.first.structuredValue.first)
-      map_orcid_from_structured_value(identifier)
-    end
-
     def map_attributes
       {
         'contributor-role': map_role

data/lib/sul_orcid_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SulOrcidClient
-  VERSION = '0.6.0'
+  VERSION = '0.8.0'
 end

data/lib/sul_orcid_client/work_mapper.rb

@@ -44,7 +44,7 @@ class SulOrcidClient
     attr_reader :description, :doi
 
     def map_title
-      title = description.title.first&.value
+      title = simple_title.presence || structured_title
       raise WorkMapperError, 'Title not mapped' unless title
 
       {
@@ -54,6 +54,20 @@ class SulOrcidClient
       }
     end
 
+    def simple_title
+      first_title&.value
+    end
+
+    def structured_title
+      return if first_title.structuredValue.blank?
+
+      first_title.structuredValue.find { |sv| sv.type == 'main title' }&.value
+    end
+
+    def first_title
+      description.title.first
+    end
+
     def map_short_description
       description.note.find { |note| note.type == 'abstract' }&.value
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sul_orcid_client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Peter Mangiafico
 - Justin Littman
 bindir: exe
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Interface for interacting with the ORCID API.
 test_files: []