restful_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf0ae7f87f8677979aa4e68a1722c8d9f5d027a2
-  data.tar.gz: d63577ee4253c7db5778cd350e42dd6eb14b053d
+SHA256:
+  metadata.gz: fb2e3bbbe3c0e81b0449b9dc0231ee925fe14c8fecae5918cebf181974addb18
+  data.tar.gz: 22c1095b54d3375e20fcd229e6ffcb79cebc2bfa4a4118947f114f3ef92d0e3c
 SHA512:
-  metadata.gz: 9346c6b5595c4d02e5740c0309358c6bb07dfc96633ffc23235fe3d8f4ba1108dd9ec3234cb6723a922493b6a754f032717b1995aa8bc5e2df1a1f22a57fe1ae
-  data.tar.gz: 923fd5bce06ece481dce25caf498eae2a851e2b097ad7a1a83f8117c0179aa50eb9500e2a02f8091a8bffd660355b5a753983136f94947fc506b148fd958ece7
+  metadata.gz: 6ca3fbc03892cc5a7c0eb238d5a01f1f0419f3c3a025c670a18c1ca10ad455c1dbd92e32f1df56c9e254b5b894441825cccac5df3a1c7c232facad2fa5384aa9
+  data.tar.gz: d85e49990eeaf1973aebf1334ecd82c7556bfc78fa5102b300cb6a0d564b4dcf0a9f618210cf6e0c63c517067fc8d03bb07c80a4b08f79b8c6f9b470250283f8

data/.travis.yml

@@ -2,4 +2,4 @@ sudo: false
 script: 'bundle exec rspec'
 language: ruby
 rvm:
-  - 2.2
+  - 2.2.3

data/lib/restful_client.rb

@@ -41,7 +41,7 @@ module RestfulClient
     url = RestfulClientUri.uri_join(callerr_config(caller)['url'], path)
     headers = { 'Accept' => 'application/json' }
     headers.merge!(extra.fetch('headers', {}))
-    request_args = { headers: headers, method: 'GET', timeout: timeout, params: params }.merge(extra.fetch('args', {}))
+    request_args = { headers: headers, method: 'GET', timeout: timeout_for(caller), params: params }.merge(extra.fetch('args', {}))
     request = Typhoeus::Request.new(url, request_args.merge(extra.fetch('args', {})))
     run_safe_request(caller, request, true, &on_error_block)
   end
@@ -49,7 +49,7 @@ module RestfulClient
   def post(caller, path, payload, extra = {}, &on_error_block)
     url = RestfulClientUri.uri_join(callerr_config(caller)['url'], path)
     headers, payload_as_str = prepare_payload_with_headers(payload, extra.fetch('headers', {}))
-    request_args = { headers: headers, method: 'POST', body: payload_as_str, timeout: timeout }
+    request_args = { headers: headers, method: 'POST', body: payload_as_str, timeout: timeout_for(caller) }
     request = Typhoeus::Request.new(url, request_args.merge(extra.fetch('args', {})))
     run_safe_request(caller, request, false, &on_error_block)
   end
@@ -57,7 +57,7 @@ module RestfulClient
   def delete(caller, path, payload = {}, extra = {}, &on_error_block)
     url = RestfulClientUri.uri_join(callerr_config(caller)['url'], path)
     headers, payload_as_str = prepare_payload_with_headers(payload, extra.fetch('headers', {}))
-    request_args = { headers: headers, method: 'DELETE', body: payload_as_str, timeout: timeout }
+    request_args = { headers: headers, method: 'DELETE', body: payload_as_str, timeout: timeout_for(caller) }
     request = Typhoeus::Request.new(url, request_args.merge(extra.fetch('args', {})))
     run_safe_request(caller, request, true, &on_error_block)
   end
@@ -65,7 +65,7 @@ module RestfulClient
   def put(caller, path, payload, extra = {}, &on_error_block)
     url = RestfulClientUri.uri_join(callerr_config(caller)['url'], path)
     headers, payload_as_str = prepare_payload_with_headers(payload, extra.fetch('headers', {}))
-    request = Typhoeus::Request.new(url, headers: headers, method: 'PUT', body: payload_as_str, timeout: timeout)
+    request = Typhoeus::Request.new(url, headers: headers, method: 'PUT', body: payload_as_str, timeout: timeout_for(caller))
     run_safe_request(caller, request, false, &on_error_block)
   end
 
@@ -78,10 +78,10 @@ module RestfulClient
   def run_safe_request(caller, request, retry_if_needed, &on_error_block)
     @@timeout_occured_count = 0
     if !use_jynx?
-      response = run_request(request.dup, __method__, false)
+      response = run_request(request.dup, __method__, false, caller)
     elsif ServiceJynx.alive?(caller)
       begin
-        response = run_request(request.dup, __method__, retry_if_needed)
+        response = run_request(request.dup, __method__, retry_if_needed, caller)
       end while response.is_a?(Typhoeus::Response)
 
       response
@@ -99,7 +99,7 @@ module RestfulClient
     on_error_block.call("Exception in #{caller} execution - #{e.message}") if on_error_block
   end
 
-  def run_request(request, method, retry_if_needed)
+  def run_request(request, method, retry_if_needed, service_name)
     logger.debug { "#{__method__} :: Request :: #{request.inspect}" }
     request.options[:headers].merge!('X-Forwarded-For' => $client_ip) if $client_ip
     request.options[:headers].merge!('User-Agent' => user_agent)
@@ -117,7 +117,7 @@ module RestfulClient
         # Timeout occured
       elsif response.timed_out?
         @@timeout_occured_count += 1
-        skip_raise = (retry_if_needed && @@timeout_occured_count <= retries)
+        skip_raise = (retry_if_needed && @@timeout_occured_count <= retries_for(service_name))
 
         error_type = 'TimeoutOccured'
         error_description = prettify_logger(error_type, request, response)
@@ -209,4 +209,12 @@ module RestfulClient
     "#{type} #{response.code}/#{response.return_code} for: #{request.options.fetch(:method)}, "\
     "#{request.base_url}, Total time: #{response.total_time} seconds"
   end
+
+  def timeout_for(service_name)
+    callerr_config(service_name)['timeout'] || timeout
+  end
+
+  def retries_for(service_name)
+    callerr_config(service_name)['retries'] || retries
+  end
 end

data/restful_client.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'restful_client'
-  spec.version       = '1.0.0'
+  spec.version       = '1.1.0'
   spec.authors       = ['Avner Cohen']
   spec.email         = ['israbirding@gmail.com']
   spec.description   = 'An HTTP framework for micro-services based environment, build on top of Typheous and Service Jynx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restful_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Avner Cohen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2026-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: service_jynx
@@ -69,7 +69,7 @@ homepage: https://github.com/AvnerCohen/restful-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,9 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: An HTTP framework for micro-services based environment
 test_files: