baza.rb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055d08eba666af0bcadcea162c8b47ccbdd7b9ffc1647830999112a503ad8907
-  data.tar.gz: 966991989ab8c9fc2dba9f2c2498a38278a8d70195742266d452c34af33328fb
+  metadata.gz: f6ee64c99f7aa6a6254d2a98ffd0a49f33cb5c33992094afedf2d926905b7a24
+  data.tar.gz: 76722a8fdafbc741e314213ae3912ff8e8c6d7368cbde7edbe3ab89c87448916
 SHA512:
-  metadata.gz: e699824b88910aa69f738e3329b62b9aece6b296f1e7aec9917b44044b32e14845f1700d774fb4386977fe64a03fcb5bd5e39c15ea4c40053d814a632b95d1ea
-  data.tar.gz: f462b2fcada287d6f6af5f6d11bad0651cfbad83b079957a43fcac92cf8947c479be776c73c8346281e82c78803782c44919d8c19ef38670db344435365b15b8
+  metadata.gz: 351ef08d92a9d637b51b163db95e26b8927abed703a51a1362e4fe51a10714c97afa7b16700bc348cfa4de168788929f5abb89c62e59a4ecf53ce2cd588b3cec
+  data.tar.gz: 6560d77ff5939235f2db005c6151e3cf83ea0d8b40f4c0b7e84c6dde97caaa25daad25beb4cd3dbb936e837601783454b9eefad8bc0a56320d4a4c44d6e1b555

data/Gemfile.lock

@@ -107,7 +107,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.76.0)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -118,7 +118,7 @@ GEM
       rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-minitest (0.38.1)

data/lib/baza-rb/fake.rb

@@ -123,6 +123,17 @@ class BazaRb::Fake
     true
   end
 
+  # Find a single durable.
+  #
+  # @param [String] jname The name of the job on the server
+  # @param [String] file The path to the file to upload
+  # @return [Integer] Always returns 42 as the fake durable ID
+  def durable_find(jname, file)
+    assert_name(jname)
+    assert_file(file)
+    42
+  end
+
   # Place a single durable file on the server.
   #
   # @param [String] jname The name of the job on the server

data/lib/baza-rb/version.rb

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

data/lib/baza-rb.rb

@@ -158,25 +158,7 @@ class BazaRb
     data = ''
     elapsed(@loog) do
       Tempfile.open do |file|
-        File.open(file, 'wb') do |f|
-          request = Typhoeus::Request.new(
-            home.append('pull').append("#{id}.fb").to_s,
-            method: :get,
-            headers: headers.merge(
-              'Accept' => 'application/zip, application/factbase'
-            ),
-            accept_encoding: 'gzip',
-            connecttimeout: @timeout,
-            timeout: @timeout
-          )
-          request.on_body do |chunk|
-            f.write(chunk)
-          end
-          retry_it do
-            request.run
-          end
-          checked(request.response)
-        end
+        download(home.append('pull').append("#{id}.fb").to_s, file.path)
         data = File.binread(file)
         throw :"Pulled #{data.bytesize} bytes of job ##{id} factbase at #{@host}"
       end
@@ -446,26 +428,8 @@ class BazaRb
     raise 'The ID of the durable is nil' if id.nil?
     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?
-    FileUtils.mkdir_p(File.dirname(file))
     elapsed(@loog) do
-      File.open(file, 'wb') do |f|
-        request = Typhoeus::Request.new(
-          home.append('durables').append(id).to_s,
-          method: :get,
-          headers: headers.merge(
-            'Accept' => 'application/octet-stream'
-          ),
-          connecttimeout: @timeout,
-          timeout: @timeout
-        )
-        request.on_body do |chunk|
-          f.write(chunk)
-        end
-        retry_it do
-          request.run
-        end
-        checked(request.response)
-      end
+      download(home.append('durables').append(id).to_s, file)
       throw :"Durable ##{id} loaded #{File.size(file)} bytes from #{@host}"
     end
   end
@@ -639,55 +603,28 @@ class BazaRb
   # @return [Boolean] TRUE if a job was successfully popped, FALSE if queue is empty
   # @raise [ServerFailure] If the pop operation fails
   def pop(owner, zip)
-    raise 'The "zip" of the job is nil' if zip.nil?
     success = false
-    FileUtils.rm_f(zip)
-    job = nil
     elapsed(@loog) do
-      File.open(zip, 'wb+') do |f|
-        loop do
-          uri = home.append('pop').add(owner:)
-          uri = uri.add(job:) if job
-          request = Typhoeus::Request.new(
-            uri.to_s,
-            method: :get,
-            headers: headers.merge(
-              'Accept' => 'application/octet-stream',
-              'Range' => "bytes=#{f.size}-"
+      uri = home.append('pop').add(owner:)
+      ret =
+        retry_it do
+          checked(
+            Typhoeus::Request.get(
+              uri.to_s,
+              headers:
             ),
-            connecttimeout: @timeout,
-            timeout: @timeout
+            [200, 204, 206]
           )
-          request.on_body do |chunk|
-            f.write(chunk)
-          end
-          retry_it do
-            request.run
-          end
-          ret = request.response
-          checked(ret, [200, 204, 206])
-          success = ret.code != 204
-          break unless ret.code == 206
-          job = ret.headers['X-Zerocracy-JobId']
-          raise 'Job ID is not returned in X-Zerocracy-JobId' if job.nil?
-          raise "Job ID returned in X-Zerocracy-JobId is not valid (#{job.inspect})" unless job.match?(/^[0-9]+$/)
-          _, v = ret.headers['Content-Range'].split
-          range, total = v.split('/')
-          raise "Total size is not valid (#{total.inspect})" unless total.match?(/^\*|[0-9]+$/)
-          b, e = range.split('-')
-          raise "Range is not valid (#{range.inspect})" unless e.match?(/^[0-9]+$/)
-          len = ret.headers['Content-Length'].to_i
-          unless len.zero?
-            raise "Range size (#{range.inspect}) is not equal to Content-Length" unless len - 1 == e.to_i - b.to_i
-            raise "Range end (#{range.inspect}) is not equal to #{f.size}" if e.to_i != f.size - 1
-          end
-          break if e.to_i == total.to_i - 1
         end
-      end
-      unless success
+      if ret.code == 204
         FileUtils.rm_f(zip)
-        throw :"Nothing to pop at #{@host}"
+        throw :"Nothing to pop at #{uri}"
       end
+      job = ret.headers['X-Zerocracy-JobId']
+      raise 'Job ID is not returned in X-Zerocracy-JobId' if job.nil?
+      raise "Job ID returned in X-Zerocracy-JobId is not valid (#{job.inspect})" unless job.match?(/^[0-9]+$/)
+      download(uri.add(job:), zip)
+      success = true
       throw :"Popped #{File.size(zip)} bytes in ZIP archive at #{@host}"
     end
     success
@@ -883,4 +820,49 @@ class BazaRb
     @loog.error(msg)
     raise ServerFailure, msg
   end
+
+  # Download file via GET, in ranges.
+  # @param [String] uri The URI
+  # @param [String] file The path to save to
+  def download(uri, file)
+    raise 'The "file" is nil' if file.nil?
+    FileUtils.mkdir_p(File.dirname(file))
+    elapsed(@loog) do
+      File.open(file, 'wb+') do |f|
+        loop do
+          request = Typhoeus::Request.new(
+            uri.to_s,
+            method: :get,
+            headers: headers.merge(
+              'Accept' => 'application/octet-stream',
+              'Range' => "bytes=#{f.size}-"
+            ),
+            connecttimeout: @timeout,
+            timeout: @timeout
+          )
+          request.on_body do |chunk|
+            f.write(chunk)
+          end
+          retry_it do
+            request.run
+          end
+          ret = request.response
+          checked(ret, [200, 206])
+          break if ret.code == 200
+          _, v = ret.headers['Content-Range'].split
+          range, total = v.split('/')
+          raise "Total size is not valid (#{total.inspect})" unless total.match?(/^\*|[0-9]+$/)
+          b, e = range.split('-')
+          raise "Range is not valid (#{range.inspect})" unless e.match?(/^[0-9]+$/)
+          len = ret.headers['Content-Length'].to_i
+          unless len.zero?
+            raise "Range size (#{range.inspect}) is not equal to Content-Length" unless len - 1 == e.to_i - b.to_i
+            raise "Range end (#{range.inspect}) is not equal to #{f.size}" if e.to_i != f.size - 1
+          end
+          break if e.to_i == total.to_i - 1
+        end
+      end
+      throw :"Downloaded #{File.size(file)} bytes from #{uri}"
+    end
+  end
 end

metadata

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