From e91aeef3493ba3d687903b716ab720630287d307 Mon Sep 17 00:00:00 2001
From: mokha <mokha@cisco.com>
Date: Tue, 8 May 2018 19:01:40 -0600
Subject: capture block as parameter and remove duplication.

---
 lib/net/hippie/client.rb | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/lib/net/hippie/client.rb b/lib/net/hippie/client.rb
index ba9ad39..b32c0f8 100644
--- a/lib/net/hippie/client.rb
+++ b/lib/net/hippie/client.rb
@@ -26,12 +26,7 @@ module Net
       end
 
       def execute(uri, request)
-        http_for(normalize_uri(uri)).request(request)
-      end
-
-      def get(uri, headers: {}, body: {})
-        request = request_for(Net::HTTP::Get, uri, headers: headers, body: body)
-        response = execute(uri, request)
+        response = http_for(normalize_uri(uri)).request(request)
         if block_given?
           yield request, response
         else
@@ -39,25 +34,20 @@ module Net
         end
       end
 
-      def post(uri, headers: {}, body: {})
+      def get(uri, headers: {}, body: {}, &block)
+        request = request_for(Net::HTTP::Get, uri, headers: headers, body: body)
+        execute(uri, request, &block)
+      end
+
+      def post(uri, headers: {}, body: {}, &block)
         type = Net::HTTP::Post
         request = request_for(type, uri, headers: headers, body: body)
-        response = execute(uri, request)
-        if block_given?
-          yield request, response
-        else
-          response
-        end
+        execute(uri, request, &block)
       end
 
-      def put(uri, headers: {}, body: {})
+      def put(uri, headers: {}, body: {}, &block)
         request = request_for(Net::HTTP::Put, uri, headers: headers, body: body)
-        response = execute(uri, request)
-        if block_given?
-          yield request, response
-        else
-          response
-        end
+        execute(uri, request, &block)
       end
 
       private
-- 
cgit v1.2.3