nice_http 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a89de44525e89ca6ba5d2ec8803f0fbc514a8370177b356e40193ac7d751ed5
-  data.tar.gz: 07da86963520759b90a4f790ef30bc3e6cc637246d00e46ce9b1a2d8d5db490e
+  metadata.gz: 63d2aa02cbda4251da5f587839ccb8687b4180b7c6f1c5cfb0ea55b380439174
+  data.tar.gz: 74121e6dbb4b5416512a7fcce5588348163d0f1bbd9222be67c96a1a168f2354
 SHA512:
-  metadata.gz: 7a3f31fc35a3f04b0ae8684ebf3b35e0c12c77a7b39d39ae470204f49bc3dbbfa56fa3dcfe8549f9f0c341b7044931f277aca3af1d3cfd993fce5488657a65ae
-  data.tar.gz: f5b1da1a268b751e0d6a5f07cd2033718573b94624bfdbcde7ee78255cd22f8e3e59356280f255b50684baee0d9790e9b567c8095235a116a5a29206b5a892c2
+  metadata.gz: ae869d887c91377e1a7fa0e590c7c92f0216511c21e9c42ee58dc5ae76f5df125a624b178eebd387669aff0acbe02e422a4972b1bc292609d1668427badfb193
+  data.tar.gz: af6d94e226fae1c06717d34f64406ed2271fcc03460da38415756b07ca2fc9fd571fd62697152f415a81d686a32db153177d000dbe93b5cc889618e242f5428e

data/lib/nice_http/http_methods.rb

@@ -86,9 +86,17 @@ module NiceHttpHttpMethods
           @start_time_net = Time.now if @start_time_net.nil?
           resp = @http.get(path, headers_t)
           if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-            @logger.warn "Not authorized. Trying to generate a new token."
-            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-            resp = @http.get(path, headers_t)
+            try = false
+            @headers_orig.each do |k,v| 
+              if v.is_a?(Proc) and headers_t.key?(k)
+                try = true
+                headers_t[k] = v.call 
+              end
+            end
+            if try
+              @logger.warn "Not authorized. Trying to generate a new token."
+              resp = @http.get(path, headers_t)
+            end
           end
           data = resp.body
           manage_response(resp, data)
@@ -211,9 +219,17 @@ module NiceHttpHttpMethods
           resp = @http.post(path, data, headers_t)
           #todo: do it also for forms and multipart
           if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-            @logger.warn "Not authorized. Trying to generate a new token."
-            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-            resp = @http.post(path, data, headers_t)
+            try = false
+            @headers_orig.each do |k,v| 
+              if v.is_a?(Proc) and headers_t.key?(k)
+                try = true
+                headers_t[k] = v.call 
+              end
+            end
+            if try
+              @logger.warn "Not authorized. Trying to generate a new token."
+              resp = @http.post(path, data, headers_t)
+            end
           end
           data = resp.body
         end
@@ -298,9 +314,17 @@ module NiceHttpHttpMethods
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.send_request("PUT", path, data, headers_t)
         if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-          @logger.warn "Not authorized. Trying to generate a new token."
-          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-          resp = @http.send_request("PUT", path, data, headers_t)
+          try = false
+          @headers_orig.each do |k,v| 
+            if v.is_a?(Proc) and headers_t.key?(k)
+              try = true
+              headers_t[k] = v.call 
+            end
+          end
+          if try
+            @logger.warn "Not authorized. Trying to generate a new token."
+            resp = @http.send_request("PUT", path, data, headers_t)
+          end
         end
         data = resp.body
       rescue Exception => stack
@@ -370,9 +394,17 @@ module NiceHttpHttpMethods
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.patch(path, data, headers_t)
         if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-          @logger.warn "Not authorized. Trying to generate a new token."
-          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-          resp = @http.patch(path, data, headers_t)
+          try = false
+          @headers_orig.each do |k,v| 
+            if v.is_a?(Proc) and headers_t.key?(k)
+              try = true
+              headers_t[k] = v.call 
+            end
+          end
+          if try
+            @logger.warn "Not authorized. Trying to generate a new token."
+            resp = @http.patch(path, data, headers_t)
+          end
         end
         data = resp.body
       rescue Exception => stack
@@ -457,20 +489,36 @@ module NiceHttpHttpMethods
         if data.to_s == ""
           resp = @http.delete(path, headers_t)
           if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-            @logger.warn "Not authorized. Trying to generate a new token."
-            @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-            resp = @http.delete(path, headers_t)
+            try = false
+            @headers_orig.each do |k,v| 
+              if v.is_a?(Proc) and headers_t.key?(k)
+                try = true
+                headers_t[k] = v.call 
+              end
+            end
+            if try
+              @logger.warn "Not authorized. Trying to generate a new token."
+              resp = @http.delete(path, headers_t)
+            end
           end
         else
           request = Net::HTTP::Delete.new(path, headers_t)
           request.body = data
           resp = @http.request(request)
           if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-            @logger.warn "Not authorized. Trying to generate a new token."
-            @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)
+            try = false
+            @headers_orig.each do |k,v| 
+              if v.is_a?(Proc) and headers_t.key?(k)
+                try = true
+                headers_t[k] = v.call 
+              end
+            end
+            if try
+              @logger.warn "Not authorized. Trying to generate a new token."
+              request = Net::HTTP::Delete.new(path, headers_t)
+              request.body = data
+              resp = @http.request(request)
+            end
           end
         end
         data = resp.body
@@ -526,9 +574,17 @@ module NiceHttpHttpMethods
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.head(path, headers_t)
         if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
-          @logger.warn "Not authorized. Trying to generate a new token."
-          @headers_orig.each { |k,v| headers_t[k] = v.call if v.is_a?(Proc)}
-          resp = @http.head(path, headers_t)
+          try = false
+          @headers_orig.each do |k,v| 
+            if v.is_a?(Proc) and headers_t.key?(k)
+              try = true
+              headers_t[k] = v.call 
+            end
+          end
+          if try
+            @logger.warn "Not authorized. Trying to generate a new token."
+            resp = @http.head(path, headers_t)
+          end
         end
         data = resp.body
       rescue Exception => stack

metadata

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