nice_http 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15cb5c2a1e8c6df4d82ead3b1185f981d556c94c1ec358fa868d83a7a2cfb643
-  data.tar.gz: 7893ef6a779be11d71f8c5c7f468fd063ea41af0f6d63fbe3451c164e0fc3573
+  metadata.gz: 7a89de44525e89ca6ba5d2ec8803f0fbc514a8370177b356e40193ac7d751ed5
+  data.tar.gz: 07da86963520759b90a4f790ef30bc3e6cc637246d00e46ce9b1a2d8d5db490e
 SHA512:
-  metadata.gz: ebdd1df7c1b70729affae816609537cf637f6e3ccf38f6533bba24f941e60bccccc21695f6f96bd0d14f1f96ae9579cddbfea7d552823af888d25906d994a4ba
-  data.tar.gz: aa3e345d27836d891183909917679dc98520e0f0f9d64ce6c0d7588f521415ac26e7e94a63c4a328e5100a5e0e968a79aae3532ecce6df2b755e1a796bcba47a
+  metadata.gz: 7a3f31fc35a3f04b0ae8684ebf3b35e0c12c77a7b39d39ae470204f49bc3dbbfa56fa3dcfe8549f9f0c341b7044931f277aca3af1d3cfd993fce5488657a65ae
+  data.tar.gz: f5b1da1a268b751e0d6a5f07cd2033718573b94624bfdbcde7ee78255cd22f8e3e59356280f255b50684baee0d9790e9b567c8095235a116a5a29206b5a892c2

data/lib/nice_http.rb

@@ -487,6 +487,7 @@ class NiceHttp
       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

data/lib/nice_http/http_methods.rb

@@ -85,9 +85,9 @@ module NiceHttpHttpMethods
         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 @@ module NiceHttpHttpMethods
         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 @@ module NiceHttpHttpMethods
       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 @@ module NiceHttpHttpMethods
       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 @@ module NiceHttpHttpMethods
         @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 @@ module NiceHttpHttpMethods
       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

data/lib/nice_http/manage_request.rb

@@ -13,7 +13,7 @@ module NiceHttpManageRequest
     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 @@ module NiceHttpManageRequest
         # for lambdas
         if v.is_a?(Proc)
           headers_t[k] = v.call 
-          @prev_request[:contains_lambda] = true
         end
       end
       @prev_request[:path] = path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Mario Ruiz