globus_client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e44f70f4c6ee02299ac4718e8ed5d1c2c88d58c71a4ba2c3bfbe970e2bb5df
-  data.tar.gz: b74fbc9c11f7b9c9fdadac074fe8709711f0065d03ab01fcecb159374446bb9b
+  metadata.gz: 5271ee3e081c58ef2e33f088d5c1f1357e6a685b77c9f57169b4feac40b21e72
+  data.tar.gz: 1e397fed8f4d17109eadbc3dda819ba1cd5a2a9b23b7429d81be64e06a9dc847
 SHA512:
-  metadata.gz: 26d0923724fc1301b344b190d347abd25a1c6e17c57214f424df46d3739fc64ead270e9ae8eb3eddecdfc6700d6c52bc935cda654aef8109a01b45a5d187ca39
-  data.tar.gz: a5c9e21ec3917f8c560ed34eaefb38af1253cddd582223e1986a78d165301443b689875a20a96f24ef1eb514aca19fbc7994af52c1f441b5db60d9428592cd0b
+  metadata.gz: 8bb0215d1af474ce96b479ac54238398cc348a0b8c488a0214ad6d82a5a43ef63727da2bf1319d4a240f4940008ebfbe7a521295ec9ed197e5466d8a5f5245f7
+  data.tar.gz: fb40e668a9ecb83aeaeac4098a37ea8b6915ea2315c6a625d7c99bdce0639776c0db78679f096a59579f5d38ecea44585159e0a0c1ab98da3e20756e049488e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globus_client (0.1.0)
+    globus_client (0.2.1)
       activesupport (>= 4.2, < 8)
       faraday
       zeitwerk
@@ -106,4 +106,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.19
+   2.3.26

data/lib/globus/client/endpoint.rb

@@ -15,7 +15,7 @@ module Globus
         @work_version = work_version
       end
 
-      # This is a temporary method to show parsing of data returned.
+      # NOTE: This is a temporary method to show parsing of data returned.
       def length
         objects["total"]
       end
@@ -24,13 +24,20 @@ module Globus
       def mkdir
         # transfer API does not support recursive directory creation
         paths.each do |path|
-          response = call_mkdir(path)
+          response = connection.post("#{transfer_path}/mkdir") do |req|
+            req.headers["Content-Type"] = "application/json"
+            req.body = {
+              DATA_TYPE: "mkdir",
+              path:
+            }.to_json
+          end
+
           next if response.success?
 
-          # if directory already exists
+          # Ignore error if directory already exists
           if response.status == 502
             error = JSON.parse(response.body)
-            next if error["code"] == "ExternalError.MkdirFailedExists"
+            next if error["code"] == "ExternalError.MkdirFailed.Exists"
           end
 
           UnexpectedResponse.call(response)
@@ -39,10 +46,27 @@ module Globus
 
       # Assign a user read/write permissions for a directory https://docs.globus.org/api/transfer/acl/#rest_access_create
       def set_permissions
-        path = "#{config.uploads_directory}/#{user_id}/work#{work_id}/version#{work_version}/"
-        identity = Globus::Client::Identity.new(config)
-        id = identity.get_identity_id(user_id)
-        call_access(path:, id:, user_id:)
+        response = connection.post(access_path) do |req|
+          req.body = {
+            DATA_TYPE: "access",
+            principal_type: "identity",
+            principal: identity.get_identity_id(user_id),
+            path: paths.last,
+            permissions: "rw",
+            notify_email: "#{user_id}@stanford.edu"
+          }.to_json
+          req.headers["Content-Type"] = "application/json"
+        end
+
+        return response if response.success?
+
+        # Ignore error if permissions already set for identity
+        if response.status == 409
+          error = JSON.parse(response.body)
+          return if error["code"] == "Exists"
+        end
+
+        UnexpectedResponse.call(response)
       end
 
       private
@@ -57,6 +81,10 @@ module Globus
         )
       end
 
+      def identity
+        Globus::Client::Identity.new(config)
+      end
+
       # Builds up a path from a list of path elements. E.g., input would look like:
       #     ["mjgiarlo", "work123", "version1"]
       # And this method returns:
@@ -71,48 +99,20 @@ module Globus
         [user_id, "work#{work_id}", "version#{work_version}"]
       end
 
-      def endpoint
-        "/v0.10/operation/endpoint/#{config.transfer_endpoint_id}"
-      end
+      def objects
+        # List files at an endpoint https://docs.globus.org/api/transfer/file_operations/#list_directory_contents
+        response = connection.get("#{transfer_path}/ls")
+        return JSON.parse(response.body) if response.success?
 
-      # @return [Faraday::Response]
-      def call_mkdir(path)
-        connection.post("#{endpoint}/mkdir") do |req|
-          req.headers["Content-Type"] = "application/json"
-          req.body = {
-            DATA_TYPE: "mkdir",
-            path:
-          }.to_json
-        end
+        UnexpectedResponse.call(response)
       end
 
-      # Makes the API call to Globus to set permissions
-      # @param path [String] the directory on the globus endpoint
-      # @param id [String] globus identifier associated with the user_id email
-      # @param user_id [String] user_id, not email address
-      # @return [Faraday::Response]
-      def call_access(path:, id:, user_id:)
-        response = connection.post("#{endpoint}/access") do |req|
-          req.body = {
-            DATA_TYPE: "access",
-            principal_type: "identity",
-            principal: id,
-            path:,
-            permissions: "rw",
-            notify_email: "#{user_id}@stanford.edu"
-          }.to_json
-          req.headers["Content-Type"] = "application/json"
-        end
-        UnexpectedResponse.call(response) unless response.success?
-
-        response
+      def transfer_path
+        "/v0.10/operation/endpoint/#{config.transfer_endpoint_id}"
       end
 
-      def objects
-        # List files at an endpoint https://docs.globus.org/api/transfer/file_operations/#list_directory_contents
-        response = connection.get("#{endpoint}/ls")
-        UnexpectedResponse.call(response) unless response.success?
-        JSON.parse(response.body)
+      def access_path
+        "/v0.10/endpoint/#{config.transfer_endpoint_id}/access"
       end
     end
   end

data/lib/globus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Globus
   class Client
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globus_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Aaron Collier
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport