baza.rb 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a8cd1767f0f915a8345f5aa9ad79699b8a5a1d5f102cae9c77dd822d2a4e77
-  data.tar.gz: 15c9601e95620ccc4904c94e6e813cac13ea3b46aa398797433d03d9c5ccf219
+  metadata.gz: cfbf5db87c6e2de8bdbd96bb3be0be9b575682508854db36dc9772dfb6120d36
+  data.tar.gz: 3547d2d4f8ac5dabd6cd9d2e170c1e3509ae8f6378bf4ae3f7b6cb613b5a0922
 SHA512:
-  metadata.gz: 92e9caded9b39f0194c79920b12a5d81ee3dbc0e21bace3ce8b7368ecea63ab9c7af739e02114f1cdff72337d09926ec3a7b8bbf5b2c60ebc65e88e7a17dd6da
-  data.tar.gz: e492fc6856487d474b58d869844e51b240f629572d5d4118df20926ba2cbab5ec116e3af4ddfa7b7586a3ba82d03667d240adcc66f319c3b0106d7698ea81c7c
+  metadata.gz: 81c87e65deddac4af96f84eb2bbcb8af2504e3ec7117ee9c6699c92154626cefdaec4daa68d0a8a64f5e8152199bc1f677841042ddeed7ee47ad51f3e32dc575
+  data.tar.gz: e6303b57c12d710f09308a4729def841b28b97b4411ea8dc63950de49c8c5be8d273a6092bc7e97b24bc2890b2e6df0df4911eef47bead8171390cda682c5565

data/Gemfile

@@ -11,7 +11,10 @@ gem 'factbase', '~>0.11', require: false
 gem 'minitest', '~>5.25', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'os', '~>1.1', require: false
+gem 'puma', '~>6.6', require: false
 gem 'qbash', '~>0.4', require: false
+gem 'rack', '~>3.1', require: false
+gem 'rackup', '~>2.2', require: false
 gem 'rake', '~>13.2', require: false
 gem 'random-port', '~>0.7', require: false
 gem 'rubocop', '~>1.73', require: false
@@ -20,6 +23,7 @@ gem 'rubocop-performance', '~>1.23', require: false
 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', require: false
 gem 'webmock', '~>3.24', require: false
 gem 'webrick', '~>1.9', require: false

data/Gemfile.lock

@@ -76,8 +76,11 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multipart-post (2.4.1)
+    mustermann (3.0.3)
+      ruby2_keywords (~> 0.0.1)
     net-http (0.6.0)
       uri
+    nio4r (2.7.4)
     nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.8-x64-mingw-ucrt)
@@ -94,12 +97,24 @@ GEM
       racc
     prism (1.4.0)
     public_suffix (6.0.2)
+    puma (6.6.0)
+      nio4r (~> 2.0)
     qbash (0.4.5)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
       tago (> 0)
     racc (1.8.1)
+    rack (3.1.16)
+    rack-protection (4.1.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rackup (2.2.1)
+      rack (>= 3)
     rainbow (3.1.1)
     rake (13.3.0)
     random-port (0.7.5)
@@ -133,6 +148,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -142,7 +158,15 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
+      tilt (~> 2.0)
     tago (0.1.0)
+    tilt (2.6.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     unicode-display_width (3.1.4)
@@ -174,7 +198,10 @@ DEPENDENCIES
   minitest (~> 5.25)
   minitest-reporters (~> 1.7)
   os (~> 1.1)
+  puma (~> 6.6)
   qbash (~> 0.4)
+  rack (~> 3.1)
+  rackup (~> 2.2)
   rake (~> 13.2)
   random-port (~> 0.7)
   rubocop (~> 1.73)
@@ -183,6 +210,7 @@ DEPENDENCIES
   rubocop-rake (~> 0.7)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 2.1)
+  sinatra (~> 4.1)
   wait_for (~> 0.1)
   webmock (~> 3.24)
   webrick (~> 1.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.0'
+  VERSION = '0.9.2'
 end

data/lib/baza-rb.rb

@@ -40,6 +40,9 @@ class BazaRb
   # Unexpected response arrived from the server.
   class BadResponse < StandardError; end
 
+  # When server sent incorrectly compressed data.
+  class BadCompression < StandardError; end
+
   # Initialize a new Zerocracy API client.
   #
   # @param [String] host The API host name (e.g., 'api.zerocracy.com')
@@ -587,6 +590,8 @@ class BazaRb
     io = StringIO.new(data)
     gz = Zlib::GzipReader.new(io)
     gz.read
+  rescue Zlib::GzipFile::Error => e
+    raise BadCompression, "Failed to unzip #{data.bytesize} bytes: #{e.message}"
   end
 
   # Compress request parameters with gzip.
@@ -735,7 +740,7 @@ class BazaRb
           uri.to_s,
           method: :get,
           headers: headers.merge(
-            'Accept' => 'application/octet-stream',
+            'Accept' => '*',
             'Accept-Encoding' => 'gzip',
             'Range' => "bytes=#{pos}-"
           ),
@@ -744,7 +749,7 @@ class BazaRb
         )
         slice = ''
         request.on_body do |data|
-          slice = data
+          slice += data
         end
         retry_it do
           request.run
@@ -756,12 +761,17 @@ class BazaRb
           ('in gzip' if ret.headers['Content-Encoding'] == 'gzip'),
           ("ranged as #{ret.headers['Content-Range'].inspect}" if ret.headers['Content-Range'])
         ]
-        checked(ret, [200, 206])
+        ret = checked(ret, [200, 206])
         if ret.headers['Content-Encoding'] == 'gzip'
-          slice = unzip(slice)
-          msg << "unzipped to #{slice.bytesize} bytes"
+          begin
+            slice = unzip(slice)
+            msg << "unzipped to #{slice.bytesize} bytes"
+          rescue BazaRb::BadCompression => e
+            raise BazaRb::BadCompression, "#{msg.compact.join(', ')} (#{e.message})"
+          end
         end
         File.open(file, 'ab') do |f|
+          msg << "added to existed #{File.size(file)} bytes"
           f.write(slice)
         end
         @loog.debug(msg.compact.join(', '))

data/test/test_baza-rb.rb

@@ -6,6 +6,7 @@
 require 'factbase'
 require 'loog'
 require 'net/http'
+require 'qbash'
 require 'random-port'
 require 'securerandom'
 require 'socket'
@@ -478,6 +479,31 @@ class TestBazaRb < Minitest::Test
     end
   end
 
+  def test_durable_load_in_chunks
+    WebMock.disable_net_connect!
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'loaded.txt')
+      stub_request(:get, 'https://example.org:443/durables/42').to_return(
+        { status: 206, body: '', headers: { 'Content-Range' => 'bytes 0-0/*', 'Content-Length' => '0' } },
+        { status: 206, body: 'привет', headers: { 'Content-Range' => 'bytes 0-5/11', 'Content-Length' => '5' } },
+        { status: 206, body: ' друг', headers: { 'Content-Range' => 'bytes 6-10/11', 'Content-Length' => '5' } }
+      )
+      fake_baza.durable_load(42, file)
+      assert_equal('привет друг', File.read(file))
+    end
+  end
+
+  def test_durable_load_with_broken_compression
+    WebMock.disable_net_connect!
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'loaded.txt')
+      stub_request(:get, 'https://example.org:443/durables/42').to_return(
+        status: 200, body: 'this is not gzip!', headers: { 'Content-Encoding' => 'gzip' }
+      )
+      assert_raises(BazaRb::BadCompression) { fake_baza.durable_load(42, file) }
+    end
+  end
+
   def test_durable_lock
     WebMock.disable_net_connect!
     stub_request(:get, 'https://example.org/csrf').to_return(body: 'token')
@@ -649,8 +675,49 @@ class TestBazaRb < Minitest::Test
     baza.push('test', 'data', [])
   end
 
+  def test_durable_load_from_sinatra
+    WebMock.enable_net_connect!
+    Dir.mktmpdir do |dir|
+      with_sinatra_server do |baza|
+        file = File.join(dir, 'x.txt')
+        baza.durable_load(42, file)
+        assert_equal('Hello, world!', File.read(file))
+      end
+    end
+  end
+
   private
 
+  def with_sinatra_server
+    Dir.mktmpdir do |dir|
+      app = File.join(dir, 'app.rb')
+      File.write(
+        app,
+        "
+        require 'rack'
+        require 'sinatra'
+        use Rack::Deflater
+        get '/' do
+          'I am alive'
+        end
+        get '/durables/42' do
+          'Hello, world!'
+        end
+        "
+      )
+      RandomPort::Pool::SINGLETON.acquire do |port|
+        host = '127.0.0.1'
+        qbash("bundle exec ruby #{Shellwords.escape(app)} -p #{port}", log: Loog::VERBOSE, accept: nil) do
+          loop do
+            break if Typhoeus::Request.get("http://#{host}:#{port}").code == 200
+            sleep(0.1)
+          end
+          yield BazaRb.new(host, port, '0000-0000-0000', ssl: false)
+        end
+      end
+    end
+  end
+
   def with_http_server(code, response, opts = {})
     opts = { ssl: false, timeout: 1 }.merge(opts)
     WebMock.enable_net_connect!

metadata

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