Implement create_transfer_and_upload_files

Author: arnoFleming

README.md

@@ -75,14 +75,26 @@ client = WeTransfer::Client.new(api_key: ENV.fetch('WT_API_KEY'))
 Now that you've got the client set up you can use  `create_transfer_and_upload_files` to, well, create a transfer, and upload all files!
 
 ```ruby
-transfer = client.create_transfer_and_upload_files(message: 'All the Things') do |upload|
-  upload.add_file_at(path: '/path/to/local/file.jpg')
-  upload.add_file_at(path: '/path/to/another/local/file.jpg')
-  upload.add_file(name: 'README.txt', io: StringIO.new("You should read All the Things!"))
+client.create_transfer_and_upload_files(message: 'All the Things') do |transfer|
+  transfer.add_file(io: File.open('Gemfile'))
+  transfer.add_file(
+    name: 'hello_world.rb',
+    io: File.open('path/to/different_name.rb')
+  )
+  transfer.add_file(
+    name: 'README.txt',
+    size: 31,
+    io: StringIO.new("You should read All the Things!")
+  )
 end
 
+transfer = client.transfer
+
 # To get a link to your transfer, call `url` on your transfer object:
-transfer.url => "https://we.tl/t-123234="
+transfer.url => "https://we.tl/t-1232346"
+
+# Or inspect the whole transfer:
+puts transfer.to_json
 ```
 
 The upload will be performed at the end of the block. Depending on your file sizes and network connection speed, this might take some time.

lib/we_transfer/client.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module WeTransfer
   class Client
     class Error < StandardError; end
@@ -29,10 +27,13 @@ def create_transfer(**args, &block)
       self
     end
 
-    def create_transfer_and_upload_files(message:, &block)
-      transfer = WeTransfer::Transfer.new(args)
-      transfer.persist(&block)
+    def create_transfer_and_upload_files(**args, &block)
+      create_transfer(args, &block)
+      @transfer.upload_files
+      @transfer.complete_files
+      @transfer.finalize
 
+      self
     end
 
     def find_transfer(transfer_id)

lib/we_transfer/transfer.rb

@@ -46,8 +46,8 @@ def add_file(**args)
       self
     end
 
-    def upload_file(name:, io: nil)
-      file = find_file_by_name(name)
+    def upload_file(name:, io: nil, file: nil)
+      file ||= find_file_by_name(name)
       put_io = io || file.io
 
       raise(
@@ -64,16 +64,35 @@ def upload_file(name:, io: nil)
       end
     end
 
+    #
+    def upload_files
+      files.each do |file|
+        upload_file(
+          name: file.name,
+          file: file
+        )
+      end
+    end
+
     def upload_url_for_chunk(name:, chunk:)
       file_id = find_file_by_name(name).id
       Communication.upload_url_for_chunk(id, file_id, chunk)
     end
 
-    def complete_file(name:)
-      file = find_file_by_name(name)
+    def complete_file(name:, file: nil)
+      file ||= find_file_by_name(name)
       Communication.complete_file(id, file.id, file.multipart.chunks)
     end
 
+    def complete_files
+      files.each do |file|
+        complete_file(
+          name: file.name,
+          file: file
+        )
+      end
+    end
+
     def finalize
       Communication.finalize_transfer(self)
     end
@@ -106,7 +125,5 @@ def find_file_by_name(name)
       raise FileMismatchError unless @found_files[name]
       @found_files[name]
     end
-
-    def_delegator self, :remote_transfer_params
   end
 end

spec/features/client_creates_a_transfer_spec.rb

@@ -1,15 +1,29 @@
 require "spec_helper"
 
 describe "transfer integration" do
-  around do |example|
+  around(:each) do |example|
     WebMock.allow_net_connect!
     example.run
     WebMock.disable_net_connect!
   end
 
-  it "Create a client, a transfer, it uploads files and finalizes the transfer" do
-    client = WeTransfer::Client.new(api_key: ENV.fetch("WT_API_KEY"))
+  let(:client) { WeTransfer::Client.new(api_key: ENV.fetch("WT_API_KEY")) }
+
+  it "Convenience method create_transfer_and_upload_files does it all!" do
+    client.create_transfer_and_upload_files(message: "test transfer") do |transfer|
+      transfer.add_file(name: "small_file_with_io", size: 10, io: StringIO.new("#" * 10))
+    end
+    transfer = client.transfer
 
+    expect(transfer.files.map(&:name))
+      .to include("small_file_with_io")
+    expect(transfer.state)
+      .to eq "processing"
+    expect(transfer.url)
+      .to match %r|https://we.tl/t-|
+  end
+
+  it "Create a client, a transfer, it uploads files and finalizes the transfer" do
     client.create_transfer(message: "test transfer") do |transfer|
       transfer.add_file(name: "small_file", size: 80)
       transfer.add_file(name: "small_file_with_io", size: 10, io: StringIO.new("#" * 10))
@@ -18,8 +32,6 @@
 
     transfer = client.transfer
 
-    transfer.to_json
-
     expect(transfer.url)
       .to be_nil