close #21

lib/nice_http/http_methods.rb

@@ -85,6 +85,11 @@ def get(arg, save_data: '')
         else
           @start_time_net = Time.now if @start_time_net.nil?
           resp = @http.get(path, headers_t)
+          if resp.code == 401 and @prev_request[:contains_lambda]
+            @logger.warn "Not authorized. Trying to generate a new token."
+            path, data, headers_t = manage_request(arg)
+            resp = @http.get(path, headers_t)
+          end
           data = resp.body
           manage_response(resp, data)
         end
@@ -204,6 +209,12 @@ def post(*arguments)
           data = resp.body
         else
           resp = @http.post(path, data, headers_t)
+          #todo: do it also for forms and multipart
+          if resp.code == 401 and @prev_request[:contains_lambda]
+            @logger.warn "Not authorized. Trying to generate a new token."
+            path, data, headers_t = manage_request(*arguments)
+            resp = @http.post(path, data, headers_t)
+          end
           data = resp.body
         end
       rescue Exception => stack
@@ -286,6 +297,11 @@ def put(*arguments)
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.send_request("PUT", path, data, headers_t)
+        if resp.code == 401 and @prev_request[:contains_lambda]
+          @logger.warn "Not authorized. Trying to generate a new token."
+          path, data, headers_t = manage_request(*arguments)
+          resp = @http.send_request("PUT", path, data, headers_t)
+        end
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
@@ -353,6 +369,11 @@ def patch(*arguments)
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.patch(path, data, headers_t)
+        if resp.code == 401 and @prev_request[:contains_lambda]
+          @logger.warn "Not authorized. Trying to generate a new token."
+          path, data, headers_t = manage_request(*arguments)
+          resp = @http.patch(path, data, headers_t)
+        end
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
@@ -435,10 +456,20 @@ def delete(argument)
         @start_time_net = Time.now if @start_time_net.nil?
         if data.to_s == ""
           resp = @http.delete(path, headers_t)
+          if resp.code == 401 and @prev_request[:contains_lambda]
+            @logger.warn "Not authorized. Trying to generate a new token."
+            path, data, headers_t = manage_request(argument)
+            resp = @http.delete(path, headers_t)
+          end
         else
           request = Net::HTTP::Delete.new(path, headers_t)
           request.body = data
           resp = @http.request(request)
+          if resp.code == 401 and @prev_request[:contains_lambda]
+            @logger.warn "Not authorized. Trying to generate a new token."
+            path, data, headers_t = manage_request(argument)
+            resp = @http.request(request)
+          end
         end
         data = resp.body
       rescue Exception => stack
@@ -492,6 +523,11 @@ def head(argument)
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.head(path, headers_t)
+        if resp.code == 401 and @prev_request[:contains_lambda]
+          @logger.warn "Not authorized. Trying to generate a new token."
+          path, data, headers_t = manage_request(argument)
+          resp = @http.head(path, headers_t)
+        end
         data = resp.body
       rescue Exception => stack
         @logger.warn stack

lib/nice_http/manage_request.rb

@@ -13,6 +13,7 @@ def manage_request(*arguments)
     require "json"
 
     @prev_request = Hash.new() if @prev_request.nil?
+    @prev_request[:contains_lambda] = false
     begin
       content_type_included = false
       path = ""
@@ -236,7 +237,10 @@ def manage_request(*arguments)
       end
       headers_t.each do |k, v|
         # for lambdas
-        headers_t[k] = v.call if v.is_a?(Proc)
+        if v.is_a?(Proc)
+          headers_t[k] = v.call 
+          @prev_request[:contains_lambda] = true
+        end
       end
       @prev_request[:path] = path
       @prev_request[:data] = data

nice_http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'nice_http'
-  s.version     = '1.8.1'
+  s.version     = '1.8.2'
   s.summary     = "NiceHttp -- simplest library for accessing and testing HTTP and REST resources. Get http logs and statistics automatically. Use hashes on your requests. Access JSON even easier."
   s.description = "NiceHttp -- simplest library for accessing and testing HTTP and REST resources. Get http logs and statistics automatically. Use hashes on your requests. Access JSON even easier."
   s.authors     = ["Mario Ruiz"]