baza.rb 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4291b734210c6b32949c0025f343304de1c636ab00e0d2efdaeaf8e9eba3a51
-  data.tar.gz: d3cd7f75b3d71a17dea16c1cd164d094c8b4c26b1a20e56c62df8c0d5778f80a
+  metadata.gz: 980789abe61ce0f5811b41b566af9c4a87c03223268af54dbc102a5147c50a9e
+  data.tar.gz: c01a90bcb753b210b41cbcfae8d54021465cf52a43c107642d1f2efcdb21dfeb
 SHA512:
-  metadata.gz: b6375cc3204a5530b8c1b90c8376a63ce262c51cf0ef9ce998068c467390cd94d911c5be0ab16c5bb43522eddabb24b3af8e0de7261ad28baebfdea074d589bd
-  data.tar.gz: 2fcbdcd001c5dc9d1c26320583c6f4a09debc1bbf89b461f0964abcbe4fc165ce7a1f98844c31f7fdeaea076d8c3383308cfc160850a5cde8acebbc28cadbe18
+  metadata.gz: eab49fdb4389c82f56f43ce05ad3ec526d56b48b61eff07fa9c67cfb48ef93e2ffcd60f7acdf535e4b2cf301bb35a85a8dee7f85521085d445253b0d135455ed
+  data.tar.gz: 477a00b39bb00e5315a24d60eb888a4915cb9c374bc3c12245b74917b3788919a44971937e1fad3f1267a06c3c371ab846ed5acce73097fa93611601e090366f

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.7'
+  VERSION = '0.9.9'
 end

data/lib/baza-rb.rb

@@ -31,8 +31,11 @@ require_relative 'baza-rb/version'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class BazaRb
-  # How big are the chunks we send, by default, in bytes:
-  DEFAULT_CHUNK_SIZE = 4_000_000
+  # How big are the chunks we send, by default, in bytes.
+  # Numbers larger than 1Mb may lead to problems with the server,
+  # since sending time will be too long and the server may drop
+  # connections. Better keep it as is: 1Mb.
+  DEFAULT_CHUNK_SIZE = 1_000_000
 
   # When the server failed (503).
   class ServerFailure < StandardError; end
@@ -641,6 +644,23 @@ class BazaRb
     with_retries(max_tries: @retries, rescue: TimedOut, &)
   end
 
+  # Execute a block with retries on 429 status codes.
+  #
+  # @yield The block to execute with retries
+  # @return [Object] The result of the block execution
+  def retry_if_server_busy(&)
+    attempt = 0
+    loop do
+      ret = yield
+      if ret.code == 429 && attempt < 3
+        attempt += 1
+        sleep(2**attempt)
+        next
+      end
+      return ret
+    end
+  end
+
   # Check the HTTP response and return it.
   #
   # @param [Typhoeus::Response] ret The response
@@ -698,12 +718,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.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Yegor Bugayenko