--wip-- [skip ci]

Author: arnoFleming

lib/we_transfer/communication_helper.rb

@@ -2,7 +2,7 @@ module WeTransfer
   class CommunicationError < StandardError; end
 
   module CommunicationHelper
-    API_URI_BASE = 'https://dev.wetransfer.com'
+    API_URL_BASE = "https://dev.wetransfer.com"
     DEFAULT_HEADERS = {
       "User-Agent" => "WetransferRubySdk/#{WeTransfer::VERSION} Ruby #{RUBY_VERSION}",
       "Content-Type" => "application/json"
@@ -23,7 +23,7 @@ def api_key
     def request_as
       authorize_if_no_bearer_token!
 
-      @request_as ||= Faraday.new(API_URI_BASE) do |c|
+      @request_as ||= Faraday.new(API_URL_BASE) do |c|
         minimal_faraday_config(c)
         c.headers = auth_headers.merge DEFAULT_HEADERS
       end
@@ -40,7 +40,7 @@ def auth_headers
 
       {
         'X-API-Key' => api_key,
-        'Authorization' => ('Bearer %s' % @bearer_token),
+        'Authorization' => "Bearer #{@bearer_token}",
       }.freeze
     end
 
@@ -63,9 +63,9 @@ def ensure_ok_status!(response)
     def authorize_if_no_bearer_token!
       return @bearer_token if @bearer_token
 
-      response = Faraday.new(API_URI_BASE) do |c|
+      response = Faraday.new(API_URL_BASE) do |c|
         minimal_faraday_config(c)
-        c.headers = DEFAULT_HEADERS.merge('X-API-Key' => CommunicationHelper.api_key)
+        c.headers = DEFAULT_HEADERS.merge('X-API-Key' => api_key)
       end.post(
         '/v2/authorize',
       )

lib/we_transfer/mini_io.rb

@@ -5,6 +5,8 @@ module WeTransfer
 
   class MiniIO
     def self.mini_io_able?(io)
+      return false if io.is_a? WeTransfer::NullMiniIO
+
       io.seek(0)
       io.read(1)
       io.rewind

lib/we_transfer/transfer.rb

@@ -16,7 +16,7 @@ def self.create(message:, &block)
     end
 
     def self.find(transfer_id)
-      response = request_as.get("/v2/transfers/#{transfer_id}")
+      response = request_as.get("/v2/transfers/%s" % [transfer_id])
       ensure_ok_status!(response)
       response_body = remote_transfer_params(response.body)
       found_transfer = new(message: response_body[:message])
@@ -40,7 +40,7 @@ def persist
       raise NoFilesAddedError if @unique_file_names.empty?
 
       response = request_as.post(
-        '/v2/transfers',
+        "/v2/transfers",
         as_request_params.to_json,
       )
       ensure_ok_status!(response)
@@ -67,8 +67,7 @@ def add_file(**args)
     def upload_file(name:, io: nil)
       file = find_file_by_name(name)
       put_io = io || file.io
-
-      raise(WeTransfer::RemoteFile::NoIoError, "File with name '#{name}' cannot be uploaded.") if !WeTransfer::MiniIO.mini_io_able?(put_io) || put_io.is_a?(WeTransfer::NullMiniIO)
+      raise WeTransfer::RemoteFile::NoIoError, "File with name '#{name}' cannot be uploaded." unless WeTransfer::MiniIO.mini_io_able?(put_io)
 
       put_io = io || file.io
       put_io.rewind
@@ -89,9 +88,7 @@ def upload_file(name:, io: nil)
 
     def upload_url_for_chunk(name:, chunk:)
       file_id = find_file_by_name(name).id
-      response = request_as.get(
-        "/v2/transfers/#{id}/files/#{file_id}/upload-url/#{chunk}",
-      )
+      response = request_as.get("/v2/transfers/%s/files/%s/upload-url/%s" % [id, file_id, chunk])
       ensure_ok_status!(response)
 
       JSON.parse(response.body).fetch("url")
@@ -101,7 +98,7 @@ def complete_file(name:)
       file = find_file_by_name(name)
       body = { part_numbers: file.multipart.chunks }.to_json
       response = request_as.put(
-        "/v2/transfers/#{id}/files/#{file.id}/upload-complete",
+        "/v2/transfers/%s/files/%s/upload-complete" % [id, file.id],
         body
       )
 
@@ -110,7 +107,7 @@ def complete_file(name:)
     end
 
     def finalize
-      response = request_as.put("/v2/transfers/#{id}/finalize")
+      response = request_as.put("/v2/transfers/%s/finalize" % id)
       ensure_ok_status!(response)
       RemoteTransfer.upgrade(
         transfer: self,

lib/we_transfer/version.rb

@@ -0,0 +1,3 @@
+module WeTransfer
+  VERSION = '0.10.0.alpha1'
+end

lib/we_transfer_client.rb

@@ -5,21 +5,7 @@
 require 'json'
 require 'ks'
 
-require_relative 'we_transfer_client/version'
-require_relative 'we_transfer_client/transfer_builder'
-require_relative 'we_transfer_client/board_builder'
-require_relative 'we_transfer_client/future_file'
-require_relative 'we_transfer_client/future_link'
-require_relative 'we_transfer_client/future_transfer'
-require_relative 'we_transfer_client/future_board'
-require_relative 'we_transfer_client/remote_transfer'
-require_relative 'we_transfer_client/remote_board'
-require_relative 'we_transfer_client/remote_link'
-require_relative 'we_transfer_client/remote_file'
-require_relative 'we_transfer_client/transfers'
-require_relative 'we_transfer_client/boards'
-
-%w[communication_helper transfer mini_io we_transfer_file remote_transfer remote_file].each do |file|
+%w[communication_helper transfer mini_io we_transfer_file remote_transfer remote_file version].each do |file|
   require_relative "we_transfer/#{file}"
 end
 
@@ -54,35 +40,5 @@ def create_transfer(**args, &block)
     def find_transfer(transfer_id)
       @transfer = WeTransfer::Transfer.find(transfer_id)
     end
-
-    # def upload_file(object:, file:, io:)
-    #   put_io_in_parts(object: object, file: file, io: io)
-    # end
-
-    # def complete_file!(object:, file:)
-    #   object.prepare_file_completion(client: self, file: file)
-    # end
-
-    # def check_for_file_duplicates(files, new_file)
-    #   if files.select { |file| file.name == new_file.name }.size != 1
-    #     raise ArgumentError, 'Duplicate file entry'
-    #   end
-    # end
-
-    # def put_io_in_parts(object:, file:, io:)
-    #   (1..file.multipart.part_numbers).each do |part_n_one_based|
-    #     upload_url, chunk_size = object.prepare_file_upload(client: self, file: file, part_number: part_n_one_based)
-    #     part_io = StringIO.new(io.read(chunk_size))
-    #     part_io.rewind
-    #     response = request_as.put(
-    #       upload_url,
-    #       part_io,
-    #       'Content-Type' => 'binary/octet-stream',
-    #       'Content-Length' => part_io.size.to_s
-    #     )
-    #     ensure_ok_status!(response)
-    #   end
-    #   {success: true, message: 'File Uploaded'}
-    # end
   end
 end