files.com 1.1.784 → 1.1.785

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd5e31f4e4c09fa7272e5c337ddc01c434546c93f177fe8fecd887839326f060
-  data.tar.gz: 143a0c464a2530296c1e67243d5f8d2e3640cff840c897ae2067517147af45b7
+  metadata.gz: 826a8d11a190abdb6361a77d984ee6fa10edd1a00ae53d6899e1d4caa82f9c95
+  data.tar.gz: 8b3e481cee2fff8e991e19af4fb18490e2a177f96cca16aabefdcc1b74a76efd
 SHA512:
-  metadata.gz: 0d5eca777f0554ded3ad22b322bd8dcf959885c986c461a1d478c8097ffb00e2ee6d6741fd426cd36d0031796890f7d6ec7d0400f8c37072ae9079484a856fc7
-  data.tar.gz: f377e72e2cdb7e3f49391059d4c4c6115e506053cf7c371e6a0c2957018e701e8f3fd09ef8daeb099c498de22d8ce490826ea66cf596511bc43f8dd3f1fbaa89
+  metadata.gz: 400c4fce89d964bf7b2ee6fba2059474fc5d54b5858ab07c8e5e7c7a5c21c62ed2998921d2b479dbbe4e22c89a58340d360b54156c8fab01be150a04c085308c
+  data.tar.gz: 7ec1d135b18a5f02b7c5b68d9dd02249608617e7bc4dc14a36093c602aa862bc4054f7ea7bdbbc8f7331d0a4bba39b626b691731f56cd6ca7f44a2f1fd6e7b9e

data/_VERSION

@@ -1 +1 @@
-1.1.784
+1.1.785

data/lib/files.com/api_client.rb

@@ -8,7 +8,7 @@ module Files
     QUERY_METHODS = %i[get head delete].freeze
     private_constant :QUERY_METHODS
 
-    # The default for a logging option this client does not set itself.
+    # The default for an option this client does not set itself.
     USE_GLOBAL = Object.new.freeze
     private_constant :USE_GLOBAL
 
@@ -27,10 +27,16 @@ module Files
     #             Files.log_level is set.
     #
     # A client created with logger: nil, log_level: nil logs no ordinary API messages.
-    def initialize(conn = nil, logger: USE_GLOBAL, log_level: USE_GLOBAL)
+    #
+    # Its API requests likewise name the library-wide Files.workspace_id, read for each request, unless
+    # +workspace_id+ gives this client its own workspace; 0 is sent as "0". A request's own workspace_id option still
+    # takes precedence, and a request whose workspace_id is nil uses this client's. Pass workspace_id: nil to name no
+    # workspace for this client's requests even when Files.workspace_id is set.
+    def initialize(conn = nil, logger: USE_GLOBAL, log_level: USE_GLOBAL, workspace_id: USE_GLOBAL)
       self.conn = conn || self.class.default_conn
       @logger = logger
       @log_level = log_level.equal?(USE_GLOBAL) ? log_level : Util.normalize_log_level(log_level)
+      @workspace_id = workspace_id
       @system_profiler = SystemProfiler.new
       @last_request_metrics = nil
     end
@@ -125,7 +131,7 @@ module Files
       else
         session_id = nil
       end
-      workspace_id = Files.workspace_id if workspace_id.nil?
+      workspace_id = default_workspace_id if workspace_id.nil?
 
       if session_id and session_id != ""
         check_session_id!(session_id)
@@ -550,6 +556,11 @@ module Files
                            )
     end
 
+    # This client's own workspace where it set one, and the library-wide one otherwise.
+    private def default_workspace_id
+      @workspace_id.equal?(USE_GLOBAL) ? Files.workspace_id : @workspace_id
+    end
+
     class RequestLogContext
       attr_accessor :body, :api_key, :method, :path, :query_params, :session_id
     end

data/lib/files.com/version.rb

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

data/spec/lib/api_client_spec.rb

@@ -402,6 +402,45 @@ RSpec.describe Files::ApiClient do
     end
   end
 
+  describe "client workspaces" do
+    around do |example|
+      original = Files.workspace_id
+      example.run
+    ensure
+      Files.workspace_id = original
+    end
+
+    it "sends each client's own workspace, and the library-wide one for clients without their own" do
+      workspace_headers = []
+      connection = Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stub|
+          stub.get("/api/rest/v1/workspaces/1") do |env|
+            workspace_headers << env.request_headers["X-Files-Workspace-Id"]
+            [ 200, { "Content-Type" => "application/json" }, { id: 1 }.to_json ]
+          end
+        end
+      end
+      find_workspace = ->(client, **options) { Files::Workspace.find(1, {}, api_key: "key", client: client, **options) }
+      Files.workspace_id = 5
+      client_a = described_class.new(connection, workspace_id: 0)
+      client_b = described_class.new(connection, workspace_id: 7)
+
+      find_workspace.call(client_a)
+      find_workspace.call(client_b)
+      Files.workspace_id = 6
+      find_workspace.call(client_a)
+      find_workspace.call(described_class.new(connection))
+      find_workspace.call(described_class.new(connection, workspace_id: nil))
+      find_workspace.call(client_b, workspace_id: 0)
+      find_workspace.call(client_b, workspace_id: "")
+      find_workspace.call(client_b, workspace_id: nil)
+
+      expect(workspace_headers).to eq([ "0", "7", "0", "6", nil, "0", nil, "7" ])
+      expect(Files.workspace_id).to eq(6)
+    end
+  end
+
   describe "network timeouts" do
     around do |example|
       original = [ Files.open_timeout, Files.read_timeout ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.1.784
+  version: 1.1.785
 platform: ruby
 authors:
 - files.com