mais_orcid_client 0.4.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc18f86e894ccbe78b835023154bda7b47bfea027bbac35e2639ce780691183
-  data.tar.gz: 4ca18413e81bf9ee03f731c8b799fc30095b29de13e1e91e5c662b521dc21f1d
+  metadata.gz: 4fd365e002189b3f5865c0f890851f47bdb96252dfec8c76036db3debfb55773
+  data.tar.gz: 2c1da5d83bece19afa22b0030ffe846e09de4b2d7c26ee7b8f380474e7c64d04
 SHA512:
-  metadata.gz: b66a9f5531913fe22f347f53f6f872b9292c98bae7a1b0cf47f85f058b8c32df57d7226ba112ca5f7a38e9e95d1d704d9e54704cd4ae0fb2664a02f8973807ed
-  data.tar.gz: b13aaef08ca495384919ad30db4bb666611cfbbcc5a7629f0a747e3537694224b9d008370d19ddad622467475c9ced50d8f9cce3d5f703781e0dbf253b0e3bfe
+  metadata.gz: 92a637eaf9bf68af95c7bb7d8da4de0fc38efd95c5f96c84590b342ff0e68b36da8304e3a6378a740a73c2d4cc26184b96570db340db596aa3d90d45ee3edfc1
+  data.tar.gz: 2c0d11e4a6bde90e0464425a0d36562f0c57f02b84217aedb4266581206a71f4804e4c788a2eee585ad46d8920acaaabbea132ca6786e34c913bee98ace88f01

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    mais_orcid_client (0.4.0)
+    mais_orcid_client (1.0.1)
       activesupport (>= 4.2)
       faraday
       faraday-retry
       oauth2
+      ostruct
       zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -26,37 +27,38 @@ GEM
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    byebug (11.1.3)
+    byebug (12.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.2)
     crack (1.0.0)
       bigdecimal
       rexml
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.1)
     docile (1.4.1)
     drb (2.2.1)
-    faraday (2.12.2)
+    faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    faraday-retry (2.2.1)
+    faraday-retry (2.3.1)
       faraday (~> 2.0)
     hashdiff (1.1.2)
     hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.11.3)
     jwt (2.10.1)
       base64
     language_server-protocol (3.17.0.4)
-    logger (1.6.6)
-    minitest (5.25.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     net-http (0.6.0)
@@ -68,17 +70,19 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    ostruct (0.6.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
+    prism (1.4.0)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.9)
+    rack (3.1.13)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.10.0)
-    rexml (3.4.0)
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -92,30 +96,37 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.71.2)
+    rubocop (1.75.3)
       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.44.0, < 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.44.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)
@@ -132,17 +143,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.7)
+    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.2)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
@@ -165,4 +177,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.13
+   2.6.8

data/README.md

@@ -25,12 +25,17 @@ For one-off requests:
 require "mais_orcid_client"
 
 # NOTE: The settings below live in the consumer, not in the gem.
+# The user_agent string can be changed by consumers as requested by MaIS for tracking
 client = MaisOrcidClient.configure(
   client_id: Settings.mais_orcid.client_id,
   client_secret: Settings.mais_orcid.client_secret,
-  base_url: Settings.mais_orcid.base_url
+  base_url: Settings.mais_orcid.base_url,
+  token_url: Settings.mais_orcid.token_url,
+  user_agent: 'some-user-agent-string-to-send-in-requests' # defaults to 'stanford-library-sul-pub'
 )
-client.fetch_orcid_user(sunetid: 'nataliex')
+client.fetch_orcid_user(sunetid: 'nataliex') # get a single user by sunet
+client.fetch_orcid_user(orcid: '0000-1111-2222-3333-4444') # get a single user by orcidid
+client.fetch_orcid_users # return all users
 ```
 
 You can also invoke methods directly on the client class, which is useful in a
@@ -43,7 +48,8 @@ to be sure configuration has already occurred, e.g.:
 MaisOrcidClient.configure(
   client_id: Settings.mais_orcid.client_id,
   client_secret: Settings.mais_orcid.client_secret,
-  base_url: Settings.mais_orcid.base_url
+  base_url: Settings.mais_orcid.base_url,
+  token_url: Settings.mais_orcid.token_url
 )
 
 # app/services/my_mais_orcid_service.rb
@@ -72,6 +78,7 @@ To record new cassettes:
 2. Add your new spec with a new cassette name (or delete a previous cassette to re-create it).
 3. Run just that new spec (important: else previous specs may use cassettes that have redacted credentials, causing your new spec to fail).
 4. You should get a new cassette with the name you specified in the spec.
-5. The cassette should have access tokens and secrets sanitized by the config in `spec_helper.rb`, but you can double check, EXCEPT for user access tokens in the user response.  These should be sanitized manaully (e.g. "access_token":"8d13b8bb-XXXX-YYYY-b7d6-87aecd5a8975")
+5. The cassette should have access tokens and secrets sanitized by the config in `spec_helper.rb`, but you can double check.  The one exception is the access_token for each ORCID user, these need to be set to "private_access_token" in the cassette manually, as VCR filter_sensitive_data can only replace the first instance.
 6. Set your configuration at the top of the spec back to the fake client_id and client_secret values.
+7. The spec that checks for a raised exception when fetching all users may need to be handcrafted in the cassette to look it raised a 500.  It's hard to get the actual URL to produce a 500 on this call.
 7. Re-run all the specs - they should pass now without making real calls.

data/lib/mais_orcid_client/authenticator.rb

@@ -18,8 +18,8 @@ class MaisOrcidClient
     # @return [String]
     def token
       client = OAuth2::Client.new(client_id, client_secret, site: base_url,
-                                                            token_url: '/api/oauth/token',
-                                                            authorize_url: '/api/oauth/authorize',
+                                                            token_url: '/oauth2/token',
+                                                            authorize_url: '/oauth2/authorize',
                                                             auth_scheme: :request_body)
       client.client_credentials.get_token.token
     end

data/lib/mais_orcid_client/token_wrapper.rb

@@ -6,7 +6,7 @@ class MaisOrcidClient
     def self.refresh(config)
       yield
     rescue UnexpectedResponse::UnauthorizedError
-      config.token = Authenticator.token(config.client_id, config.client_secret, config.base_url)
+      config.token = Authenticator.token(config.client_id, config.client_secret, config.token_url)
       yield
     end
   end

data/lib/mais_orcid_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class MaisOrcidClient
-  VERSION = '0.4.0'
+  VERSION = '1.0.1'
 end

data/lib/mais_orcid_client.rb

@@ -6,6 +6,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'faraday'
 require 'faraday/retry'
 require 'oauth2'
+require 'ostruct'
 require 'singleton'
 require 'zeitwerk'
 
@@ -27,13 +28,16 @@ class MaisOrcidClient
     # @param client_id [String] the client identifier registered with MAIS
     # @param client_secret [String] the client secret to authenticate with MAIS
     # @param base_url [String] the base URL for the API
-    def configure(client_id:, client_secret:, base_url:)
+    # @param token_url [String] the base token URL for authentication (getting token)
+    # @param user_agent [String] the user agent to use for requests (default: 'stanford-library-sul-pub')
+    def configure(client_id:, client_secret:, base_url:, token_url:, user_agent: 'stanford-library-sul-pub')
       # rubocop:disable Style/OpenStructUse
       instance.config = OpenStruct.new(
-        token: Authenticator.token(client_id, client_secret, base_url),
+        token: Authenticator.token(client_id, client_secret, token_url),
         client_id:,
         client_secret:,
-        base_url:
+        base_url:,
+        user_agent:
       )
       # rubocop:enable Style/OpenStructUse
 
@@ -60,9 +64,8 @@ class MaisOrcidClient
                                      result[:last_updated])
         return orcid_users if limit && limit == orcid_users.size
       end
-      # Currently next is always present, even on last page. (This may be changed in future.)
       next_page = response.dig(:links, :next)
-      return orcid_users if last_page?(response[:links])
+      return orcid_users if next_page.nil? || next_page.empty?
     end
   end
   # rubocop:enable Metrics/MethodLength
@@ -110,14 +113,10 @@ class MaisOrcidClient
     path
   end
 
-  def last_page?(links)
-    links[:self] == links[:last]
-  end
-
   # rubocop:disable Metrics/MethodLength
   def get_response(path, allow404: false)
     TokenWrapper.refresh(config) do
-      response = conn.get("/mais/orcid/v1#{path}")
+      response = conn.get("/orcid/v1#{path}")
 
       return if allow404 && response.status == 404
 
@@ -133,6 +132,7 @@ class MaisOrcidClient
     end
   end
 
+  # rubocop:disable Metrics/AbcSize
   def conn
     conn = Faraday.new(url: config.base_url) do |faraday|
       faraday.request :retry, max: 3,
@@ -142,10 +142,11 @@ class MaisOrcidClient
     end
     conn.options.timeout = 500
     conn.options.open_timeout = 10
-    conn.headers[:user_agent] = 'stanford-library-sul-pub'
+    conn.headers[:user_agent] = config.user_agent
     conn.headers[:authorization] = "Bearer #{config.token}"
     conn
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   # @param [string] orcidid which can include a full URI, e.g. "https://sandbox.orcid.org/0000-0002-7262-6251"

data/mais_orcid_client.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday-retry'
   spec.add_dependency 'oauth2'
+  spec.add_dependency 'ostruct'
   spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mais_orcid_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Peter Mangiafico
 - Justin Littman
 bindir: exe
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement