fbe 0.23.8 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec8e019e6882387cebf8cd4f6c9ba1bbfc3287dc6558e8275d717b7f944273f
-  data.tar.gz: 3d21ec46863d2ba0e241d5d766c49521ecde20d8f683f104e2c50de917f90978
+  metadata.gz: ce6c8e11155234d3e42b7b78fc60f9dc8584a173d0d248b604bd61b39d26180f
+  data.tar.gz: 8a642207f5d847c3bbc795f0c48f3410f49e8c9641a3108d14ac6802b398e91e
 SHA512:
-  metadata.gz: 47f5e2144c9a13003d0cde086902abe2258fbbe471359e1bb38f84083cd8d5d0cacf9ecb8153fa7810ef3613193b81fef3ebc5a41d648778cf692a90980bc141
-  data.tar.gz: 3146af1240d7cb7028d93267d9b52db316d5d3f3352e1996db2d7852cfa6347ef2cbf2e21bc405bb135076805463199719eb66e48be26f65d69b8afc7362c56f
+  metadata.gz: e4440719106088a76557dffdc71fd9b91c3f1f25bb5eb7cd98cb1e5afc8f32d182bc4a0fb58ab47901b3c5394c1b8d213593b2a34419095816917c1756632667
+  data.tar.gz: 5b2930074b232c9be48e45addab74d7d3cb806e145445adc488e8bbec35d1c598713aed670cfc65a7238dd21a46dd9d03ed4c145714e95dafb3e5aa627f2416e

data/Gemfile.lock

@@ -3,8 +3,8 @@ PATH
   specs:
     fbe (0.0.0)
       backtrace (~> 0.4)
-      baza.rb (~> 0.5)
-      decoor (~> 0.0)
+      baza.rb (~> 0.9)
+      decoor (~> 0.1)
       ellipsized (~> 0.3)
       factbase (~> 0.11)
       faraday (~> 2.0)
@@ -19,7 +19,7 @@ PATH
       loog (~> 0.6)
       obk (~> 0.3)
       octokit (~> 10.0)
-      others (~> 0.0)
+      others (~> 0.1)
       sqlite3 (~> 2.6)
       tago (~> 0.1)
       verbose (~> 0.0)
@@ -46,7 +46,7 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.9.6)
+    baza.rb (0.9.7)
       backtrace (~> 0.4)
       elapsed (~> 0.0)
       faraday (~> 2.13)
@@ -75,7 +75,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.12.1)
+    factbase (0.13.0)
       backtrace (~> 0.4)
       decoor (~> 0.0)
       ellipsized (~> 0.3)
@@ -106,7 +106,7 @@ GEM
     filesize (0.2.0)
     gli (2.22.2)
       ostruct
-    graphql (2.5.9)
+    graphql (2.5.10)
       base64
       fiber-storage
       logger

data/fbe.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_dependency 'backtrace', '~>0.4'
-  s.add_dependency 'baza.rb', '~>0.5'
-  s.add_dependency 'decoor', '~>0.0'
+  s.add_dependency 'baza.rb', '~>0.9'
+  s.add_dependency 'decoor', '~>0.1'
   s.add_dependency 'ellipsized', '~>0.3'
   s.add_dependency 'factbase', '~>0.11'
   s.add_dependency 'faraday', '~>2.0'
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'loog', '~>0.6'
   s.add_dependency 'obk', '~>0.3'
   s.add_dependency 'octokit', '~>10.0'
-  s.add_dependency 'others', '~>0.0'
+  s.add_dependency 'others', '~>0.1'
   s.add_dependency 'sqlite3', '~> 2.6'
   s.add_dependency 'tago', '~>0.1'
   s.add_dependency 'verbose', '~>0.0'

data/lib/fbe/conclude.rb

@@ -182,8 +182,8 @@ class Fbe::Conclude
     passed = 0
     start = Time.now
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
-    @fb.txn do |fbt|
-      fbt.query(@query).each do |a|
+    @fb.query(@query).each do |a|
+      @fb.txn do |fbt|
         if @quota_aware && oct.off_quota?
           @loog.debug('We ran out of GitHub quota, must stop here')
           throw :commit

data/lib/fbe/middleware/sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'zlib'
 require 'filesize'
 require 'json'
 require 'loog'
@@ -73,7 +74,13 @@ class Fbe::Middleware::SqliteStore
       t.execute('UPDATE cache SET touched_at = ?2 WHERE key = ?1;', [key, Time.now.utc.iso8601])
       t.execute('SELECT value FROM cache WHERE key = ? LIMIT 1;', [key])
     end.dig(0, 0)
-    JSON.parse(value) if value
+    return unless value
+    begin
+      JSON.parse(Zlib::Inflate.inflate(value))
+    rescue Zlib::Error => e
+      @loog.info("Failed to decompress cached value for key: #{key}, error: #{e.message}, the key will be deleted")
+      delete(key)
+    end
   end
 
   # Delete a key from the cache.
@@ -95,7 +102,7 @@ class Fbe::Middleware::SqliteStore
       req = JSON.parse(vv[0])
       req['method'] != 'get'
     end
-    value = JSON.dump(value)
+    value = Zlib::Deflate.deflate(JSON.dump(value))
     return if value.bytesize > @maxvsize
     perform do |t|
       t.execute(<<~SQL, [key, value, Time.now.utc.iso8601])

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.23.8' unless const_defined?(:VERSION)
+  VERSION = '0.24.1' unless const_defined?(:VERSION)
 end

data/test/fbe/middleware/test_sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'securerandom'
 require 'qbash'
 require_relative '../../test__helper'
 require_relative '../../../lib/fbe/middleware'
@@ -141,8 +142,8 @@ class SqliteStoreTest < Fbe::Test
       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' * 19_999)
-        store.write('d', 'd' * 30_000)
+        store.write('c', SecureRandom.alphanumeric((19_999 * 1.4).to_i))
+        store.write('d', SecureRandom.alphanumeric((30_000 * 1.4).to_i))
         assert_equal('a' * 9_997, store.read('a'))
         assert_equal('b' * 9_998, store.read('b'))
         assert_nil(store.read('c'))
@@ -155,7 +156,6 @@ class SqliteStoreTest < Fbe::Test
     with_tmpfile('large.db') do |f|
       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')
         Time.stub(:now, (Time.now - (5 * 60 * 60)).round) do
           store.write('b', 'bb')
@@ -163,8 +163,8 @@ class SqliteStoreTest < Fbe::Test
         end
         assert_equal('cc', store.read('c'))
         Time.stub(:now, rand((Time.now - (5 * 60 * 60))..Time.now).round) do
+          value = SecureRandom.alphanumeric(2048)
           10_240.times do
-            value = alpha.sample * rand(1024..2048)
             store.write(key, value)
             key = key.next
           end
@@ -185,8 +185,8 @@ class SqliteStoreTest < Fbe::Test
       SQLite3::Database.new(f).tap do |d|
         d.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
         [
-          ['key1', JSON.dump('value1')],
-          ['key2', JSON.dump('value2')]
+          ['key1', Zlib::Deflate.deflate(JSON.dump('value1'))],
+          ['key2', Zlib::Deflate.deflate(JSON.dump('value2'))]
         ].each { d.execute 'INSERT INTO cache(key, value) VALUES(?1, ?2);', _1 }
         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']
@@ -200,6 +200,43 @@ class SqliteStoreTest < Fbe::Test
     end
   end
 
+  def test_use_compress_for_stored_data
+    with_tmpfile('c.db') do |f|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
+        a = SecureRandom.alphanumeric(200)
+        store.write('a', a)
+        store.write('b', 'b' * 100_000)
+        assert_equal(a, store.read('a'))
+        assert_equal('b' * 100_000, store.read('b'))
+        store.all.each do |k, v|
+          case k
+          when 'a'
+            assert_operator(v.size, :<, a.size)
+          when 'b'
+            assert_operator(v.size, :<, 100_000)
+          end
+        end
+      end
+    end
+  end
+
+  def test_corrupted_compression_stored_data
+    with_tmpfile('c.db') do |f|
+      SQLite3::Database.new(f).tap do |d|
+        d.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
+        [
+          ['my_key', JSON.dump('value1')]
+        ].each { d.execute 'INSERT INTO cache(key, value) VALUES(?1, ?2);', _1 }
+        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', loog: fake_loog).then do |store|
+        assert_nil(store.read('my_key'))
+        assert_predicate(store.all.count, :zero?)
+      end
+    end
+  end
+
   private
 
   def with_tmpfile(name = 'test.db', &)

data/test/fbe/test_conclude.rb

@@ -47,6 +47,22 @@ class TestConclude < Fbe::Test
     assert_includes(f.details, 'funny')
   end
 
+  def test_draw_with_rollback
+    $fb = Factbase.new
+    $global = {}
+    $loog = Loog::NULL
+    $options = Judges::Options.new
+    $fb.insert.foo = 1
+    Fbe.conclude(judge: 'judge-one') do
+      on '(exists foo)'
+      draw do |n, prev|
+        n.hello = prev.foo
+        throw :rollback
+      end
+    end
+    assert_equal(1, $fb.size)
+  end
+
   def test_consider
     fb = Factbase.new
     fb.insert.foo = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.23.8
+  version: 0.24.1
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: decoor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ellipsized
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +253,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement