files.com 1.1.672 → 1.1.673

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb71fbac94201e3b37aa74280a43c2ccbc8b51e511a7e82abf75c268d1b0d8b
-  data.tar.gz: 2011cd5fecd34a39488376d95d043562fee2ebb5a425000193425bf384abd669
+  metadata.gz: 2c0f447b5e7b8543176cf0015a4faeb255fa1dcbcbc851c99c315ae8790ec10c
+  data.tar.gz: 84cbfcdb04f041ee2f8066c5ae5ce20f0976cfd50ef025541a0601d083b87dac
 SHA512:
-  metadata.gz: 914016be7d96a9a5ec1e404dbab7b72cdcef2aeff9abf9457d5ee32ff0af57cf0daf127ac5bb49567ff6163fc616d53d8b8b12a48da84211ace61f4b52a7a5b4
-  data.tar.gz: 274daf257661c599aebd61ac7690737dc069512059ef8c0a9bda87962b381e5179f859c90b1a2ed58bd79b08faa942144e764f002ce31cb2eddf9ed8f5892498
+  metadata.gz: a13395a04d8e6610d4270134ef6dfd441f60e4649f276781593b41048b61b3ebd6fda4f1ca7cca53be0f03851ffcc70c1b40ff5b3139cb546a56baca2b22a002
+  data.tar.gz: 000737fb292996b739973ede951603d43b19548f80c4bbca286c8ee12f2730341c298f3532624c3f782f33e683000748178ba31dd8239f215ce025eb65033de6

data/_VERSION

@@ -1 +1 @@
-1.1.672
+1.1.673

data/lib/files.com/models/file.rb

@@ -38,6 +38,49 @@ module Files
       new(path).download_file(local_path)
     end
 
+    private_class_method def self.underscore_destination_path(root, id, relative_path = nil)
+      PathUtil.normalize("_", root, id.to_s, relative_path)
+    end
+
+    def self.upload_to_remote_server(path, remote_server_id, destination = nil, options = {}, params: {})
+      destination ||= ::File.basename(path)
+      upload_file(path, underscore_destination_path("RemoteServers", remote_server_id, destination), options, params: params)
+    end
+
+    def self.copy_to_remote_server(path, remote_server_id, destination, params = {}, options = {})
+      copy(path, params.merge(destination: underscore_destination_path("RemoteServers", remote_server_id, destination)), options)
+    end
+
+    def self.move_to_remote_server(path, remote_server_id, destination, params = {}, options = {})
+      move(path, params.merge(destination: underscore_destination_path("RemoteServers", remote_server_id, destination)), options)
+    end
+
+    def self.upload_to_snapshot(path, snapshot_id, destination = nil, options = {}, params: {})
+      destination ||= ::File.basename(path)
+      upload_file(path, underscore_destination_path("Snapshots", snapshot_id, destination), options, params: params)
+    end
+
+    def self.copy_to_snapshot(path, snapshot_id, destination, params = {}, options = {})
+      copy(path, params.merge(destination: underscore_destination_path("Snapshots", snapshot_id, destination)), options)
+    end
+
+    def self.move_to_snapshot(path, snapshot_id, destination, params = {}, options = {})
+      move(path, params.merge(destination: underscore_destination_path("Snapshots", snapshot_id, destination)), options)
+    end
+
+    def self.upload_to_child_site(path, site_id, destination = nil, options = {}, params: {})
+      destination ||= ::File.basename(path)
+      upload_file(path, underscore_destination_path("Sites", site_id, destination), options, params: params)
+    end
+
+    def self.copy_to_child_site(path, site_id, destination, params = {}, options = {})
+      copy(path, params.merge(destination: underscore_destination_path("Sites", site_id, destination)), options)
+    end
+
+    def self.move_to_child_site(path, site_id, destination, params = {}, options = {})
+      move(path, params.merge(destination: underscore_destination_path("Sites", site_id, destination)), options)
+    end
+
     def self.exist?(path, options = {})
       find(path, {}, options)
       true
@@ -187,6 +230,30 @@ module Files
       @bytes_written = 0
     end
 
+    def copy_to_remote_server(remote_server_id, destination, params = {})
+      self.class.copy_to_remote_server(path, remote_server_id, destination, params, @options)
+    end
+
+    def move_to_remote_server(remote_server_id, destination, params = {})
+      self.class.move_to_remote_server(path, remote_server_id, destination, params, @options)
+    end
+
+    def copy_to_snapshot(snapshot_id, destination, params = {})
+      self.class.copy_to_snapshot(path, snapshot_id, destination, params, @options)
+    end
+
+    def move_to_snapshot(snapshot_id, destination, params = {})
+      self.class.move_to_snapshot(path, snapshot_id, destination, params, @options)
+    end
+
+    def copy_to_child_site(site_id, destination, params = {})
+      self.class.copy_to_child_site(path, site_id, destination, params, @options)
+    end
+
+    def move_to_child_site(site_id, destination, params = {})
+      self.class.move_to_child_site(path, site_id, destination, params, @options)
+    end
+
     def advise(*_args); end
 
     def atime

data/lib/files.com/path_util.rb

@@ -21,7 +21,7 @@ module Files
       new_path
     end
 
-    private_class_method def self.normalize(*paths)
+    def self.normalize(*paths)
       all_paths = paths.flatten.compact.map { |path| u8(path).gsub("\x00", "").gsub("\\", "/").split("/") }.flatten
       all_paths.map { |path| cleanpath(path) }.reject(&:empty?).join("/")
     end

data/lib/files.com/version.rb

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

data/shared/normalization_for_comparison_test_data.json

@@ -23,6 +23,8 @@
   [ "invalid_null_byte_before\u0000after", "invalid_null_byte_beforeafter" ],
   [ "a/b/c/../../hello", "a/b/c/hello" ],
   [ "a/b/c/././hello", "a/b/c/hello" ],
+  [ "remote/../path/to/file.txt", "remote/path/to/file.txt" ],
+  [ "/../../remote\\path//./to/file.txt", "remote/path/to/file.txt" ],
   [ "one_code_point_ą", "one_code_point_a" ],
   [ "two_code_points_ą", "two_code_points_a" ],
   [ "one_code_point_훯", "one_code_point_훯"],
@@ -46,4 +48,4 @@
   [ "../.", ""],
   [ "./../.", "" ],
   [ ".././..", ""]
-]
+]

data/spec/models/file_underscore_destinations_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+RSpec.describe Files::File do
+  it "copies to a remote server underscore destination" do
+    expect(described_class).to receive(:copy).with(
+      "source.txt",
+      { overwrite: true, destination: "_/RemoteServers/42/remote/path/to/file.txt" },
+      {}
+    )
+
+    described_class.copy_to_remote_server("source.txt", 42, "/../../remote\\path//./to/file.txt", { overwrite: true })
+  end
+
+  it "uploads to a remote server underscore destination using the local basename" do
+    expect(described_class).to receive(:upload_file).with(
+      "local/path/to/file.txt",
+      "_/RemoteServers/42/file.txt",
+      {},
+      params: {}
+    )
+
+    described_class.upload_to_remote_server("local/path/to/file.txt", 42)
+  end
+end

data/spec/path_util_spec.rb

@@ -11,4 +11,9 @@ RSpec.describe Files::PathUtil do
       expect(Files::PathUtil.same?(src_chars, dst_chars)).to eq(true)
     end
   end
+
+  it "normalizes API paths without changing path identity" do
+    expect(Files::PathUtil.normalize("/../../remote\\path//./to/file.txt")).to eq("remote/path/to/file.txt")
+    expect(Files::PathUtil.normalize("remote/../path/to/file.txt")).to eq("remote/path/to/file.txt")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.1.672
+  version: 1.1.673
 platform: ruby
 authors:
 - files.com
@@ -469,6 +469,7 @@ files:
 - spec/lib/api_client_spec.rb
 - spec/list_spec.rb
 - spec/models/file_spec.rb
+- spec/models/file_underscore_destinations_spec.rb
 - spec/models/folder_spec.rb
 - spec/path_util_spec.rb
 - spec/spec_helper.rb