baza.rb 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49dd0eac66fa87b0721be113bef63fef2b1a6e5a940e1d7b50d9cce9e09862d0
-  data.tar.gz: a5f9e460e9ba4aeda8dce60fe3c09921fa7041d977c530c6b917c695c98a41c2
+  metadata.gz: fcbc7506438df13060cabc32fb5d87bb684a10a63f045d3d204788751f8e8ab5
+  data.tar.gz: 1e672c028f2b97bed37fedb335d9dd535a625295cbcd8592909ddf865d26b551
 SHA512:
-  metadata.gz: 19be699a163f2d53d927ff05c787e449efe72b444660218544c2ffb84e91e28a3bd42e2731dbf1a8d4f4726cd02f52d6d39b4f1188838febc56ffe26f003fbf6
-  data.tar.gz: 75145b1a1f5266f18f25ec956c6ef22b252729834a0af61289c5203c4a0133b78b2f303b33928457fa501b2ad0e4ff0a5b8564855146ecf2bab1c4d57d225778
+  metadata.gz: d6300c6a5a7ee6fcd2de409901b42b3331166470348510721a3b5bbd667f69351de04cb52409b68a116cd22bea5aaa7a8c963c7167112467a3afb92796fa5aa5
+  data.tar.gz: fc58aab87af51e458bc6a20b91693f83f8a32507c504efcabc214fbd6e9be6c4402325bb4154326a9d8def4faed26a8ecf450251540a00cb89d1f0774f7308a5

data/Gemfile

@@ -10,7 +10,6 @@ gem 'base64', '~>0.3', require: false
 gem 'factbase', '~>0.11', require: false
 gem 'minitest', '~>5.25', require: false
 gem 'minitest-reporters', '~>1.7', require: false
-gem 'nio4r', '2.7.4', require: false # GPL
 gem 'online', '~>0.0', require: false
 gem 'os', '~>1.1', require: false
 gem 'puma', '~>6.6', require: false
@@ -26,7 +25,7 @@ gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>2.1', require: false
 gem 'sinatra', '~>4.1', require: false
-gem 'wait_for', '0.1.1', require: false # Unlicensed
+gem 'wait_for', '~>0.1', require: false
 gem 'webmock', '~>3.24', require: false
 gem 'webrick', '~>1.9', require: false
 gem 'yard', '~>0.9', require: false

data/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.12.1)
+    factbase (0.13.0)
       backtrace (~> 0.4)
       decoor (~> 0.0)
       ellipsized (~> 0.3)
@@ -47,7 +47,7 @@ GEM
       others (~> 0.0)
       tago (~> 0.0)
       yaml (~> 0.3)
-    faraday (2.13.1)
+    faraday (2.13.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -126,7 +126,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.77.0)
+    rubocop (1.78.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -170,7 +170,7 @@ GEM
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     tago (0.1.0)
-    tilt (2.6.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
@@ -202,7 +202,6 @@ DEPENDENCIES
   factbase (~> 0.11)
   minitest (~> 5.25)
   minitest-reporters (~> 1.7)
-  nio4r (= 2.7.4)
   online (~> 0.0)
   os (~> 1.1)
   puma (~> 6.6)
@@ -218,7 +217,7 @@ DEPENDENCIES
   simplecov (~> 0.22)
   simplecov-cobertura (~> 2.1)
   sinatra (~> 4.1)
-  wait_for (= 0.1.1)
+  wait_for (~> 0.1)
   webmock (~> 3.24)
   webrick (~> 1.9)
   yard (~> 0.9)

data/lib/baza-rb/version.rb

@@ -13,5 +13,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class BazaRb
-  VERSION = '0.9.8'
+  VERSION = '0.9.10'
 end

data/lib/baza-rb.rb

@@ -644,6 +644,26 @@ class BazaRb
     with_retries(max_tries: @retries, rescue: TimedOut, &)
   end
 
+  # Execute a block with retries on 429 and 500 status codes.
+  #
+  # @yield The block to execute with retries
+  # @return [Object] The result of the block execution
+  def retry_if_server_busy(&)
+    allowed = [429, 500]
+    attempt = 0
+    loop do
+      ret = yield
+      if allowed.include?(ret.code) && attempt < 5
+        attempt += 1
+        seconds = 2**attempt
+        @loog.info("Now, will sleep for #{seconds} and try again...")
+        sleep(seconds)
+        next
+      end
+      return ret
+    end
+  end
+
   # Check the HTTP response and return it.
   #
   # @param [Typhoeus::Response] ret The response
@@ -674,7 +694,7 @@ class BazaRb
     when 500
       msg +=
         ", most probably it's an internal error on the server, " \
-        'please report this to https://github.com/zerocracy/baza'
+        'please report this to https://github.com/zerocracy/baza.rb'
     when 503
       msg +=
         ", most probably it's an internal error on the server (#{headers['X-Zerocracy-Failure'].inspect}), " \
@@ -701,12 +721,14 @@ class BazaRb
   def get(uri, allowed = [200])
     retry_it do
       checked(
-        Typhoeus::Request.get(
-          uri.to_s,
-          headers:,
-          connecttimeout: @timeout,
-          timeout: @timeout
-        ),
+        retry_if_server_busy do
+          Typhoeus::Request.get(
+            uri.to_s,
+            headers:,
+            connecttimeout: @timeout,
+            timeout: @timeout
+          )
+        end,
         allowed
       )
     end

data/test/test_baza-rb.rb

@@ -693,6 +693,18 @@ class TestBazaRb < Minitest::Test
     baza.push('test', 'data', [])
   end
 
+  def test_get_request_retries_on_429_status_code
+    WebMock.disable_net_connect!
+    stub_request(:get, 'https://example.org:443/whoami')
+      .with(headers: { 'X-Zerocracy-Token' => '000' })
+      .to_return(status: 429)
+      .times(3)
+    stub_request(:get, 'https://example.org:443/whoami')
+      .with(headers: { 'X-Zerocracy-Token' => '000' })
+      .to_return(status: 200, body: 'testuser')
+    assert_equal('testuser', fake_baza.whoami)
+  end
+
   def test_durable_load_from_sinatra
     WebMock.enable_net_connect!
     Dir.mktmpdir do |dir|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza.rb
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Yegor Bugayenko