wetransfer 0.4.4 → 0.9.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23567d27a90247e6e713d476da4d81bb01e4bebe
-  data.tar.gz: 3cec9fb058d7be32ffb779903f52a87fcc7f21c3
+SHA256:
+  metadata.gz: 7468f64daedd22e57348b1b49eda5ddafff70ece961d9df55d8ed65ac650215d
+  data.tar.gz: 2c3ac8123e0fb9fee36a03c9825bbc7eb6d32ce3aa25b00fa006c495e3c86e52
 SHA512:
-  metadata.gz: 30ec52713ad42fa38011232a1415618256d1e8c115c4da9e888eee1ad98df0658a997d42804b1044e297cecc0b2aa83e153919c491c12f8db620d94f5024af89
-  data.tar.gz: f526ff9408367d99eac5ab4eb3dd40a8933d19f8caf9e344e928472ea33b29599e70850b7b966afdefbe2bb6c7f929c098a24c06467c015eb8bd0a50cc5acd74
+  metadata.gz: 764953ea92911bd49d59ce59f68a2286bd7c389c5522ca92876413559ff610099fd43c4c7b5e1c8baaf35d1d4d7ac967da19960a5c8b2306ea90fb526d35d337
+  data.tar.gz: cddcbb08cb73f71e4b3aa3ae40743822ec0158f03d2bd52e783758b761b8e05936305704149d4dd22270019e909b2c0334c76962bbf80e9a3c61c1a630adbcb2

data/.rspec

@@ -1,3 +1,2 @@
---format progress
 --order rand
---color
+--color

data/.rubocop.yml

@@ -1,2 +1,2 @@
 inherit_gem:
-  wetransfer_style: ruby/default.yml
+  wetransfer_style: ruby/default.yml

data/.travis.yml

@@ -1,8 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-- 2.1.0
-- 2.5.1
+- 2.3
+- 2.4
+- 2.5
 - jruby-9.0
 before_install: gem install bundler -v 1.16.1
 cache: bundler

data/Guardfile

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

data/README.md

@@ -1,6 +1,8 @@
 # WeTransfer Ruby SDK
 
-An open source Ruby SDK for the WeTransfer Public API
+The Ruby SDK that makes interacting with WeTransfer's Public API a breeze
+
+This gem can be used to create transfers (as seen on WeTransfer.com) and boards (as seen in our [iOS app](https://itunes.apple.com/app/apple-store/id765359021?pt=10422800&ct=wetransfer-developer-portal&mt=8) and [Android app](https://play.google.com/store/apps/details?id=com.wetransfer.app.live&referrer=utm_source%3Dwetransfer%26utm_medium%3Ddeveloper-portal) ) alike.
 
 For your API key and additional info please visit our [developer portal](https://developers.wetransfer.com).
 
@@ -9,12 +11,13 @@ For your API key and additional info please visit our [developer portal](https:/
 ## Table of Contents
 
 1. [Installation](#installation)
-2. [Usage](#usage)
-3. [Super simple transfers](#super-simple-transfers)
-4. [Development](#development)
-5. [Contributing](#contributing)
-6. [License](#license)
-7. [Code of Conduct](#code-of-conduct)
+1. [Getting started](#getting-started)
+1. [Transfers](#transfers)
+1. [Boards](#boards)
+1. [Development](#development)
+1. [Contributing](#contributing)
+1. [License](#license)
+1. [Code of Conduct](#code-of-conduct)
 
 ## Installation
 
@@ -26,82 +29,122 @@ gem 'wetransfer'
 
 And then execute:
 
-    $ bundle
+    bundle install
 
 Or install it yourself as:
 
-    $ gem install wetransfer
-
-## Usage
+    gem install wetransfer
 
-### Minimalist transfers
+## Getting started
 
 You'll need to retrieve an API key from [our developer portal](https://developers.wetransfer.com).
 
-Be sure to not commit this key to Github! If you do though, no worries, you can always revoke & create a new key from within the portal.
+Be sure to not commit this key to Github! If you do though, you can always revoke it and create a new key from within the portal.
 
-For configuring and storing secrets - like this API key - there are a variety of solutions. The smoothest here is creating a .env file:
+For configuring and storing secrets - like this API key - there are a variety of solutions. The smoothest here is creating a `.env` file, and use a gem like [dotenv](https://github.com/bkeepers/dotenv).
 
 Now that you've got a wonderful WeTransfer API key, create a .env file in your project folder:
 
-    $ touch .env
+    touch .env
+
+You don't want the contents of this file to leave your system. Ever.
+
+If the `.env` file is new, make sure to add it to your `.gitignore`, using the following command:
+
+    echo .env >> .gitignore
 
-Check your `.gitignore` file and make sure it has `.env` listed!
+Open the file in your text editor and add this line:
 
-Now, open the file in your text editor and add this line:
+    WT_API_KEY=<your api key>
 
-`WT_API_KEY=<your api key>` (without the <> brackets!)
+Make sure to replace `<your api key>` by your actual api key. Don't include the pointy brackets!
 
-Great! Now you can go to your project file and create the client:
+Great! Now you can go to your project file and use the client.
+
+## Transfers
+
+A transfer is a collection of files that can be created once, and downloaded until it expires. Once a transfer is ready for sharing, it is closed for modifications.
 
 ```ruby
 # In your project file:
 require 'we_transfer_client'
 
-@client = WeTransferClient.new(api_key: ENV.fetch('WT_API_KEY'))
+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` to, well, create a transfer!
+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(name: "My wonderful transfer", description: "I'm so excited to share this") do |upload|
+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("This is the contents of the file"))
-  upload.add_web_url(url: "https://www.the.url.you.want.to.share.com", title: "title of the url"))
+  upload.add_file(name: 'README.txt', io: StringIO.new("You should read All the Things!"))
 end
 
-transfer.shortened_url => "https://we.tl/SSBsb3ZlIHJ1Ynk="
+# To get a link to your transfer, call `url` on your transfer object:
+transfer.url => "https://we.tl/t-123234="
 ```
 
-The upload will be performed at the end of the block.
+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.
+
+What are you waiting for? Open that link in your browser! Chop chop.
+
+## Boards
+
+A board is a collection of files and links, but it is open for modifications. Like your portfolio: While working, you can make adjustments to it. A board is a fantastic place for showcasing your work in progress.
+
+Boards need a WeTransfer Client to be present, just like transfers.
+
+```ruby
+# In your project file:
+require 'we_transfer_client'
+
+client = WeTransfer::Client.new(api_key: ENV.fetch('WT_API_KEY'))
+```
+
+After you create your client, you can
+
+### Create a board and upload items
+
+
+```ruby
+board = client.create_board(name: 'Meow', description: 'On Cats') do |items|
+  items.add_file(name: 'big file.jpg', io: File.open('/path/to/huge_file.jpg', 'rb')items.add_file_at(path: '/path/to/another/file.txt')
+  items.add_web_url(url: 'http://wepresent.wetransfer.com', title: 'Time well spent')
+end
+
+puts board.url # => "https://we.tl/b-923478"
+```
+
+You've just created a board. It is visible on the internet, to share it with anyone.
 
 ## Development
+
 You'll need to retrieve an API key from [our developer portal](https://developers.wetransfer.com), and as described above, store it in a local `.env` file. As always, do not commit this file to github! :)
 
 After forking and cloning down the repo, run `bundle install` to install dependencies. Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-```
-$ git clone <your fork>
-$ cd wetransfer_ruby_sdk
-$ bundle install
-```
+    git clone <your fork> ./wetransfer_ruby_sdk
+    cd wetransfer_ruby_sdk
+    bundle install
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
 To execute to ruby specs, run:
 
-```
-$ bundle exec rspec
-```
+    bundle exec rspec
 
 Please note that we use rubocop to lint this gem -- be sure to run it prior to submitting a PR for maximum mergeability.
 
-    $ bundle exec rubocop
+    bundle exec rubocop
+
+If any violations can be handled by rubocop, you can run auto-fix and it'll handle them for you, though do run the tests again and make sure it hasn't done something... unexpected.
+
+    bundle exec rubocop -a
 
-If any violations can be handled by rubocop, you can run auto-fix and it'll handle them for you, though do run the tests again and make sure it hasn't done something ... unexpected.
+For more convenience you also can run Guard, this checks all the tests and runs rubocop every time you save your files.
 
-    $ bundle exec rubocop -a
+    bundle exec guard
 
 Hooray!
 
@@ -115,4 +158,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the WeTransfer Ruby SDK project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/WeTransfer/wetransfer_ruby_sdk/blob/master/.github/CODE_OF_CONDUCT.md).
+Everyone interacting in the WeTransfer Ruby SDK project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/WeTransfer/wetransfer_ruby_sdk/blob/master/.github/CODE_OF_CONDUCT.md).

data/V2_README.md

@@ -0,0 +1,53 @@
+The process
+
+In the v2 version of the Ruby SDK we have added a new feature, mutable transfers called boards.
+
+Boards excists next to the transfers and will be mutable, so you can add new files or web_links to your board.
+
+
+To use the ruby sdk you have to Initailize a new client with your API-Key:
+
+```
+client = WeTransfer::Client.new(api_key: 'your-special-api-key')
+```
+
+### Initailize a Board
+
+Once you created that new client you can call methods to create a new board, empty or as a block:
+
+```
+board = client.create_board(name: 'File Collection', description: 'A collection of files')
+```
+or:
+```
+board = client.create_board(name: 'Dog Collection', description: 'A collection of dogs') do |item|
+  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')
+end
+```
+
+### Initialize a Transfer
+
+For initializing a transfer the process is like this:
+
+```ruby
+transfer = @client.create_transfer(name: "Dog transfer", description: "Have a look at my dogs") do |upload|
+  upload.add_file(name: 'chihuahua.jpg', io: File.open('path/to/chihuahua.jpg', 'r'))
+  upload.add_file(name: 'chow_chow.jpg', io: File.open('path/to/chow_chow.jpg', 'r'))
+end
+
+transfer.shortened_url => "https://we.tl/SSBsb3ZlIHJ1Ynk="
+```
+
+Note: For initializing a transfer you have to pass all the files directly so the backend knows what you are uploading.
+
+
+
+### uploading the files
+
+For both the transfer and board, the files are not in you transfer or collection, yet.
+
+The files need to be uploaded and finalized
+

data/examples/create_collection.rb

@@ -0,0 +1,13 @@
+require_relative 'we_transfer_client'
+require 'dotenv'
+Dotenv.load
+
+client = WeTransfer::Client.new(api_key: ENV.fetch('WT_API_KEY'))
+transfer = client.create_transfer(name: 'My amazing transfer', description: 'Hi there!') do |builder|
+  builder.add_file(name: File.basename(__FILE__), io: File.open(__FILE__, 'rb'))
+  builder.add_file(name: 'amazing.txt', io: StringIO.new('This is unbelievable'))
+  builder.add_file(name: 'huge.bin', io: File.open('/path/to/local/file.jpg', 'rb'))
+  builder.add_file_at(path: __FILE__)
+end
+
+puts transfer.shortened_url

data/examples/create_transfer.rb

@@ -2,7 +2,7 @@ require_relative 'we_transfer_client'
 require 'dotenv'
 Dotenv.load
 
-client = WeTransferClient.new(api_key: ENV.fetch('WT_API_KEY')) # , logger: Logger.new($stderr))
+client = WeTransfer::Client.new(api_key: ENV.fetch('WT_API_KEY'))
 transfer = client.create_transfer(name: 'My amazing transfer', description: 'Hi there!') do |builder|
   builder.add_file(name: File.basename(__FILE__), io: File.open(__FILE__, 'rb'))
   builder.add_file(name: 'amazing.txt', io: StringIO.new('This is unbelievable'))

data/lib/we_transfer_client.rb

@@ -1,142 +1,108 @@
 require 'faraday'
 require 'logger'
-require 'ks'
-require 'securerandom'
 require 'json'
 
-class WeTransferClient
-  require_relative 'we_transfer_client/version'
-  require_relative 'we_transfer_client/future_file_item'
-  require_relative 'we_transfer_client/future_web_item'
-  require_relative 'we_transfer_client/future_transfer'
-  require_relative 'we_transfer_client/transfer_builder'
-  require_relative 'we_transfer_client/remote_transfer'
-  require_relative 'we_transfer_client/remote_item'
-
-  class Error < StandardError
-  end
-
-  NULL_LOGGER = Logger.new(nil)
-  MAGIC_PART_SIZE = 6 * 1024 * 1024
-
-  def initialize(api_key:, logger: NULL_LOGGER)
-    @api_url_base = 'https://dev.wetransfer.com'
-    @api_key = api_key.to_str
-    @bearer_token = nil
-    @logger = logger
-  end
-
-  def create_transfer(name:, description:)
-    builder = TransferBuilder.new
-    yield(builder)
-    future_transfer = FutureTransfer.new(name: name, description: description, items: builder.items)
-    create_and_upload(future_transfer)
-  end
-
-  def create_empty_transfer(name:, description:)
-    future_transfer = FutureTransfer.new(name: name, description: description, items: [])
-    create_and_upload(future_transfer)
-  end
-
-  def create_and_upload(xfer)
-    authorize_if_no_bearer_token!
-    response = faraday.post(
-      '/v1/transfers',
-      JSON.pretty_generate(xfer.to_create_transfer_params),
-      auth_headers.merge('Content-Type' => 'application/json')
-    )
-    ensure_ok_status!(response)
-    create_transfer_response = JSON.parse(response.body, symbolize_names: true)
-
-    remote_transfer = hash_to_struct(create_transfer_response, RemoteTransfer)
-    remote_transfer.items = remote_transfer.items.map do |remote_item_hash|
-      hash_to_struct(remote_item_hash, RemoteItem)
+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'
+
+module WeTransfer
+  class Client
+    include WeTransfer::Client::Transfers
+    include WeTransfer::Client::Boards
+
+    class Error < StandardError
     end
 
-    item_id_map = Hash[xfer.items.map(&:local_identifier).zip(xfer.items)]
-
-    create_transfer_response.fetch(:items).each do |remote_item|
-      local_item = item_id_map.fetch(remote_item.fetch(:local_identifier))
-      next unless local_item.is_a?(FutureFileItem)
-      remote_item_id = remote_item.fetch(:id)
+    NULL_LOGGER = Logger.new(nil)
 
-      put_io_in_parts(
-        remote_item_id,
-        remote_item.fetch(:meta).fetch(:multipart_parts),
-        remote_item.fetch(:meta).fetch(:multipart_upload_id),
-        local_item.io
-      )
+    def initialize(api_key:, logger: NULL_LOGGER)
+      @api_url_base = 'https://dev.wetransfer.com'
+      @api_key = api_key.to_str
+      @bearer_token = nil
+      @logger = logger
+    end
 
-      complete_response = faraday.post(
-        "/v1/files/#{remote_item_id}/uploads/complete",
-        '{}',
-        auth_headers.merge('Content-Type' => 'application/json')
-      )
-      ensure_ok_status!(complete_response)
+    def upload_file(object:, file:, io:)
+      put_io_in_parts(object: object, file: file, io: io)
     end
-    remote_transfer
-  end
 
-  def hash_to_struct(hash, struct_class)
-    members = struct_class.members
-    struct_attrs = Hash[members.zip(hash.values_at(*members))]
-    struct_class.new(**struct_attrs)
-  end
+    def complete_file!(object:, file:)
+      object.prepare_file_completion(client: self, file: file)
+    end
 
-  def put_io_in_parts(item_id, n_parts, multipart_id, io)
-    chunk_size = MAGIC_PART_SIZE
-    (1..n_parts).each do |part_n_one_based|
-      response = faraday.get("/v1/files/#{item_id}/uploads/#{part_n_one_based}/#{multipart_id}", {}, auth_headers)
-      ensure_ok_status!(response)
-      response = JSON.parse(response.body, symbolize_names: true)
+    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
 
-      upload_url = response.fetch(:upload_url)
-      part_io = StringIO.new(io.read(chunk_size)) # needs a lens
-      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)
+    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
-  end
 
-  def faraday
-    Faraday.new(@api_url_base) do |c|
-      c.response :logger, @logger
-      c.adapter Faraday.default_adapter
-      c.headers = { 'User-Agent' => "WetransferRubySdk/#{WeTransferClient::VERSION} Ruby #{RUBY_VERSION}"}
+    def faraday
+      Faraday.new(@api_url_base) do |c|
+        c.response :logger, @logger
+        c.adapter Faraday.default_adapter
+        c.headers = { 'User-Agent' => "WetransferRubySdk/#{WeTransfer::VERSION} Ruby #{RUBY_VERSION}"}
+      end
     end
-  end
 
-  def authorize_if_no_bearer_token!
-    return if @bearer_token
-    response = faraday.post('/v1/authorize', '{}', 'Content-Type' => 'application/json', 'X-API-Key' => @api_key)
-    ensure_ok_status!(response)
-    @bearer_token = JSON.parse(response.body, symbolize_names: true)[:token]
-    if @bearer_token.nil? || @bearer_token.empty?
-      raise Error, "The authorization call returned #{response.body} and no usable :token key could be found there"
+    def authorize_if_no_bearer_token!
+      return if @bearer_token
+      response = faraday.post('/v2/authorize', '{}', 'Content-Type' => 'application/json', 'X-API-Key' => @api_key)
+      ensure_ok_status!(response)
+      @bearer_token = JSON.parse(response.body, symbolize_names: true)[:token]
+      if @bearer_token.nil? || @bearer_token.empty?
+        raise Error, "The authorization call returned #{response.body} and no usable :token key could be found there"
+      end
     end
-  end
 
-  def auth_headers
-    raise 'No bearer token retrieved yet' unless @bearer_token
-    {
-      'X-API-Key' => @api_key,
-      'Authorization' => ('Bearer %s' % @bearer_token),
-    }
-  end
+    def auth_headers
+      raise 'No bearer token retrieved yet' unless @bearer_token
+      {
+        'X-API-Key' => @api_key,
+        'Authorization' => ('Bearer %s' % @bearer_token),
+      }
+    end
 
-  def ensure_ok_status!(response)
-    case response.status
-    when 200..299
-      nil
-    when 400..499
-      @logger.error { response.body }
-      raise Error, "Response had a #{response.status} code, the server will not accept this request even if retried"
-    when 500..504
-      @logger.error { response.body }
-      raise Error, "Response had a #{response.status} code, we could retry"
-    else
-      @logger.error { response.body }
-      raise Error, "Response had a #{response.status} code, no idea what to do with that"
+    def ensure_ok_status!(response)
+      case response.status
+      when 200..299
+        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"
+      when 500..504
+        @logger.error response
+        raise Error, "Response had a #{response.status} code, we could retry"
+      else
+        @logger.error response
+        raise Error, "Response had a #{response.status} code, no idea what to do with that"
+      end
     end
   end
 end