fbe 0.21.3 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94437e7a9ee360556e5efadf0dda8990f44ae8b5166cb12682b4f77d4d8c054f
-  data.tar.gz: 042b18778e3007c9ea15a6ac60a0f76aa7dfe9f471c2523b657291e9a72df72d
+  metadata.gz: 7faea911e89cea0abccc6d5f664a1ef5dd1ab8b6853ee0b2b6b97077c604f64d
+  data.tar.gz: 88ddb605cd24f68b965aa8ff2200c75c6759d175d130fded4f66ebb02540b00d
 SHA512:
-  metadata.gz: 9566f00402a00f1235452c6ab352b6e2824d1d930b2068c3a10f6acd8201093a6c54a096b987a2603f867927bd1b33402865b48327a8f52559c32ae1927beefe
-  data.tar.gz: 27ce07102a08f9324c6261eedc1bc76d249267df198a1e8834c2ab104a034e9cc7a307e49f8b5aab4dc974a5f6d5f01ad10370c0ced8005b7ccd83543ea350ca
+  metadata.gz: 283110a6a7bd12876e0f383f9d243309b0ff0e9495f0987e1e2dc3a84ce5e76e2aa44e86bafe6bcc992f1ec7eae8f36da7206d8f3b18b57320f9339fb7c781d1
+  data.tar.gz: fd3ce178823ca8e9b830b32143b80babda13d0e5f28549728ecd8d8e7635febc177b8691bd189ef9549d01a2ecf036fc9306697ff31856827ec018268338eb60

data/Gemfile.lock

@@ -10,6 +10,7 @@ PATH
       faraday-http-cache (~> 2.5)
       faraday-multipart (~> 1.1)
       faraday-retry (~> 2.3)
+      filesize (~> 0.2)
       graphql-client (~> 0.26)
       judges (~> 0.46)
       liquid (~> 5.5)
@@ -63,17 +64,19 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    decoor (0.0.1)
+    decoor (0.1.0)
     docile (1.4.1)
     drb (2.2.3)
     elapsed (0.0.1)
       loog (> 0)
       tago (> 0)
+    ellipsized (0.3.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.11.0)
+    factbase (0.11.1)
       backtrace (~> 0.4)
       decoor (~> 0.0)
+      ellipsized (~> 0.3)
       json (~> 2.7)
       logger (~> 1.0)
       loog (~> 0.6)
@@ -98,6 +101,7 @@ GEM
     ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     fiber-storage (1.0.1)
+    filesize (0.2.0)
     gli (2.22.2)
       ostruct
     graphql (2.5.9)
@@ -112,7 +116,7 @@ GEM
       concurrent-ruby (~> 1.0)
     iri (0.11.2)
     json (2.12.2)
-    judges (0.50.3)
+    judges (0.50.5)
       backtrace (~> 0.4)
       baza.rb (~> 0.5)
       concurrent-ruby (~> 1.2)
@@ -180,7 +184,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.76.2)
+    rubocop (1.77.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/fbe.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday-http-cache', '~>2.5'
   s.add_dependency 'faraday-multipart', '~>1.1'
   s.add_dependency 'faraday-retry', '~>2.3'
+  s.add_dependency 'filesize', '~>0.2'
   s.add_dependency 'graphql-client', '~>0.26'
   s.add_dependency 'judges', '~>0.46'
   s.add_dependency 'liquid', '~>5.5'

data/lib/fbe/middleware/sqlite_store.rb

@@ -3,10 +3,11 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
-require 'time'
+require 'filesize'
 require 'json'
-require 'sqlite3'
 require 'loog'
+require 'sqlite3'
+require 'time'
 require_relative '../../fbe'
 require_relative '../../fbe/middleware'
 
@@ -28,7 +29,7 @@ require_relative '../../fbe/middleware'
 #     '/path/to/cache.db',
 #     '1.0.0',
 #     loog: logger,
-#     maxsize: 50 * 1024 * 1024  # 50MB max size
+#     maxsize: '50Mb'
 #   )
 #
 #   # Use with Faraday
@@ -51,8 +52,9 @@ class Fbe::Middleware::SqliteStore
   # @param version [String] Version identifier for cache compatibility
   # @param loog [Loog] Logger instance (optional, defaults to Loog::NULL)
   # @param maxsize [Integer] Maximum database size in bytes (optional, defaults to 10MB)
+  # @param maxvsize [Integer] Maximum size in bytes of a single value (optional, defaults to 10Kb)
   # @raise [ArgumentError] If path is nil/empty, directory doesn't exist, or version is nil/empty
-  def initialize(path, version, loog: Loog::NULL, maxsize: 10 * 1024 * 1024)
+  def initialize(path, version, loog: Loog::NULL, maxsize: '10Mb', maxvsize: '10Kb')
     raise ArgumentError, 'Database path cannot be nil or empty' if path.nil? || path.empty?
     dir = File.dirname(path)
     raise ArgumentError, "Directory #{dir} does not exist" unless File.directory?(dir)
@@ -60,7 +62,8 @@ class Fbe::Middleware::SqliteStore
     @path = File.absolute_path(path)
     @version = version
     @loog = loog
-    @maxsize = maxsize
+    @maxsize = Filesize.from(maxsize.to_s).to_i
+    @maxvsize = Filesize.from(maxvsize.to_s).to_i
   end
 
   # Read a value from the cache.
@@ -91,10 +94,10 @@ class Fbe::Middleware::SqliteStore
   def write(key, value)
     return if value.is_a?(Array) && value.any? do |vv|
       req = JSON.parse(vv[0])
-      req['url'].include?('?') || req['method'] != 'get'
+      req['method'] != 'get'
     end
     value = JSON.dump(value)
-    return if value.bytesize > 10_000
+    return if value.bytesize > @maxvsize
     perform do |t|
       t.execute(<<~SQL, [key, value, Time.now.utc.iso8601])
         INSERT INTO cache(key, value, touched_at) VALUES(?1, ?2, ?3)
@@ -159,8 +162,8 @@ class Fbe::Middleware::SqliteStore
         end
         if File.size(@path) > @maxsize
           @loog.info(
-            "SQLite cache file size (#{File.size(@path)} bytes) exceeds " \
-            "#{@maxsize / 1024 / 1024}MB, cleaning up old entries"
+            "SQLite cache file size (#{Filesize.from(File.size(@path).to_s).pretty} bytes) exceeds " \
+            "#{Filesize.from(@maxsize.to_s).pretty}, cleaning up old entries"
           )
           deleted = 0
           while d.execute(<<~SQL).dig(0, 0) > @maxsize
@@ -176,7 +179,10 @@ class Fbe::Middleware::SqliteStore
             end
           end
           d.execute 'VACUUM;'
-          @loog.info("Deleted #{deleted} old cache entries, new file size: #{File.size(@path)} bytes")
+          @loog.info(
+            "Deleted #{deleted} old cache entries, " \
+            "new file size: #{Filesize.from(File.size(@path).to_s).pretty} bytes"
+          )
         end
         at_exit { @db&.close }
       end

data/lib/fbe/octo.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'decoor'
 require 'faraday/http_cache'
 require 'faraday/retry'
+require 'filesize'
 require 'loog'
 require 'obk'
 require 'octokit'
@@ -82,12 +83,13 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
               backoff_factor: 2
             )
             if options.sqlite_cache
-              maxsize = options.sqlite_cache_maxsize || (10 * 1024 * 1024)
-              store = Fbe::Middleware::SqliteStore.new(options.sqlite_cache, Fbe::VERSION, loog:, maxsize:)
+              maxsize = Filesize.from(options.sqlite_cache_maxsize || '10M').to_i
+              maxvsize = Filesize.from(options.sqlite_cache_maxxsize || '10K').to_i
+              store = Fbe::Middleware::SqliteStore.new(options.sqlite_cache, Fbe::VERSION, loog:, maxsize:, maxvsize:)
               loog.info(
                 "Using HTTP cache in SQLite file: #{store.path} (" \
-                "#{File.exist?(store.path) ? "#{File.size(store.path)} bytes" : 'file is absent'}, " \
-                "max size: #{maxsize / 1024 / 1024}MB)"
+                "#{File.exist?(store.path) ? Filesize.from(File.size(store.path).to_s).pretty : 'file is absent'}, " \
+                "max size: #{Filesize.from(maxsize.to_s).pretty}, max vsize: #{Filesize.from(maxvsize.to_s).pretty})"
               )
               builder.use(
                 Faraday::HttpCache,

data/lib/fbe.rb

@@ -10,5 +10,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by +.rultor.yml+ on every release)
-  VERSION = '0.21.3' unless const_defined?(:VERSION)
+  VERSION = '0.23.0' unless const_defined?(:VERSION)
 end

data/test/fbe/middleware/test_sqlite_store.rb

@@ -33,14 +33,14 @@ class SqliteStoreTest < Fbe::Test
 
   def test_returns_empty_list
     with_tmpfile('b.db') do |f|
-      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0')
+      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0', loog: fake_loog)
       assert_empty(store.all)
     end
   end
 
   def test_clear_all_keys
     with_tmpfile('a.db') do |f|
-      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0')
+      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0', loog: fake_loog)
       k = 'a key'
       store.write(k, 'some value')
       store.clear
@@ -50,20 +50,20 @@ class SqliteStoreTest < Fbe::Test
 
   def test_empty_all_if_not_written
     with_tmpfile do |f|
-      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0')
+      store = Fbe::Middleware::SqliteStore.new(f, '0.0.0', loog: fake_loog)
       assert_empty(store.all)
     end
   end
 
   def test_wrong_db_path
     assert_raises(ArgumentError) do
-      Fbe::Middleware::SqliteStore.new(nil, '0.0.0').read('my_key')
+      Fbe::Middleware::SqliteStore.new(nil, '0.0.0', loog: fake_loog).read('my_key')
     end
     assert_raises(ArgumentError) do
-      Fbe::Middleware::SqliteStore.new('', '0.0.0').read('my_key')
+      Fbe::Middleware::SqliteStore.new('', '0.0.0', loog: fake_loog).read('my_key')
     end
     assert_raises(ArgumentError) do
