files.com 1.0.486 → 1.0.487

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322c6e72224efa5614973b2af891e64fa439ae20abf0c7660b53ff4c2b54055c
-  data.tar.gz: 3e32e5563c2c663634074e5639674fe5b734c4ba8de49829e454cab4ca9c596a
+  metadata.gz: b7b26950c315d418ad5a98128863c5e09a92513a6b61c69c0f124355c50979fa
+  data.tar.gz: 35d0001958e3d7cd9c683ab85c13c7068284a281701f9848b3ab3a10f03c21ce
 SHA512:
-  metadata.gz: 75490c41da14ebe46d5dca8c79653a9b8158dbe14297d3888ac1bde6cca684e36aa8c6be063360f9b05aae2dd8940104bb5efa3a9d23469f7e23a425fc85fe35
-  data.tar.gz: d6546b9dbbc10027955c872401c395f7a722b5528b8c2c4ef214a80c4747fe47b6bedbeae72babed3bc8f34d5296f109dff1574651f058f28090528ebda6aa7b
+  metadata.gz: 17f5f0610765f124fa5b9612169094e5523da4b5acadb80a4274bacf5ef4c65a35506dac1474a71c21366581453c1e56d8ac7ab5fb576ef20fd2ac20a3f7bdf9
+  data.tar.gz: 70990797609a9c7017fa96d260d358418bf30d0a11a4b503a26534df0cb66c64d11f801f0e7796c1dd8e7916a2b2e83e339bf2adce44d1c492704a9ccf392dc3

data/_VERSION

@@ -1 +1 @@
-1.0.486
+1.0.487

data/lib/files.com/api_client.rb

@@ -235,10 +235,13 @@ module Files
         end
 
         case e
-        when Faraday::ClientError
-          handle_error_response(e.response, error_context)
-        when Faraday::ServerError
-          handle_network_error(e, error_context, num_retries, base_url)
+        when Faraday::ClientError, Faraday::ServerError
+          if e.response
+            handle_error_response(e.response, error_context)
+          else
+            handle_network_error(e, error_context, num_retries, base_url)
+          end
+
         else
           raise
         end
@@ -299,10 +302,10 @@ module Files
       end
     end
 
-    private def handle_network_error(error, _context, num_retries, base_url = nil)
+    private def handle_network_error(error, context, num_retries, base_url = nil)
       base_url ||= Files.base_url
 
-      Util.log_error("Network error", error_message: error.message)
+      Util.log_error("Network error", error_message: error.message, request_id: context.request_id)
       message = "Could not connect to Files.com at URL #{base_url}. Please check your internet connection and try again. If this problem persists, you should check Files.com's service status at https://status.files.com, or contact your primary account representative."
       message += " Request was retried #{num_retries} times." if num_retries > 0
       message += "\n\n(Network error: #{error.message})"

data/lib/files.com/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Files
-  VERSION = "1.0.486"
+  VERSION = "1.0.487"
 end

data/spec/lib/api_client_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "pry"
 
 RSpec.describe Files::ApiClient do
   let(:subject) { described_class.new }
@@ -9,22 +8,22 @@ RSpec.describe Files::ApiClient do
 
     shared_examples 'a server error handler' do
       before do
-        allow(subject).to receive(:log_request).and_raise(Faraday::ServerError.new('the server responded with status 502', mock_response))
+        allow(subject).to receive(:log_request).and_raise(Faraday::ServerError.new('', mock_response))
       end
 
-      it 'retries with sleeps and raises general api connection error' do
+      it 'retries with sleeps and raises general api error' do
         expect(subject).to receive(:sleep).with(0.5).ordered
         expect(subject).to receive(:sleep).with(be_between(0.5, 1)).ordered
         expect(subject).to receive(:sleep).with(be_between(1, 2)).ordered
         expect {
           subject.execute_request_with_rescues(1, context) { 'empty block' }
-        }.to raise_error(Files::APIConnectionError, error_message)
+        }.to raise_error(Files::APIError, error_message)
       end
     end
 
     context 'when response is a valid json' do
       it_behaves_like 'a server error handler' do
-        let(:error_message) { "Could not connect to Files.com at URL 1. Please check your internet connection and try again. If this problem persists, you should check Files.com's service status at https://status.files.com, or contact your primary account representative. Request was retried 3 times.\n\n(Network error: the server responded with status 502)" }
+        let(:error_message) { "Server Error" }
         let(:mock_response) { { status: 502, headers: {}, body: { error: error_message }.to_json } }
       end
     end
@@ -38,7 +37,7 @@ RSpec.describe Files::ApiClient do
             body: "<html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>files.com</center></body></html>"
           }
         }
-        let(:error_message) { "Could not connect to Files.com at URL 1. Please check your internet connection and try again. If this problem persists, you should check Files.com's service status at https://status.files.com, or contact your primary account representative. Request was retried 3 times.\n\n(Network error: the server responded with status 502)" }
+        let(:error_message) { "Unexpected response object from API: \"#{mock_response[:body]}\" (HTTP response code was 502)" }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.486
+  version: 1.0.487
 platform: ruby
 authors:
 - files.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable