fbe 0.26.10 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33191f9b5caa7d78adcc43470dce7ff68e065615b307771c5e9a3a654f04a685
-  data.tar.gz: 6e45dcbc39ccb971d2ad3262873dbd78751c83b24e4ee6b80fe2a28321119ede
+  metadata.gz: adc685c3339da51fe5383adf29077dbd80f69119ee9b0586c2057a4306f5fdf8
+  data.tar.gz: d32fc6fa6429d9cd5496ccd9e3713eb58addb2a7d5c33e95110d862c190c2816
 SHA512:
-  metadata.gz: 6e820a534570250582bbec0bd14db5fe0b436d2df6f5a00bb89f8b24b01850641f21c184909e1ed41c1cd3cd1d43cc3c65d64ff01405a9ebe13ea6be507aa02e
-  data.tar.gz: cd81c87c21eaff9f4e23e96eb18a327d599555186fac0c4dc110129a4ca6797ded2ef9931aaa9dd1e346da5cf2caaf5f3ff4173b251bac07dd24e41d9b32e888
+  metadata.gz: d3adb34a8a544118f6d29ebf354714f2fea1dc8b402a81ecf0047d64abc009855c5acb909b7eba9fa9fe860531a053750a8e78c671019967da3178b8d147e5c8
+  data.tar.gz: 1d05a3074bc928d4eec38529866ef39e11f077f30c8906be3af99a124b89155bcd0ed2ab69a4bb258d2337fa85484c1c8d9b1ecf0e60169d1d81f0cc5e862037

data/.github/workflows/actionlint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Download actionlint
         id: get_actionlint
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)

data/.github/workflows/codecov.yml

@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3

data/.github/workflows/copyrights.yml

@@ -11,5 +11,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: yegor256/copyrights-action@0.0.12

data/.github/workflows/markdown-lint.yml

@@ -19,5 +19,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: DavidAnson/markdownlint-cli2-action@v20.0.0

data/.github/workflows/pdd.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -18,7 +18,7 @@ jobs:
         ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/reuse.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: fsfe/reuse-action@v5

data/.github/workflows/typos.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.35.3
+      - uses: actions/checkout@v5
+      - uses: crate-ci/typos@v1.35.5
         with:
           config: .github/.typos.toml

data/.github/workflows/xcop.yml

@@ -11,5 +11,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: g4s8/xcop-action@master

data/.github/workflows/yamllint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ibiqlik/action-yamllint@v3
         with:
           config_file: .yamllint.yml

data/Gemfile.lock

@@ -28,7 +28,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -47,7 +47,7 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.10.0)
+    baza.rb (0.10.1)
       backtrace (~> 0.4)
       elapsed (~> 0.0)
       faraday (~> 2.13)
@@ -74,18 +74,18 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    ethon (0.16.0)
+    ethon (0.17.0)
       ffi (>= 1.15.0)
-    factbase (0.14.7)
+    factbase (0.15.6)
       backtrace (~> 0.4)
-      decoor (~> 0.0)
+      decoor (~> 0.1)
       ellipsized (~> 0.3)
       json (~> 2.7)
       logger (~> 1.0)
       loog (~> 0.6)
       nokogiri (~> 1.10)
-      others (~> 0.0)
-      tago (~> 0.0)
+      others (~> 0.1)
+      tago (~> 0.1)
       yaml (~> 0.3)
     faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
@@ -121,7 +121,7 @@ GEM
     iri (0.11.2)
     joined (0.4.0)
     json (2.13.2)
-    judges (0.52.2)
+    judges (0.53.1)
       backtrace (~> 0.4)
       baza.rb (~> 0.5)
       concurrent-ruby (~> 1.2)
