sul_orcid_client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8b24483a206de34db6bc21becab54234e75353619cbf8f81769bb5a498f02c7
-  data.tar.gz: 66000cc3d23ea9772c1769bad446a4cc029b8aae8b6b0c5cd7b22a3b7a0c6640
+  metadata.gz: c69ff816dc3d9337266431f30425887794ef50077d5e66efa667b47c337704b6
+  data.tar.gz: c3b186808e1c8fa4f1ebda219f9b23fc313dfea14e87eec7025f10609d96a221
 SHA512:
-  metadata.gz: 3c0966d940278bfc2d4a905c1535d8000b68a32f7056be5b6ab61e03b647e64dae9a54868c9eed1775d7f12b58772b4d0615acb67155d51030a9bf6c27c0fe31
-  data.tar.gz: e4deb9f7563d2117ee600ed2cd00095c78e486b576efbbbbdc237ab6f8c672574a2fa94325193bcc841ded6a8d280cad11adb80cc88d7d074666af93b95476a3
+  metadata.gz: c87d4cef98681e21bd0f3cc170f90dd3a4160f3e6162e32d9d5eff9bafe320688aeb45305402b1b364f4b167dd16c4cc08f9afeedfadb993a6058fa44a1cbb79
+  data.tar.gz: c6034b1e4f487acadce12faa1c296206faa9fdc5bcde86bf981dfd050f4e825f927947ef24683417fbf22c7a84af28e46cf2fa71d3df953c1231f840bd19e1b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sul_orcid_client (0.5.0)
+    sul_orcid_client (0.6.0)
       activesupport (>= 4.2)
       cocina-models (~> 0.90)
       faraday
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -27,13 +27,13 @@ GEM
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     attr_extras (7.1.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    byebug (11.1.3)
-    cocina-models (0.99.4)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    byebug (12.0.0)
+    cocina-models (0.104.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -48,15 +48,15 @@ GEM
       thor
       zeitwerk (~> 2.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
     deprecation (1.1.0)
       activesupport
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
       logger
@@ -67,12 +67,12 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.7.1)
+    dry-struct (1.8.0)
       dry-core (~> 1.1)
       dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.8.2)
+    dry-types (1.8.3)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -83,97 +83,107 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.12.2)
+    faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
-    faraday-retry (2.2.1)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
-    hashdiff (1.1.2)
+    hashdiff (1.2.0)
     hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.9.1)
+    json (2.12.2)
     jsonpath (1.1.5)
       multi_json
-    jwt (2.10.1)
+    jwt (3.1.2)
       base64
-    language_server-protocol (3.17.0.4)
-    logger (1.6.6)
-    minitest (5.25.4)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
     multi_json (1.15.0)
-    multi_xml (0.7.1)
+    multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.2-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    oauth2 (2.0.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
+    oauth2 (2.0.12)
+      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)
-      version_gem (~> 1.1)
+      snaky_hash (~> 2.0, >= 2.0.3)
+      version_gem (>= 1.1.8, < 3)
     openapi_parser (1.0.0)
-    optimist (3.2.0)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    optimist (3.2.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    public_suffix (6.0.1)
+    prism (1.4.0)
+    public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.1.9)
+    rack (3.1.16)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     regexp_parser (2.10.0)
-    rexml (3.4.0)
-    rspec (3.13.0)
+    rexml (3.4.1)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.71.2)
+    rspec-support (3.13.4)
+    rubocop (1.77.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.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.38.0, < 2.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-performance (1.23.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.4.0)
-      rubocop (~> 1.61)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
@@ -182,10 +192,10 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    super_diff (0.15.0)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
+    super_diff (0.16.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
@@ -195,17 +205,18 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
+    uri (1.0.3)
     vcr (6.3.1)
       base64
-    version_gem (1.1.4)
-    webmock (3.25.0)
+    version_gem (1.1.8)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.3)
 
 PLATFORMS
+  arm64-darwin-23
   arm64-darwin-24
   x86_64-darwin-19
   x86_64-darwin-22
@@ -227,4 +238,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.14
+   2.6.9

data/lib/sul_orcid_client/cocina_support.rb

@@ -2,17 +2,7 @@
 
 class SulOrcidClient
   # Helper methods for working with Orcid in Cocina
-  # NOTE: there is similar code in dor_indexing_app which fetches
-  # ORCIDs out of cocina.  Consider consolidating at some point or keeping in sync.
-  # see https://github.com/sul-dlss/dor_indexing_app/blob/main/app/services/orcid_builder.rb
-  # and https://github.com/sul-dlss/dor_indexing_app/issues/1022
   class CocinaSupport
-    # @param [Cocina::Models::Contributor] contributor to check
-    # @return [Boolean] true unless the contributor has a citation status of false
-    def self.cited?(contributor)
-      contributor.note.none? { |note| note.type == 'citation status' && note.value == 'false' }
-    end
-
     # @param [Cocina::Models::Contributor] contributor to check
     # @return [String, nil] orcid id including host if present
     # rubocop:disable Metrics/AbcSize
@@ -30,13 +20,5 @@ class SulOrcidClient
       URI.join(identifier.source.uri, identifier.value).to_s
     end
     # rubocop:enable Metrics/AbcSize
-
-    # @param [Cocina::Models::Description] description containing contributors to check
-    # @return [Array<String>] orcid ids including host if present
-    # Note that non-cited contributors are excluded.
-    def self.cited_orcidids(description)
-      cited_contributors = description.contributor.select { |contributor| cited?(contributor) }
-      cited_contributors.filter_map { |contributor| orcidid(contributor) }
-    end
   end
 end

data/lib/sul_orcid_client/contributor_mapper.rb

@@ -13,8 +13,6 @@ class SulOrcidClient
     end
 
     def map
-      return unless CocinaSupport.cited?(contributor)
-
       {
         'credit-name': map_credit_name,
         'contributor-orcid': map_orcid,
@@ -40,19 +38,49 @@ 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
-      [forename, surname].join(' ')
+
+      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
+      end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     IDENTIFIER_TYPES = %w[ORCID ROR].freeze
 
     def map_orcid
-      identifier = contributor.identifier.find { |check_identifier| IDENTIFIER_TYPES.include?(check_identifier.type) }
+      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
 
-      return unless identifier
+    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
 
+    def map_orcid_from_contributor(identifier)
       {
         uri: URI.join(identifier.source.uri, identifier.value).to_s,
         path: identifier.value,
@@ -60,6 +88,20 @@ class SulOrcidClient
       }
     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.5.0'
+  VERSION = '0.6.0'
 end

data/lib/sul_orcid_client.rb

@@ -93,7 +93,7 @@ class SulOrcidClient
     num_pages = (num_results / max_num_returned.to_f).ceil
 
     # we already have page 1 of the results
-    (1..num_pages - 1).each do |page_num|
+    (1..num_pages - 1).each do |page_num| # rubocop:disable Lint/AmbiguousRange
       response = get("/v3.0/#{search_method}/?q=#{query}&start=#{(page_num * max_num_returned) + 1}&rows=#{max_num_returned}")
       total_response[response_name] += response[response_name]
     end

data/sul_orcid_client.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |spec|
 
   spec.summary = 'Interface for interacting with the ORCID API.'
   spec.description = 'This provides API interaction with the ORCID API'
-  spec.homepage = 'https://github.com/sul-dlss/sul_orcid_client'
+  spec.homepage = 'https://github.com/sul-dlss/orcid_client'
   spec.required_ruby_version = '>= 3.2.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/sul-dlss/sul_orcid_client'
-  spec.metadata['changelog_uri'] = 'https://github.com/sul-dlss/sul_orcid_client/releases'
+  spec.metadata['source_code_uri'] = 'https://github.com/sul-dlss/orcid_client'
+  spec.metadata['changelog_uri'] = 'https://github.com/sul-dlss/orcid_client/releases'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sul_orcid_client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Mangiafico
 - Justin Littman
 bindir: exe
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,12 +269,12 @@ files:
 - lib/sul_orcid_client/version.rb
 - lib/sul_orcid_client/work_mapper.rb
 - sul_orcid_client.gemspec
-homepage: https://github.com/sul-dlss/sul_orcid_client
+homepage: https://github.com/sul-dlss/orcid_client
 licenses: []
 metadata:
-  homepage_uri: https://github.com/sul-dlss/sul_orcid_client
-  source_code_uri: https://github.com/sul-dlss/sul_orcid_client
-  changelog_uri: https://github.com/sul-dlss/sul_orcid_client/releases
+  homepage_uri: https://github.com/sul-dlss/orcid_client
+  source_code_uri: https://github.com/sul-dlss/orcid_client
+  changelog_uri: https://github.com/sul-dlss/orcid_client/releases
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Interface for interacting with the ORCID API.
 test_files: []