baza.rb 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ccb82fa9b3f6e02cf08f46538505c63160250cf81e85f15a277ea2fad06d87a
-  data.tar.gz: 198aa9725055cb44737406ed098dbcbec7c659d2e180a1d45b84e0a4dc5f30ee
+  metadata.gz: 1dc6218bb18b7baff1acf3119b775c05a7fc1200d8fe6bea72de26e052be2028
+  data.tar.gz: 4b58db5eda95b13edea4b09a223a3d787a4cbeffc80eb0025b8a16f2ed587fd6
 SHA512:
-  metadata.gz: a395f8bd4cf34bee034ba0a7c42d0021eddcf4f9e106fe3bc20efc37c55f0a5d6394a8ca50f47a6e2d1f20b1ba2ef20df263908bc7077afe1302a63d4d3422ed
-  data.tar.gz: 1a9c14cdef37a10ed2742da23ba483e0f3163b2d3c6f9011a37e6480acf0ab5e05daef4f6d629ee77fd40c7ac61a642ce34edea158378cf9e55fe43e19c46be9
+  metadata.gz: a444b7f90eb26e3517e40d01ddcb1654b1ed7e027c397e0892ee01d5be286872910c7124317a187f55ecb9ac6d437d0d7055496cedb52a0a69c59158b3ba447d
+  data.tar.gz: cc40e75452008681775d7428861f161058f1fa6b3127e0d80c84e1a29296e75bb76a3554920614fa42d5393a2bb67d37fb3906376ed63c121f1135f7233d5c46

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

data/lib/baza-rb.rb

@@ -732,24 +732,24 @@ class BazaRb
   def download(uri, file)
     FileUtils.mkdir_p(File.dirname(file))
     FileUtils.rm_f(file)
+    FileUtils.touch(file)
     chunk = 0
     elapsed(@loog) do
-      pos = 0
       loop do
         request = Typhoeus::Request.new(
           uri.to_s,
           method: :get,
           headers: headers.merge(
-            'Accept' => 'application/octet-stream',
+            'Accept' => '*',
             'Accept-Encoding' => 'gzip',
-            'Range' => "bytes=#{pos}-"
+            'Range' => "bytes=#{File.size(file)}-"
           ),
           connecttimeout: @timeout,
           timeout: @timeout
         )
         slice = ''
         request.on_body do |data|
-          slice = data
+          slice += data
         end
         retry_it do
           request.run
@@ -782,8 +782,6 @@ class BazaRb
         _b, e = range.split('-')
         raise "Range is not valid (#{range.inspect})" unless e.match?(/^[0-9]+$/)
         len = ret.headers['Content-Length'].to_i
-        pos = e.to_i
-        pos += 1 unless len.zero?
         break if e.to_i == total.to_i - 1
         chunk += 1
         sleep(1) if len.zero?

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'
@@ -458,7 +459,7 @@ class TestBazaRb < Minitest::Test
     WebMock.disable_net_connect!
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'test.txt')
-      File.write(file, 'test content')
+      File.write(file, "\x00\x00 hi, dude! \x00\xFF\xFE\x12")
       stub_request(:put, 'https://example.org:443/durables/42')
         .with(headers: { 'X-Zerocracy-Token' => '000' })
         .to_return(status: 200)
@@ -470,11 +471,12 @@ class TestBazaRb < Minitest::Test
     WebMock.disable_net_connect!
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'loaded.txt')
+      data = "\x00\xE0 привет \x00\x00\xFF\xFE\x12"
       stub_request(:get, 'https://example.org:443/durables/42')
         .with(headers: { 'X-Zerocracy-Token' => '000' })
-        .to_return(status: 200, body: 'loaded content', headers: {})
+        .to_return(status: 200, body: data, headers: {})
       fake_baza.durable_load(42, file)
-      assert_equal('loaded content', File.read(file))
+      assert_equal(data, File.read(file))
     end
   end
 
@@ -482,13 +484,17 @@ class TestBazaRb < Minitest::Test
     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' } }
-      )
+      stub_request(:get, 'https://example.org:443/durables/42')
+        .with(headers: { 'Range' => 'bytes=0-' })
+        .to_return(status: 206, body: '', headers: { 'Content-Range' => 'bytes 0-0/*' })
+      stub_request(:get, 'https://example.org:443/durables/42')
+        .with(headers: { 'Range' => 'bytes=0-' })
+        .to_return(status: 206, body: 'привет', headers: { 'Content-Range' => 'bytes 0-11/25' })
+      stub_request(:get, 'https://example.org:443/durables/42')
+        .with(headers: { 'Range' => 'bytes=12-' })
+        .to_return(status: 206, body: " друг \xFF\xFE\x12", headers: { 'Content-Range' => 'bytes 12-24/25' })
       fake_baza.durable_load(42, file)
-      assert_equal('привет друг', File.read(file))
+      assert_equal("привет друг \xFF\xFE\x12", File.read(file))
     end
   end
 
@@ -674,8 +680,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, \xFF\xFE\x12!", 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, \\xFF\\xFE\\x12!\"
+        end
+        "
+      )
+      RandomPort::Pool::SINGLETON.acquire do |port|
+        host = '127.0.0.1'
+        qbash("bundle exec ruby #{Shellwords.escape(app)} -p #{port}", log: Loog::NULL, 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.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Yegor Bugayenko