fix #21

lib/nice_http.rb

@@ -487,6 +487,7 @@ def initialize(args = {})
       end
       @auto_redirect = auto_redirect
       # for the case we have headers following nice_hash implementation
+      @headers_orig = @headers.dup
       @headers = @headers.generate
 
       self.class.active += 1

lib/nice_http/http_methods.rb

@@ -85,9 +85,9 @@ 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]
+          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
             @logger.warn "Not authorized. Trying to generate a new token."
-            path, data, headers_t = manage_request(arg)
+            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
             resp = @http.get(path, headers_t)
           end
           data = resp.body
@@ -210,9 +210,9 @@ def post(*arguments)
         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]
+          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
             @logger.warn "Not authorized. Trying to generate a new token."
-            path, data, headers_t = manage_request(*arguments)
+            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
             resp = @http.post(path, data, headers_t)
           end
           data = resp.body
@@ -297,9 +297,9 @@ 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]
+        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
           @logger.warn "Not authorized. Trying to generate a new token."
-          path, data, headers_t = manage_request(*arguments)
+          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
           resp = @http.send_request("PUT", path, data, headers_t)
         end
         data = resp.body
@@ -369,9 +369,9 @@ 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]
+        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
           @logger.warn "Not authorized. Trying to generate a new token."
-          path, data, headers_t = manage_request(*arguments)
+          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
           resp = @http.patch(path, data, headers_t)
         end
         data = resp.body
@@ -456,18 +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]
+          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
             @logger.warn "Not authorized. Trying to generate a new token."
-            path, data, headers_t = manage_request(argument)
+            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
             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]
+          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
             @logger.warn "Not authorized. Trying to generate a new token."
-            path, data, headers_t = manage_request(argument)
+            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
+            request = Net::HTTP::Delete.new(path, headers_t)
+            request.body = data
             resp = @http.request(request)
           end
         end
@@ -523,9 +525,9 @@ 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]
+        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
           @logger.warn "Not authorized. Trying to generate a new token."
-          path, data, headers_t = manage_request(argument)
+          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
           resp = @http.head(path, headers_t)
         end
         data = resp.body

lib/nice_http/manage_request.rb

@@ -13,7 +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 = ""
@@ -239,7 +239,6 @@ def manage_request(*arguments)
         # for lambdas
         if v.is_a?(Proc)
           headers_t[k] = v.call 
-          @prev_request[:contains_lambda] = true
         end
       end
       @prev_request[:path] = path

nice_http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'nice_http'
-  s.version     = '1.8.2'
+  s.version     = '1.8.3'
   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"]