globus_client 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae9be2599dca47133561cc9f50d02118d633e973f973619bf642a890d266d7d
-  data.tar.gz: 032a19fb8edf3b11740dd487415a98f14522daac3ae4966302376b902c787e01
+  metadata.gz: e189003b0a3f0592abd4fb7fabb006a3367f3cd330d83d7e46da2c2993bbbc21
+  data.tar.gz: 36c6ff9a70ddcfea7be6e1ca044b110adb536aa911adbb1626f5086737342d88
 SHA512:
-  metadata.gz: f66705c5adbda9f69f8ab99b8c02ad8b16dafcf4760b0918f63191874066691c1c46211588a197629206f6e53f72b1893748bcac04594db44afeaa1f3a40706a
-  data.tar.gz: f901d249a7b112efb537e88387aa6833759f2ec6f801277d4970a0830d7761abfe64e8a4163337ce252e2b9beb4e46410757832ecc300f649d8e21a5a6381669
+  metadata.gz: 02cd08266cd52d2a3dd86ded97c8ce0085832fb446223375ab69164ed087187611e184e7cb4555208a0fb30b477e6c8b0e212041073cce2a3c328ddf6412e0c3
+  data.tar.gz: 1d54da5c74f41e1a98ecdf0296ee948e14a9e569ed1f58a20f52c96347b1b215a4121050cef2e9c7f3d25d525a5b061e9cfe79cc8517efb1ff896cb517226962

data/.rubocop.yml

@@ -23,5 +23,6 @@ Layout/LineLength:
 
 # Naming
 Naming/PredicateName:
-  NamePrefix:
-    - has
+  ForbiddenPrefixes:
+    - is_
+    - have_

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    globus_client (0.14.0)
-      activesupport (>= 4.2, < 8)
+    globus_client (0.15.0)
+      activesupport (>= 4.2)
       faraday
       faraday-retry
       zeitwerk
@@ -10,108 +10,110 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.0)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
-    crack (0.4.5)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    faraday-retry (2.2.0)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    faraday (2.12.2)
+      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 (~> 2.0)
-    hashdiff (1.0.1)
-    i18n (1.14.1)
+    hashdiff (1.1.2)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    json (2.9.1)
+    language_server-protocol (3.17.0.4)
+    logger (1.6.6)
+    minitest (5.25.4)
+    net-http (0.6.0)
+      uri
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
+      parser (>= 3.3.1.0)
+    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)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webmock (3.19.1)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   x86_64-darwin-19

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/globus_client.svg)](https://badge.fury.io/rb/globus_client)
 [![CircleCI](https://circleci.com/gh/sul-dlss/globus_client.svg?style=svg)](https://circleci.com/gh/sul-dlss/globus_client)
-[![Code Climate](https://codeclimate.com/github/sul-dlss/globus_client/badges/gpa.svg)](https://codeclimate.com/github/sul-dlss/globus_client)
-[![Code Climate Test Coverage](https://api.codeclimate.com/v1/badges/8e6bf1a5d3fc86a6fbd0/test_coverage)](https://codeclimate.com/github/sul-dlss/globus_client/test_coverage)
+[![codecov](https://codecov.io/github/sul-dlss/globus_client/graph/badge.svg?token=ARR042OHR8)](https://codecov.io/github/sul-dlss/globus_client)
 
 # GlobusClient
 

data/api_test.rb

@@ -27,8 +27,7 @@ Benchmark.bm(20) do |benchmark| # rubocop:disable Metrics/BlockLength
 
   benchmark.report('before_perms:') do
     # Not part of the public API but this allows us to test access changes
-    @before_permissions = GlobusClient::Endpoint.new(GlobusClient.instance, user_id:,
-                                                                            path:).send(:access_rule)['permissions']
+    @before_permissions = GlobusClient::Endpoint.new(user_id:, path:).send(:access_rule)['permissions']
   end
 
   benchmark.report('has_files?:') do
@@ -49,8 +48,7 @@ Benchmark.bm(20) do |benchmark| # rubocop:disable Metrics/BlockLength
 
   benchmark.report('after_perms:') do
     # Not part of the public API but this allows us to test access changes
-    @after_permissions = GlobusClient::Endpoint.new(GlobusClient.instance, user_id:,
-                                                                           path:).send(:access_rule)['permissions']
+    @after_permissions = GlobusClient::Endpoint.new(user_id:, path:).send(:access_rule)['permissions']
   end
 
   puts "User #{user_id} exists: #{@user_exists}"

data/globus_client.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 4.2', '< 8'
+  spec.add_dependency 'activesupport', '>= 4.2'
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday-retry'
   spec.add_dependency 'zeitwerk'

data/lib/globus_client/authenticator.rb

@@ -3,14 +3,8 @@
 class GlobusClient
   # The namespace for the "login" command
   class Authenticator
-    def self.token(client_id, client_secret, auth_url)
-      new(client_id, client_secret, auth_url).token
-    end
-
-    def initialize(client_id, client_secret, auth_url)
-      @client_id = client_id
-      @client_secret = client_secret
-      @auth_url = auth_url
+    def self.token
+      new.token
     end
 
     # Request an access_token
@@ -24,16 +18,14 @@ class GlobusClient
 
     private
 
-    attr_reader :client_id, :client_secret, :auth_url
-
     def connection
-      Faraday.new(url: auth_url)
+      Faraday.new(url: GlobusClient.config.auth_url)
     end
 
     def form_data
       {
-        client_id:,
-        client_secret:,
+        client_id: GlobusClient.config.client_id,
+        client_secret: GlobusClient.config.client_secret,
         encoding: 'form',
         grant_type: 'client_credentials',
         scope: 'urn:globus:auth:scope:transfer.api.globus.org:all'

data/lib/globus_client/endpoint.rb

@@ -7,12 +7,10 @@ class GlobusClient
 
     FileInfo = Struct.new(:name, :size)
 
-    # @param client [GlobusClient] a configured instance of the GlobusClient
     # @param path [String] the path to operate on
     # @param user_id [String] a Globus user ID (e.g., a @stanford.edu email address)
     # @param notify_email [Boolean] indicates if we should ask Globus to send emails on access change (default: true)
-    def initialize(client, path:, user_id:, notify_email: true)
-      @client = client
+    def initialize(path:, user_id:, notify_email: true)
       @user_id = user_id
       @path = path
       @notify_email = notify_email
@@ -32,8 +30,8 @@ class GlobusClient
     def mkdir
       # transfer API does not support recursive directory creation
       paths.each do |path|
-        client.post(
-          base_url: client.config.transfer_url,
+        GlobusClient.instance.post(
+          base_url: GlobusClient.config.transfer_url,
           path: "#{transfer_path}/mkdir",
           body: { DATA_TYPE: 'mkdir', path: },
           expected_response: lambda { |resp|
@@ -57,18 +55,18 @@ class GlobusClient
     def delete_access_rule
       raise(StandardError, "Access rule not found for #{path}") unless access_rule_id
 
-      client.delete(
-        base_url: client.config.transfer_url,
+      GlobusClient.instance.delete(
+        base_url: GlobusClient.config.transfer_url,
         path: "#{access_path}/#{access_rule_id}"
       )
     end
 
     private
 
-    attr_reader :client, :path, :user_id, :notify_email
+    attr_reader :path, :user_id, :notify_email
 
     def globus_identity_id
-      Identity.new(client).get_identity_id(user_id)
+      Identity.new.get_identity_id(user_id)
     end
 
     # Builds up a path from a list of path elements. E.g., input would look like:
@@ -78,7 +76,7 @@ class GlobusClient
     def paths
       @paths ||= path_segments.map.with_index do |_segment, index|
         File
-          .join(client.config.uploads_directory, path_segments.slice(..index))
+          .join(GlobusClient.config.uploads_directory, path_segments.slice(..index))
           .concat(PATH_SEPARATOR)
       end
     end
@@ -99,8 +97,8 @@ class GlobusClient
     # @param files [Array<FileInfo>] an array of FileInfo structs, each of which has a name and a size
     # @param return_presence [Boolean] if true, return a boolean to indicate if any files at all are present, short-circuiting the recursive operation
     def ls_path(filepath, files, return_presence: false)
-      response = client.get(
-        base_url: client.config.transfer_url,
+      response = GlobusClient.instance.get(
+        base_url: GlobusClient.config.transfer_url,
         path: "#{transfer_path}/ls",
         params: { path: filepath }
       )
@@ -139,8 +137,8 @@ class GlobusClient
           permissions:
         }
         body[:notify_email] = user_id if notify_email
-        client.post(
-          base_url: client.config.transfer_url,
+        GlobusClient.instance.post(
+          base_url: GlobusClient.config.transfer_url,
           path: access_path,
           body:
         )
@@ -150,8 +148,8 @@ class GlobusClient
     def update_access_request(permissions:)
       raise(StandardError, "Access rule not found for #{path}") unless access_rule_id
 
-      client.put(
-        base_url: client.config.transfer_url,
+      GlobusClient.instance.put(
+        base_url: GlobusClient.config.transfer_url,
         path: "#{access_path}/#{access_rule_id}",
         body: {
           DATA_TYPE: 'access',
@@ -161,8 +159,8 @@ class GlobusClient
     end
 
     def access_rule
-      response = client.get(
-        base_url: client.config.transfer_url,
+      response = GlobusClient.instance.get(
+        base_url: GlobusClient.config.transfer_url,
         path: access_list_path,
         content_type: 'application/json'
       )
@@ -175,15 +173,15 @@ class GlobusClient
     end
 
     def transfer_path
-      "/v0.10/operation/endpoint/#{client.config.transfer_endpoint_id}"
+      "/v0.10/operation/endpoint/#{GlobusClient.config.transfer_endpoint_id}"
     end
 
     def access_path
-      "/v0.10/endpoint/#{client.config.transfer_endpoint_id}/access"
+      "/v0.10/endpoint/#{GlobusClient.config.transfer_endpoint_id}/access"
     end
 
     def access_list_path
-      "/v0.10/endpoint/#{client.config.transfer_endpoint_id}/access_list"
+      "/v0.10/endpoint/#{GlobusClient.config.transfer_endpoint_id}/access_list"
     end
   end
 end

data/lib/globus_client/identity.rb

@@ -3,15 +3,11 @@
 class GlobusClient
   # Lookup of a Globus identity ID
   class Identity
-    def initialize(client)
-      @client = client
-    end
-
     # @param user_id [String] the username in the form of an email addresss
     # @return [Hash] id and status of Globus identity
     def get_identity(user_id)
-      response = client.get(
-        base_url: client.config.auth_url,
+      response = GlobusClient.instance.get(
+        base_url: GlobusClient.config.auth_url,
         path: '/v2/api/identities',
         params: { usernames: user_id }
       )
@@ -30,9 +26,5 @@ class GlobusClient
     def get_identity_id(user_id)
       get_identity(user_id)['id']
     end
-
-    private
-
-    attr_reader :client
   end
 end

data/lib/globus_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class GlobusClient
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/lib/globus_client.rb

@@ -140,7 +140,7 @@ class GlobusClient # rubocop:disable Metrics/ClassLength
   end
 
   def mkdir(...)
-    Endpoint.new(self, ...).tap do |endpoint|
+    Endpoint.new(...).tap do |endpoint|
       endpoint.mkdir
       endpoint.allow_writes
     end
@@ -148,13 +148,13 @@ class GlobusClient # rubocop:disable Metrics/ClassLength
 
   def disallow_writes(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .disallow_writes
   end
 
   def delete_access_rule(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .delete_access_rule
   end
 
@@ -163,37 +163,37 @@ class GlobusClient # rubocop:disable Metrics/ClassLength
   #       `Endpoint#list_files`
   def list_files(**keywords, &)
     Endpoint
-      .new(self, **keywords)
+      .new(**keywords)
       .list_files(&)
   end
 
   def file_count(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .list_files { |files| return files.count }
   end
 
   def total_size(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .list_files { |files| return files.sum(&:size) }
   end
 
   def get_filenames(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .list_files { |files| return files.map(&:name) }
   end
 
   def has_files?(...)
     Endpoint
-      .new(self, ...)
+      .new(...)
       .has_files?
   end
 
   def user_valid?(...)
     Identity
-      .new(self)
+      .new
       .valid?(...)
   end
 
@@ -230,7 +230,7 @@ class GlobusClient # rubocop:disable Metrics/ClassLength
 
     # if unauthorized, token has likely expired. try to get a new token and then retry the same request(s).
     if response.status == 401
-      config.token = Authenticator.token(config.client_id, config.client_secret, config.auth_url)
+      config.token = Authenticator.token
       response = yield
     end
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: globus_client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Aaron Collier
 - Laura Wrubel
 - Mike Giarlo
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +99,6 @@ metadata:
   source_code_uri: https://github.com/sul-dlss/globus_client
   changelog_uri: https://github.com/sul-dlss/globus_client/releases
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Interface for interacting with the Globus API.
 test_files: []