@@ -186,10 +186,10 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    regexp_parser (2.11.1)
+    regexp_parser (2.11.2)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.79.2)
+    rubocop (1.80.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -240,12 +240,12 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
     veils (0.4.0)
-    verbose (0.0.2)
+    verbose (0.1.0)
       loog (~> 0.2)
       tago (~> 0.0)
     webmock (3.25.1)

data/lib/fbe/delete.rb

@@ -30,16 +30,17 @@ def Fbe.delete(fact, *props, fb: Fbe.fb, id: '_id')
   before = {}
   fact.all_properties.each do |k|
     next if props.include?(k)
-    fact[k].each do |v|
-      before[k] = v
-    end
+    before[k] = fact[k]
   end
   before.delete(id)
   fb.query("(eq #{id} #{i})").delete!
   fb.txn do |fbt|
     c = fbt.insert
-    before.each do |k, v|
-      c.send(:"#{k}=", v) if c[k].nil?
+    before.each do |k, vv|
+      next unless c[k].nil?
+      vv.each do |v|
+        c.send(:"#{k}=", v)
+      end
     end
   end
   nil

data/lib/fbe/delete_one.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
+# SPDX-License-Identifier: MIT
+
+require_relative '../fbe'
+require_relative 'fb'
+
+# Delete one value of a property.
+#
+# This method doesn't modify the original fact. Instead, it deletes the existing
+# fact from the factbase and creates a new one with all properties except the one
+# specified for deletion.
+#
+# @param [Factbase::Fact] fact The fact to delete properties from (must have an ID)
+# @param [String] prop The property name
+# @param [Any] value The value to delete
+# @param [Factbase] fb The factbase to use (defaults to Fbe.fb)
+# @param [String] id The property name used as unique identifier (defaults to '_id')
+# @return [nil] Nothing
+def Fbe.delete_one(fact, prop, value, fb: Fbe.fb, id: '_id')
+  raise 'The fact is nil' if fact.nil?
+  i = fact[id]
+  raise "There is no #{id.inspect} in the fact" if i.nil?
+  i = i.first
+  before = {}
+  fact.all_properties.each do |k|
+    before[k] = fact[k]
+  end
+  return unless before[prop]
+  before[prop] = before[prop] - [value]
+  before.delete(prop) if before[prop].empty?
+  fb.query("(eq #{id} #{i})").delete!
+  fb.txn do |fbt|
+    c = fbt.insert
+    before.each do |k, vv|
+      next unless c[k].nil?
+      vv.each do |v|
+        c.send(:"#{k}=", v)
+      end
+    end
+  end
+  nil
+end

data/lib/fbe/iterate.rb

@@ -204,16 +204,16 @@ class Fbe::Iterate
       @loog.debug('We are off GitHub quota, cannot even start, sorry')
       return
     end
-    repos = Fbe.unmask_repos(loog: @loog, options: @options, global: @global)
+    repos = Fbe.unmask_repos(loog: @loog, options: @options, global: @global, quota_aware: @quota_aware)
     restarted = []
     start = Time.now
     loop do
-      if oct.off_quota?
+      if @quota_aware && oct.off_quota?
         @loog.info("We are off GitHub quota, time to stop after #{start.ago}")
         break
       end
       repos.each do |repo|
-        if oct.off_quota?
+        if @quota_aware && oct.off_quota?
           @loog.debug("We are off GitHub quota, we must skip #{repo}")
           break
         end
@@ -266,10 +266,6 @@ class Fbe::Iterate
         @loog.debug("All #{repos.size} repos restarted, quitting after #{start.ago}")
         break
       end
-      if Time.now - start > timeout
-        @loog.info("We are iterating for #{start.ago} already, time to give up")
-        break
-      end
     end
     @loog.debug("Finished scanning #{repos.size} repos in #{start.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
   end

data/lib/fbe/middleware/trace.rb

@@ -52,7 +52,7 @@ class Fbe::Middleware::Trace < Faraday::Middleware
     @app.call(env).on_complete do |response_env|
       next if !@ignores.empty? &&
               response_env[:http_cache_trace] &&
-              (response_env[:http_cache_trace] & @ignores).size.positive?
+              response_env[:http_cache_trace].intersect?(@ignores)
       finished = Time.now
       duration = finished - entry[:started_at]
       entry[:status] = response_env.status

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

data/test/fbe/middleware/test_sqlite_store.rb

@@ -155,7 +155,6 @@ 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', loog: fake_loog).then do |store|
-        key = 'aaa'
         store.write('a', 'aa')
         Time.stub(:now, (Time.now - (5 * 60 * 60)).round) do
           store.write('b', 'bb')
@@ -163,8 +162,9 @@ 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
+          key = 'a' * 65_536
+          value = SecureRandom.alphanumeric(8_192)
+          52.times do
             store.write(key, value)
             key = key.next
           end

data/test/fbe/test_delete.rb

@@ -27,6 +27,29 @@ class TestDelete < Fbe::Test
     assert_equal(4, fb.query('(exists hey)').each.first.hey)
   end
 
+  def test_deletes_when_many
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 'hello'
+    f.bar = 4
+    f._id = 555
+    Fbe.delete(f, 'bar', fb:)
+    assert_equal(1, fb.size)
+    assert_equal([42, 'hello'], fb.query('(exists foo)').each.first['foo'])
+  end
+
+  def test_deletes_nothing
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 'hello'
+    f._id = 555
+    Fbe.delete(f, 'bar', fb:)
+    assert_equal(1, fb.size)
+    assert_equal([42, 'hello'], fb.query('(exists foo)').each.first['foo'])
+  end
+
   def test_deletes_two_properties
     fb = Factbase.new
     f = fb.insert

data/test/fbe/test_delete_one.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
+# SPDX-License-Identifier: MIT
+
+require 'factbase'
+require 'judges/options'
+require 'loog'
+require_relative '../../lib/fbe/delete_one'
+require_relative '../../lib/fbe/fb'
+require_relative '../test__helper'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Zerocracy
+# License:: MIT
+class TestDeleteOne < Fbe::Test
+  def test_deletes_one_value
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 'hello'
+    f._id = 555
+    Fbe.delete_one(f, 'foo', 42, fb:)
+    assert_equal(1, fb.size)
+    assert_equal(1, fb.query('(exists foo)').each.to_a.size)
+    assert_equal(0, fb.query('(eq foo 42)').each.to_a.size)
+    assert_equal(['hello'], fb.query('(exists foo)').each.first['foo'])
+  end
+
+  def test_deletes_when_many
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 'hello'
+    f.bar = 44
+    f._id = 555
+    Fbe.delete_one(f, 'bar', 44, fb:)
+    assert_equal(1, fb.size)
+    assert_equal(1, fb.query('(exists foo)').each.to_a.size)
+    assert_equal(1, fb.query('(eq foo 42)').each.to_a.size)
+    assert_equal([42, 'hello'], fb.query('(exists foo)').each.first['foo'])
+  end
+
+  def test_deletes_nothing
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 'hello'
+    f._id = 555
+    Fbe.delete_one(f, 'bar', 42, fb:)
+    assert_equal(1, fb.size)
+    assert_equal(1, fb.query('(exists foo)').each.to_a.size)
+    assert_equal(1, fb.query('(eq foo 42)').each.to_a.size)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.26.10
+  version: 0.27.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -368,6 +368,7 @@ files:
 - lib/fbe/conclude.rb
 - lib/fbe/copy.rb
 - lib/fbe/delete.rb
+- lib/fbe/delete_one.rb
 - lib/fbe/enter.rb
 - lib/fbe/fb.rb
 - lib/fbe/github_graph.rb
@@ -399,6 +400,7 @@ files:
 - test/fbe/test_conclude.rb
 - test/fbe/test_copy.rb
 - test/fbe/test_delete.rb
+- test/fbe/test_delete_one.rb
 - test/fbe/test_enter.rb
 - test/fbe/test_fb.rb
 - test/fbe/test_github_graph.rb
@@ -436,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: FactBase Extended (FBE), a collection of utility classes for Zerocracy judges
 test_files: []