nice_http 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f50dd3a4c167f9acf0b21e582104cb2058b726d208c57e87a0c0a9b0b12eb16
-  data.tar.gz: 2d1d4a1542e7dad443220edb40708ed19d950315e7b96f09e8b881cbb23c02e1
+  metadata.gz: 806526768550e3cbc865065969da4a64f743440fdc049ec0a57ff9030e5cff6f
+  data.tar.gz: 46f3bea1706bf4329c918e309f3e2d0ac806841c4fa84e8b151eebdbcff1306b
 SHA512:
-  metadata.gz: 60846d733bb0bc642778dd02b043055373eed2d567abf29bea562b9bcfb20be2ccf4b791c5839d7d9ba9836656a4d8fb34ca55ff1fcec7d92c032ecd54496330
-  data.tar.gz: 70bd6761feac13b037b5974ed1546c53c78c3a7fc225040819df3700ce1b57697c36fc9d701f8d4b9b2cf4faa0e55d881e4736687d6661a209d207facfc8a297
+  metadata.gz: 05fcd7af53f95a9285e7c9a8928e1d2e2ec568a6299209cfa7f34a9a864da01fa221427a9ac8fb89be7a250e0c95842ca3f343485029dc4974164fb034f819f5
+  data.tar.gz: 5910f5b98a6fc60c2ff43f8e74d466375f41b7c44c116e4285da19bbe354f1fe5aed4ec7e314ffce6465bf2f12ffc5988f539d22c2ff2db6d101e43d3dd42b28

data/lib/nice_http/manage/request.rb

@@ -9,7 +9,13 @@ 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'
@@ -132,9 +138,9 @@ module NiceHttpManageRequest
         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].merge(arguments[0][:values_for])
+            arguments[0][:values_for] = @defaults_request[:values_for].nice_merge(arguments[0][:values_for])
           else
-            arguments[0][:values_for] = @defaults_request[:values_for].dup
+            arguments[0][:values_for] = @defaults_request[:values_for].deep_copy
           end
         end
         
@@ -142,8 +148,7 @@ module NiceHttpManageRequest
           if arguments[0][:values_for].nil?
             arguments[0][:values_for] = @values_for.deep_copy
           else
-            values_for_copy = @values_for.deep_copy
-            arguments[0][:values_for] = values_for_copy.nice_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)
@@ -173,13 +178,14 @@ module NiceHttpManageRequest
             end
           elsif data.kind_of?(Hash)
             data_orig = data.deep_copy
-            data = data.nice_merge(@defaults_request[:data]) if @defaults_request.key?(:data)
+            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()
@@ -313,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

@@ -6,35 +6,35 @@ module NiceHttpUtils
   # @return [Hash] the data hash with all lambdas set
   ####################################################
   def self.set_lambdas(data, data_orig)
-    #puts "set_lambdas data: #{data.inspect}" #jal
-    #puts "set lambdas data_orig: #{data_orig.inspect}"
     data = data.dup
     data_orig = data_orig.dup unless data_orig.nil?
-    
-    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)
+    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] = data_kv
+          data[k] = v
         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
+      data = data_orig.nice_merge(data) unless data_orig.nil?
+    elsif data.is_a?(Proc)
+      data = data.call  
     end
-    data = data_orig.nice_merge(data) unless data_orig.nil?
-    #puts "set_lambas: #{data.inspect}"
     return data
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice_hash
@@ -19,7 +19,7 @@ dependencies:
         version: '1.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 1.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 1.18.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement