nice_http 1.9.3 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66d16e3ecb846d6a31ac8db489128b32784848734a2660a07f9c04ed00e2cf76
-  data.tar.gz: 87d110c318ed6db81c7cacb6ea560368b180a870a8bf1be2f32f56397ee95215
+  metadata.gz: 806526768550e3cbc865065969da4a64f743440fdc049ec0a57ff9030e5cff6f
+  data.tar.gz: 46f3bea1706bf4329c918e309f3e2d0ac806841c4fa84e8b151eebdbcff1306b
 SHA512:
-  metadata.gz: dbeeda7985069f1affc5780570ec81650149c8f47e01db706baf35b02ff998f56e7e420a7fb418bfcb868109f75658d40f933f6e60f963140fff422f8f651ef9
-  data.tar.gz: 33d9b360f95f055e6e951cc83e525f9152874bc6f1140c5f6a0091bc1e4a9433e865d236e83737f75eb155fe5e5f50dc74c81b56d2c0e874f0c39d92ea1985ee
+  metadata.gz: 05fcd7af53f95a9285e7c9a8928e1d2e2ec568a6299209cfa7f34a9a864da01fa221427a9ac8fb89be7a250e0c95842ca3f343485029dc4974164fb034f819f5
+  data.tar.gz: 5910f5b98a6fc60c2ff43f8e74d466375f41b7c44c116e4285da19bbe354f1fe5aed4ec7e314ffce6465bf2f12ffc5988f539d22c2ff2db6d101e43d3dd42b28

data/README.md

@@ -260,7 +260,7 @@ NiceHttp.requests = {
 }
 ```
 
-You can use `NiceHttp.requests` to specify certain `headers`, `path` parameters or `data` that will apply on all requests sent.
+You can use `NiceHttp.requests` to specify certain `headers`, `path` parameters or `data` or `values_for` that will apply on all requests sent.
 ```ruby
 NiceHttp.requests = {
   path: 'api-version=2022-12-09&testing=true',
@@ -272,11 +272,14 @@ NiceHttp.requests = {
 }
 ```
 
-Lambdas can be used also on data to change the payloads in real-time. It is only available on root of the data hash. In case the lambda returns 'nil' the key won't be added to the request.  
+Lambdas can be used also on data and values_for to change the payloads in real-time. In case the lambda returns 'nil' the key won't be added to the request.  
 ```ruby
 NiceHttp.requests = {
     data: {
       zones: lambda { ENV['ZONES'] if NiceHttp.request[:method] == 'PUT' and NiceHttp.request[:path].match?(/^\/api\/users\/\d+/)}
+    },
+    values_for: {
+      region: lambda { 'Europe' if NiceHttp.request[:name] == 'Users.add' }
     }
   }
 ```

data/lib/nice_http/manage/request.rb

@@ -9,14 +9,20 @@ module NiceHttpManageRequest
   #   output:
   #     path, data, headers
   ######################################################
-  def manage_request(*arguments)
+  def manage_request(*arguments_param)    
+    if arguments_param.size == 1 and arguments_param[0].kind_of?(Hash)
+      arguments = [arguments_param[0].deep_copy()]
+    else
+      arguments = arguments_param
+    end    
+      
     require "json"
     require 'cgi'
     require 'uri'
     
     @prev_request = Hash.new() if @prev_request.nil?
     @defaults_request = self.class.requests if @defaults_request.nil? and self.class.requests.is_a?(Hash)
-    @request = Hash.new() if @request.nil?
+    @request = Hash.new()
     @defaults_request = Hash.new() unless @defaults_request.is_a?(Hash)
     self.class.request = @request
 
@@ -128,15 +134,26 @@ module NiceHttpManageRequest
         if arguments[0].include?(:values) and !arguments[0].include?(:values_for)
           arguments[0][:values_for] = arguments[0][:values]
         end
-
+        values_for_orig = {}
+        if @defaults_request.key?(:values_for) and @defaults_request.is_a?(Hash) and @defaults_request[:values_for].size > 0
+          if arguments[0].include?(:values_for)
+            values_for_orig = arguments[0][:values_for].deep_copy
+            arguments[0][:values_for] = @defaults_request[:values_for].nice_merge(arguments[0][:values_for])
+          else
+            arguments[0][:values_for] = @defaults_request[:values_for].deep_copy
+          end
+        end
+        
         if @values_for.size > 0
           if arguments[0][:values_for].nil?
-            arguments[0][:values_for] = @values_for.dup
+            arguments[0][:values_for] = @values_for.deep_copy
           else
-            arguments[0][:values_for] = @values_for.merge(arguments[0][:values_for])
+            arguments[0][:values_for] = @values_for.nice_merge(arguments[0][:values_for])
           end
         end
-
+        if arguments[0].include?(:values_for) and arguments[0][:values_for].size > 0 and arguments[0][:values_for].is_a?(Hash)
+          arguments[0][:values_for] = NiceHttpUtils.set_lambdas(arguments[0][:values_for], values_for_orig)
+        end
         if content_type_included and (!headers_t["Content-Type"][/text\/xml/].nil? or
                                       !headers_t["Content-Type"]["application/soap+xml"].nil? or
                                       !headers_t["Content-Type"][/application\/jxml/].nil?)
@@ -160,22 +177,15 @@ module NiceHttpManageRequest
               }
             end
           elsif data.kind_of?(Hash)
-            data.merge!(@defaults_request[:data]) if @defaults_request.key?(:data)
-            #lambdas on data only supports on root of the hash
-            data.each do |k, v|
-              if v.is_a?(Proc)
-                data_kv = v.call
-                if data_kv.nil?
-                  data.delete(k)
-                else
-                  data[k] = data_kv
-                end
-              end
-            end
+            data_orig = data.deep_copy
+            data.nice_merge!(@defaults_request[:data]) if @defaults_request.key?(:data)
+            data = NiceHttpUtils.set_lambdas(data, data_orig)
+
             if arguments[0].include?(:values_for)
               data = data.set_values(arguments[0][:values_for])
             end
             data = data.to_json()
+
           elsif data.kind_of?(Array)
             #todo: implement set_nested
             data_arr = Array.new()
@@ -309,7 +319,6 @@ module NiceHttpManageRequest
         self.class.last_request = message
         @logger.info(message)
       end
-
       return path, data, headers_t
     rescue Exception => stack
       @logger.fatal(stack)

data/lib/nice_http/utils/set_lambdas.rb

@@ -0,0 +1,40 @@
+module NiceHttpUtils
+  ##################################################
+  # It will set all lambdas in data hash
+  # @param data [Hash]
+  # @param data_orig [Hash]
+  # @return [Hash] the data hash with all lambdas set
+  ####################################################
+  def self.set_lambdas(data, data_orig)
+    data = data.dup
+    data_orig = data_orig.dup unless data_orig.nil?
+    if data.is_a?(Hash)
+      data.each do |k, v|
+        if v.is_a?(Proc)
+          data_kv = v.call
+          if data_kv.nil?
+            data.delete(k) unless data_orig.is_a?(Hash) and data_orig.key?(k)
+          else
+            data[k] = data_kv
+          end
+        elsif v.is_a?(Hash)
+          data[k] = set_lambdas(v, data_orig[k])
+        elsif v.is_a?(Array)
+          v.each.with_index do |v2, i|
+              if data_orig.key?(k) and data_orig[k].is_a?(Array) and data_orig[k].size > i
+                  data[k][i] = set_lambdas(v2, data_orig[k][i])
+              else
+                  data[k][i] = set_lambdas(v2, nil)
+              end
+          end
+        else
+          data[k] = v
+        end
+      end
+      data = data_orig.nice_merge(data) unless data_orig.nil?
+    elsif data.is_a?(Proc)
+      data = data.call  
+    end
+    return data
+  end
+end

data/lib/nice_http.rb

@@ -15,6 +15,7 @@ require_relative "nice_http/manage/wait_async_operation"
 require_relative "nice_http/utils/basic_authentication"
 require_relative "nice_http/utils/get_value_xml_tag"
 require_relative "nice_http/utils/set_value_xml_tag"
+require_relative "nice_http/utils/set_lambdas"
 require_relative "nice_http/reset"
 require_relative "nice_http/add_stats"
 require_relative "nice_http/defaults"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.5
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice_hash
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 1.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 1.18.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - lib/nice_http/save_stats.rb
 - lib/nice_http/utils/basic_authentication.rb
 - lib/nice_http/utils/get_value_xml_tag.rb
+- lib/nice_http/utils/set_lambdas.rb
 - lib/nice_http/utils/set_value_xml_tag.rb
 homepage: https://github.com/MarioRuiz/nice_http
 licenses: