json_requester 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5093495b6cc5e5ea2778c405bac7f712130a0d5a4e4b4dbd5d307606c20b98
-  data.tar.gz: a01404be960fc093d0637ab4890981d42a67161fea04f26151984bf661a6e48c
+  metadata.gz: '0845954f6576fcb489054c9dba9649432baf657c49e83e77bfcc0e5c70cc0e89'
+  data.tar.gz: cbe77bc53e67caedf438644d5f5302fa5bbf78761f79a96762b3b401c126b035
 SHA512:
-  metadata.gz: 95a2aedf37245b98f0167a7e099c5dbf650796dab009025b3075022cb5d8fe9c56ff5759b1075e7d272fcad51a43a68a33e999558d1f0e3932d099eb14bb9781
-  data.tar.gz: 6d32b1f828a49cb7f9fd98a6c1ea487feb74472e1cd64ec6256c4fccb4969a9389144c15d26957de2de838b162d41af0c1c4f01845a6dce4981b79eba737555a
+  metadata.gz: aa8352783d500877db5023c7d9f77d0cd5488e9af3418c25fba9e7cbb863e4e247bb40e534919e42ea15137636de0ced368c54d2148883e2c7139fe1e6386948
+  data.tar.gz: e0da8dcf1a2faaefedee3724d46fa56945db6d0495674a776870b813719c81299b8f5f10dad3aef0f2083995a609ba9e90d1994cf58477bf23d00e1ff1ce1772

data/lib/json_requester.rb

@@ -11,28 +11,28 @@ class JsonRequester
     @timeout = timeout
   end
 
-  def http_send(http_method, path, params={}, headers={}, sort_params: true)
+  def http_send(http_method, path, params={}, headers={}, sort_params: true, need_response_header: false)
     puts "send #{http_method} reqeust to #{@host} with\npath: #{path}\nparams: #{params}\nheaders: #{headers}"
     if http_method == :get
-      normal_send(http_method, path, params, headers, sort_params: sort_params)
+      normal_send(http_method, path, params, headers, sort_params: sort_params, need_response_header: need_response_header)
     else
-      json_send(http_method, path, params, headers, sort_params: sort_params)
+      json_send(http_method, path, params, headers, sort_params: sort_params, need_response_header: need_response_header)
     end
   end
 
-  def normal_send(http_method, path, params={}, headers={}, sort_params: true)
+  def normal_send(http_method, path, params={}, headers={}, sort_params: true, need_response_header: false)
     conn = init_conn(sort_params: sort_params)
     res = conn.send(http_method) do |req|
       req.url path
       req.headers = headers if object_present?(headers)
       req.params = params if object_present?(params)
     end
-    process_response(res)
+    process_response(res, need_response_header: need_response_header)
   rescue => e
     error_response(e)
   end
 
-  def json_send(http_method, path, params={}, headers={}, sort_params: true)
+  def json_send(http_method, path, params={}, headers={}, sort_params: true, need_response_header: false)
     conn = init_conn(sort_params: sort_params)
     res = conn.send(http_method) do |req|
       req.url path
@@ -40,12 +40,12 @@ class JsonRequester
       req.headers['Content-Type'] = 'application/json;charset=utf-8'
       req.body = params.to_json if object_present?(params)
     end
-    process_response(res)
+    process_response(res, need_response_header: need_response_header)
   rescue => e
     error_response(e)
   end
 
-  def form_send(http_method, path, params={}, headers={}, sort_params: true)
+  def form_send(http_method, path, params={}, headers={}, sort_params: true, need_response_header: false)
     conn = init_conn(sort_params: sort_params)
     res = conn.send(http_method) do |req|
       req.url path
@@ -53,19 +53,19 @@ class JsonRequester
       req.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'
       req.body = URI.encode_www_form(params) if object_present?(params)
     end
-    process_response(res)
+    process_response(res, need_response_header: need_response_header)
   rescue => e
     error_response(e)
   end
 
-  def multipart_form_send(http_method, path, params={}, headers={}, sort_params: true)
+  def multipart_form_send(http_method, path, params={}, headers={}, sort_params: true, need_response_header: false)
     conn = init_conn(sort_params: sort_params)
     res = conn.send(http_method) do |req|
       req.url path
       req.headers = headers if object_present?(headers)
       req.body = params if object_present?(params)
     end
-    process_response(res)
+    process_response(res, need_response_header: need_response_header)
   end
 
   private
@@ -83,7 +83,7 @@ class JsonRequester
     end
   end
 
-  def process_response(response)
+  def process_response(response, need_response_header: false)
     result = {'status' => response.status}
     begin
       body = JSON.parse(response.body)
@@ -92,7 +92,9 @@ class JsonRequester
     rescue
       body = {'body' => response.body}
     end
-    result.merge(body)
+    result.merge!(body)
+    result['headers'] = response.headers.to_h if need_response_header
+    result
   end
 
   def error_response(err)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_requester
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - JiaRou Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday