baza.rb 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbf5db87c6e2de8bdbd96bb3be0be9b575682508854db36dc9772dfb6120d36
-  data.tar.gz: 3547d2d4f8ac5dabd6cd9d2e170c1e3509ae8f6378bf4ae3f7b6cb613b5a0922
+  metadata.gz: 308b7b84631ae61841fb9d58192f6c257fc5b60d68dd8b95c01caf5cf53f39a8
+  data.tar.gz: ddafe4b9c94292616c5a9588b057869b63ccfce655954bd87f79bb54182ac800
 SHA512:
-  metadata.gz: 81c87e65deddac4af96f84eb2bbcb8af2504e3ec7117ee9c6699c92154626cefdaec4daa68d0a8a64f5e8152199bc1f677841042ddeed7ee47ad51f3e32dc575
-  data.tar.gz: e6303b57c12d710f09308a4729def841b28b97b4411ea8dc63950de49c8c5be8d273a6092bc7e97b24bc2890b2e6df0df4911eef47bead8171390cda682c5565
+  metadata.gz: e4077997c0ac3aea8d026c48fd63472f9c4d146f091656552a7ae3a72814fa507e915c2d75fc93d76fdb85640235503c611bc82de5489406449276023edd5e3e
+  data.tar.gz: e39d0fbdc6dadf2c53edc647c4ef7acf9194af9d9968299af4a7a2fafbbae6e7892a811e0337049e742f5e2353db8d86e7c2370291b3cde32e9a1d0ab5fda0a6

data/lib/baza-rb/version.rb

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

data/lib/baza-rb.rb

@@ -322,6 +322,7 @@ class BazaRb
   # @raise [ServerFailure] If the save operation fails
   def durable_save(id, file, chunk_size: 1_000_000)
     raise 'The ID of the durable is nil' if id.nil?
+    raise 'The ID of the durable must be an Integer' unless id.is_a?(Integer)
     raise 'The ID of the durable must be a positive integer' unless id.positive?
     raise 'The "file" of the durable is nil' if file.nil?
     raise "The file '#{file}' is absent" unless File.exist?(file)
@@ -338,6 +339,7 @@ class BazaRb
   # @raise [ServerFailure] If the load operation fails
   def durable_load(id, file)
     raise 'The ID of the durable is nil' if id.nil?
+    raise 'The ID of the durable must be an Integer' unless id.is_a?(Integer)
     raise 'The ID of the durable must be a positive integer' unless id.positive?
     raise 'The "file" of the durable is nil' if file.nil?
     elapsed(@loog) do
@@ -353,6 +355,7 @@ class BazaRb
   # @raise [ServerFailure] If the lock operation fails
   def durable_lock(id, owner)
     raise 'The ID of the durable is nil' if id.nil?
+    raise 'The ID of the durable must be an Integer' unless id.is_a?(Integer)
     raise 'The ID of the durable must be a positive integer' unless id.positive?
     raise 'The "owner" of the lock is nil' if owner.nil?
     raise 'The "owner" of the lock may not be empty' if owner.empty?
@@ -372,6 +375,7 @@ class BazaRb
   # @raise [ServerFailure] If the unlock operation fails
   def durable_unlock(id, owner)
     raise 'The ID of the durable is nil' if id.nil?
+    raise 'The ID of the durable must be an Integer' unless id.is_a?(Integer)
     raise 'The ID of the durable must be a positive integer' unless id.positive?
     raise 'The "owner" of the lock is nil' if owner.nil?
     raise 'The "owner" of the lock may not be empty' if owner.empty?
@@ -732,9 +736,9 @@ 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,
@@ -742,7 +746,7 @@ class BazaRb
           headers: headers.merge(
             'Accept' => '*',
             'Accept-Encoding' => 'gzip',
-            'Range' => "bytes=#{pos}-"
+            'Range' => "bytes=#{File.size(file)}-"
           ),
           connecttimeout: @timeout,
           timeout: @timeout
@@ -782,9 +786,8 @@ 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
+        break if total == '0'
         chunk += 1
         sleep(1) if len.zero?
       end

data/test/test_baza-rb.rb

@@ -459,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)
@@ -471,11 +471,24 @@ 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
+
+  def test_durable_load_empty_content
+    WebMock.disable_net_connect!
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'loaded.txt')
+      stub_request(:get, 'https://example.org:443/durables/42')
+        .with(headers: { 'X-Zerocracy-Token' => '000' })
+        .to_return(status: 206, body: '', headers: { 'Content-Range' => 'bytes 0-0/0' })
+      fake_baza.durable_load(42, file)
+      assert_equal('', File.read(file))
     end
   end
 
@@ -483,13 +496,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
 
@@ -681,7 +698,7 @@ class TestBazaRb < Minitest::Test
       with_sinatra_server do |baza|
         file = File.join(dir, 'x.txt')
         baza.durable_load(42, file)
-        assert_equal('Hello, world!', File.read(file))
+        assert_equal("Hello, \xFF\xFE\x12!", File.read(file))
       end
     end
   end
@@ -701,13 +718,13 @@ class TestBazaRb < Minitest::Test
           'I am alive'
         end
         get '/durables/42' do
-          'Hello, world!'
+          \"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::VERBOSE, accept: nil) do
+        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)

metadata

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