Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport ruby 2.7 fixes to 0.1x #1081

Merged
merged 1 commit into from Nov 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/faraday/adapter/em_http.rb
Expand Up @@ -193,11 +193,11 @@ def reset

def running?() @running end

def add
def add(&block)
if running?
perform_request { yield }
else
@registered_procs << Proc.new
@registered_procs << block
end
@num_registered += 1
end
Expand Down
2 changes: 1 addition & 1 deletion lib/faraday/options.rb
Expand Up @@ -72,7 +72,7 @@ def fetch(key, *args)
if args.size > 0
send(key_setter, args.first)
elsif block_given?
send(key_setter, Proc.new.call(key))
send(key_setter, yield(key))
else
raise self.class.fetch_error_class, "key not found: #{key.inspect}"
end
Expand Down
6 changes: 3 additions & 3 deletions lib/faraday/response.rb
Expand Up @@ -54,9 +54,9 @@ def finished?
!!env
end

def on_complete
if not finished?
@on_complete_callbacks << Proc.new
def on_complete(&block)
if !finished?
@on_complete_callbacks << block
else
yield(env)
end
Expand Down