From 06ec3bf03cb2c77e358402b8e7a5e057b4c35003 Mon Sep 17 00:00:00 2001 From: Arno Date: Mon, 2 Mar 2020 15:23:21 +0100 Subject: [PATCH] Updates rake to 12.3.3 Updates styles to make Rubocop happy --- lib/we_transfer_client.rb | 8 ++------ lib/we_transfer_client/remote_board.rb | 4 +--- spec/we_transfer_client/remote_file_spec.rb | 3 ++- spec/we_transfer_client/remote_link_spec.rb | 8 ++++---- wetransfer.gemspec | 4 ++-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/lib/we_transfer_client.rb b/lib/we_transfer_client.rb index b9b8371..7af00a5 100644 --- a/lib/we_transfer_client.rb +++ b/lib/we_transfer_client.rb @@ -42,9 +42,7 @@ def complete_file!(object:, 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 + raise ArgumentError, 'Duplicate file entry' if files.select { |file| file.name == new_file.name }.size != 1 end def put_io_in_parts(object:, file:, io:) @@ -76,9 +74,7 @@ def authorize_if_no_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 + raise Error, "The authorization call returned #{response.body} and no usable :token key could be found there" if @bearer_token.nil? || @bearer_token.empty? end def auth_headers diff --git a/lib/we_transfer_client/remote_board.rb b/lib/we_transfer_client/remote_board.rb index 3e3c4d6..a54ecb5 100644 --- a/lib/we_transfer_client/remote_board.rb +++ b/lib/we_transfer_client/remote_board.rb @@ -35,13 +35,11 @@ def links def to_instances(items:) items.map do |item| - begin remote_class = "Remote#{item[:type].capitalize}" Module.const_get(remote_class) .new(item) - rescue NameError + rescue NameError raise ItemTypeError, "Cannot instantiate item with type '#{item[:type]}' and id '#{item[:id]}'" - end end end end diff --git a/spec/we_transfer_client/remote_file_spec.rb b/spec/we_transfer_client/remote_file_spec.rb index d9c11be..59f7fe8 100644 --- a/spec/we_transfer_client/remote_file_spec.rb +++ b/spec/we_transfer_client/remote_file_spec.rb @@ -13,7 +13,8 @@ chunk_size: RemoteBoard::CHUNK_SIZE, }, type: 'file', - }} + } +} describe '#initializer' do it 'initialized when no url is given' do diff --git a/spec/we_transfer_client/remote_link_spec.rb b/spec/we_transfer_client/remote_link_spec.rb index 883c6a5..f72a3b3 100644 --- a/spec/we_transfer_client/remote_link_spec.rb +++ b/spec/we_transfer_client/remote_link_spec.rb @@ -3,10 +3,10 @@ describe RemoteLink do let(:params) { { - id: SecureRandom.uuid, - url: 'http://www.wetransfer.com', - meta: {title: 'wetransfer.com'}, - type: 'link', + id: SecureRandom.uuid, + url: 'http://www.wetransfer.com', + meta: {title: 'wetransfer.com'}, + type: 'link', } } diff --git a/wetransfer.gemspec b/wetransfer.gemspec index 626ebaa..8733d82 100644 --- a/wetransfer.gemspec +++ b/wetransfer.gemspec @@ -33,10 +33,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'dotenv', '~> 2.2' spec.add_development_dependency 'bundler', '~> 1.16' spec.add_development_dependency 'pry', '~> 0.11' - spec.add_development_dependency 'rake', '~> 10.0' + spec.add_development_dependency 'rake', '>= 12.3.3' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'simplecov', '~> 0.15' - spec.add_development_dependency 'wetransfer_style', '0.6.0' + spec.add_development_dependency 'wetransfer_style', '>= 0.6.0' spec.add_development_dependency 'guard-rspec', '~> 4.7' spec.add_development_dependency 'guard-rubocop', '~> 1.3' end