-      Fbe::Middleware::SqliteStore.new('/fakepath/fakefolder/test.db', '0.0.0').read('my_key')
+      Fbe::Middleware::SqliteStore.new('/fakepath/fakefolder/test.db', '0.0.0', loog: fake_loog).read('my_key')
     end
   end
 
@@ -72,7 +72,7 @@ class SqliteStoreTest < Fbe::Test
       File.binwrite(f, Array.new(20) { rand(0..255) }.pack('C*'))
       ex =
         assert_raises(SQLite3::NotADatabaseException) do
-          Fbe::Middleware::SqliteStore.new(f, '0.0.0').read('my_key')
+          Fbe::Middleware::SqliteStore.new(f, '0.0.0', loog: fake_loog).read('my_key')
         end
       assert_match('file is not a database', ex.message)
     end
@@ -83,7 +83,6 @@ class SqliteStoreTest < Fbe::Test
       require 'tempfile'
       require 'sqlite3'
       require 'fbe/middleware/sqlite_store'
-
       SQLite3::Database.class_eval do
         prepend(Module.new do
           def close
@@ -92,7 +91,6 @@ class SqliteStoreTest < Fbe::Test
           end
         end)
       end
-
       Tempfile.open('test.db') do |f|
         Fbe::Middleware::SqliteStore.new(f.path, '0.0.0').then do |s|
           s.write('my_key', 'my_value')
@@ -111,15 +109,15 @@ class SqliteStoreTest < Fbe::Test
 
   def test_different_versions
     with_tmpfile('d.db') do |f|
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         store.write('kkk1', 'some value')
         store.write('kkk2', 'another value')
       end
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         assert_equal('some value', store.read('kkk1'))
         assert_equal('another value', store.read('kkk2'))
       end
-      Fbe::Middleware::SqliteStore.new(f, '0.0.2').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.2', loog: fake_loog).then do |store|
         assert_nil(store.read('kkk1'))
         assert_nil(store.read('kkk2'))
       end
@@ -129,10 +127,10 @@ class SqliteStoreTest < Fbe::Test
   def test_initialize_wrong_version
     with_tmpfile('e.db') do |f|
       msg = 'Version cannot be nil or empty'
-      assert_raises(ArgumentError) { Fbe::Middleware::SqliteStore.new(f, nil) }.then do |ex|
+      assert_raises(ArgumentError) { Fbe::Middleware::SqliteStore.new(f, nil, loog: fake_loog) }.then do |ex|
         assert_match(msg, ex.message)
       end
-      assert_raises(ArgumentError) { Fbe::Middleware::SqliteStore.new(f, '') }.then do |ex|
+      assert_raises(ArgumentError) { Fbe::Middleware::SqliteStore.new(f, '', loog: fake_loog) }.then do |ex|
         assert_match(msg, ex.message)
       end
     end
@@ -140,11 +138,11 @@ class SqliteStoreTest < Fbe::Test
 
   def test_skip_write_if_value_more_then_10k_bytes
     with_tmpfile('a.db') do |f|
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         store.write('a', 'a' * 9_997)
         store.write('b', 'b' * 9_998)
-        store.write('c', 'c' * 9_999)
-        store.write('d', 'd' * 10_000)
+        store.write('c', 'c' * 19_999)
+        store.write('d', 'd' * 30_000)
         assert_equal('a' * 9_997, store.read('a'))
         assert_equal('b' * 9_998, store.read('b'))
         assert_nil(store.read('c'))
@@ -155,7 +153,7 @@ class SqliteStoreTest < Fbe::Test
 
   def test_shrink_cache_if_more_then_10_mb
     with_tmpfile('large.db') do |f|
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         key = 'aaa'
         alpha = ('a'..'z').to_a
         store.write('a', 'aa')
@@ -173,7 +171,7 @@ class SqliteStoreTest < Fbe::Test
         end
       end
       assert_operator(File.size(f), :>, 10 * 1024 * 1024)
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         assert_equal('aa', store.read('a'))
         assert_nil(store.read('b'))
         assert_equal('cc', store.read('c'))
@@ -193,7 +191,7 @@ class SqliteStoreTest < Fbe::Test
         d.execute 'CREATE TABLE IF NOT EXISTS meta(key TEXT UNIQUE NOT NULL, value TEXT);'
         d.execute "INSERT INTO meta(key, value) VALUES('version', ?);", ['0.0.1']
       end
-      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         assert_equal('value1', store.read('key1'))
         assert_equal('value2', store.read('key2'))
       rescue SQLite3::SQLException => e

data/test/test__helper.rb

@@ -31,6 +31,7 @@ end
 require 'minitest/reporters'
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
 
+require 'loog'
 require 'minitest/stub_const'
 require 'minitest/autorun'
 require 'webmock/minitest'
@@ -38,4 +39,7 @@ require_relative '../lib/fbe'
 
 # Parent class for all tests.
 class Fbe::Test < Minitest::Test
+  def fake_loog
+    Loog::VERBOSE
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.23.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -121,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: graphql-client
   requirement: !ruby/object:Gem::Requirement