Merge pull request #1081 from lostisland/0.1x-ruby-2.7-fixes

backport ruby 2.7 fixes to 0.1x
lostisland · Nov 27, 2019 · 6fc0845 · 6fc0845
2 parents 389ede4 + b32566c
commit 6fc0845
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb
@@ -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

diff --git a/lib/faraday/options.rb b/lib/faraday/options.rb
@@ -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

diff --git a/lib/faraday/response.rb b/lib/faraday/response.rb
@@ -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