Skip to content

Commit 6e103a4

Browse files
committed
PR feedback - flip logic, rename methods
1 parent 64069e2 commit 6e103a4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/slack/web/faraday/request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ def request(method, path, options)
2828
request.url(path, options)
2929
when :post, :put
3030
request.path = path
31-
options.compact! unless options.is_a? String
31+
options.compact! if options.respond_to? :compact
3232
request.body = options unless options.empty?
3333
end
3434
request.headers['Authorization'] = "Bearer #{token}" if token
3535

36-
request.options.merge!(options.delete(:request)) if !options.is_a?(String) && options.key?(:request)
36+
request.options.merge!(options.delete(:request)) if options.respond_to?(:key) && options.key?(:request)
3737
end
3838
response.body
3939
rescue ::Faraday::ParsingError => e

lib/slack/web/faraday/response/raise_error.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ module Web
44
module Faraday
55
module Response
66
class RaiseError < ::Faraday::Middleware
7-
def throw_if_too_many_requests(env)
7+
def raise_if_too_many_requests!(env)
88
raise Slack::Web::Api::Errors::TooManyRequestsError, env.response if env.status == 429
99
end
1010

11-
def throw_if_response_is_invalid_json(env)
12-
return unless !response_content_type_is_a_string?(env) && !env.body.is_a?(Hash)
11+
def raise_if_response_is_invalid_json!(env)
12+
return if response_content_type_is_a_string?(env) || env.body.is_a?(Hash)
1313

1414
raise ::Faraday::ParsingError.new(nil, env.response)
1515
end
@@ -28,8 +28,8 @@ def should_return?(env)
2828
end
2929

3030
def on_complete(env)
31-
throw_if_too_many_requests(env)
32-
throw_if_response_is_invalid_json(env)
31+
raise_if_too_many_requests!(env)
32+
raise_if_response_is_invalid_json!(env)
3333

3434
body = env.body
3535
return if should_return?(env)

0 commit comments

Comments
 (0)