[WIP] Isolate Board Object

Guardfile

@@ -1,6 +1,7 @@
 group :red_green_refactor, halt_on_fail: true do
   guard :rspec, cmd: 'bundle exec rspec' do
     watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^spec/.+.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
   end
 

V2_README.md

@@ -24,7 +24,7 @@ board = client.create_board(name: 'Dog Collection', description: 'A collection o
   item.add_file(name: 'dalmatian.jpg', io: File.open('path/to/dalmatian.jpg', 'r'))
   item.add_file(name: 'beagle.jpg', io: File.open('path/to/beagle.jpg', 'r'))
   item.add_file(name: 'great_dane.jpg', io: File.open('path/to/great_dane.jpg', 'r'))
-  item.add_web_url(url: 'http://www.wetransfer.com', title: 'WeTransfer Website')
+  item.add_web_url(url: 'https://www.developers.wetransfer.com', title: 'WeTransfer Dev Portal')
 end
 ```
 

lib/we_transfer_client.rb

@@ -13,16 +13,13 @@
 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'
+require_relative 'we_transfer_client/transfer'
+require_relative 'we_transfer_client/board'
 
 module WeTransfer
+  class TransferIOError < StandardError; end
   class Client
-    include WeTransfer::Client::Transfers
-    include WeTransfer::Client::Boards
-
-    class Error < StandardError
-    end
+    class Error < StandardError; end
 
     NULL_LOGGER = Logger.new(nil)
 
@@ -33,36 +30,6 @@ def initialize(api_key:, logger: NULL_LOGGER)
       @logger = logger
     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 = faraday.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
-
     def faraday
       Faraday.new(@api_url_base) do |c|
         c.response :logger, @logger
@@ -95,7 +62,7 @@ def ensure_ok_status!(response)
         true
       when 400..499
         @logger.error response
-        raise Error, "Response had a #{response.status} code, the server will not accept this request even if retried"
+        raise Error, JSON.parse(response.body, symbolize_names: true)[:message]
       when 500..504
         @logger.error response
         raise Error, "Response had a #{response.status} code, we could retry"

lib/we_transfer_client/board.rb

@@ -0,0 +1,51 @@
+module WeTransfer
+  class Board
+    attr_reader :remote_board
+
+    def initialize(client:, name:, description: nil)
+      @client = client
+      @remote_board = create_remote_board(name: name, description: description)
+      @builder = WeTransfer::BoardBuilder.new(client: @client)
+    end
+
+    def add_items
+      yield(@builder)
+      add_items_to_remote_board(future_items: @builder.items)
+    rescue LocalJumpError
+      raise ArgumentError, 'No items where added to the board'
+    end
+
+    def upload_file!(io:, name: File.basename(io.to_path))
+      local_file = @builder.select_file_on_name(name: name)
+      local_file.upload_file(io: io)
+    end
+
+    def complete_file!(name:)
+      local_file = @builder.select_file_on_name(name: name)
+      local_file.complete_file
+    end
+
+    private
+
+    def create_remote_board(name:, description:, future_board_class: FutureBoard)
+      future_board = future_board_class.new(name: name, description: description)
+      @client.authorize_if_no_bearer_token!
+      response = @client.faraday.post(
+        '/v2/boards',
+        JSON.pretty_generate(future_board.to_initial_request_params),
+        @client.auth_headers.merge('Content-Type' => 'application/json')
+      )
+      @client.ensure_ok_status!(response)
+      WeTransfer::RemoteBoard.new(JSON.parse(response.body, symbolize_names: true))
+    end
+
+    def add_items_to_remote_board(future_items:)
+      future_items.group_by(&:class).each do |_group, grouped_items|
+        grouped_items.each do |item|
+          item.add_to_board(remote_board: @remote_board)
+        end
+      end
+      @remote_board
+    end
+  end
+end

lib/we_transfer_client/board_builder.rb

@@ -1,33 +1,33 @@
-class BoardBuilder
-  attr_reader :items
-  class TransferIOError < StandardError; end
+module WeTransfer
+  class BoardBuilder
+    attr_reader :files, :links
 
-  def initialize
-    @items = []
-  end
+    def initialize(client:)
+      @client = client
+      @files = []
+      @links = []
+    end
 
-  def add_file(name:, io:)
-    ensure_io_compliant!(io)
-    @items << FutureFile.new(name: name, io: io)
-  end
+    def items
+      (@files + @links).flatten
+    end
 
-  def add_file_at(path:)
-    add_file(name: File.basename(path), io: File.open(path, 'rb'))
-  end
+    def add_file(name:, size:)
+      @files << FutureFile.new(name: name, size: size, client: @client)
+    end
 
-  def add_web_url(url:, title: url)
-    @items << FutureLink.new(url: url, title: title)
-  end
+    def add_file_at(path:)
+      add_file(name: File.basename(path), size: File.size(path))
+    end
 
-  private
+    def add_web_url(url:, title: url)
+      @links << FutureLink.new(url: url, title: title, client: @client)
+    end
 
-  def ensure_io_compliant!(io)
-    io.seek(0)
-    io.read(1) # Will cause things like Errno::EACCESS to happen early, before the upload begins
-    io.seek(0) # Also rewinds the IO for later uploading action
-    size = io.size # Will cause a NoMethodError
-    raise TransferIOError, "#{File.basename(io)}, given to add_file has a size of 0" if size <= 0
-  rescue NoMethodError
-    raise TransferIOError, "#{File.basename(io)}, given to add_file must respond to seek(), read() and size(), but #{io.inspect} did not"
+    def select_file_on_name(name:)
+      file = files.select { |f| f.name == name }.first
+      return file if file
+      raise WeTransfer::TransferIOError, 'File not found'
+    end
   end
 end

lib/we_transfer_client/future_board.rb

@@ -1,32 +1,17 @@
-class FutureBoard
-  attr_reader :name, :description, :items
+module WeTransfer
+  class FutureBoard
+    attr_reader :name, :description
 
-  def initialize(name:, description: nil, items: [])
-    @name = name
-    @description = description
-    @items = items
-  end
-
-  def files
-    @items.select { |item| item.class == FutureFile }
-  end
-
-  def links
-    @items.select { |item| item.class == FutureLink }
-  end
-
-  def to_initial_request_params
-    {
-      name: name,
-      description: description,
-    }
-  end
+    def initialize(name:, description: '')
+      @name = name.to_s
+      @description = description.to_s
+    end
 
-  def to_request_params
-    {
-      name: name,
-      description: description,
-      items: items.map(&:to_request_params),
-    }
+    def to_initial_request_params
+      {
+        name: name,
+        description: description,
+      }
+    end
   end
 end