fbe 0.26.3 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc174c5cc79f530c5b4fda5b142975fa0dbf6d5e4f9115b9f7534fbf7615936
-  data.tar.gz: '097a486dacea81298ae350b6814c99176aa19ff68dfdfc17ed03bfd9fa7c2023'
+  metadata.gz: c1c2e421e74e63ab817c2f7b55ebb6088f2af186d70bde2709d65e5139de5ce0
+  data.tar.gz: 74dbb872f910195b242b786196833225a4fe65e67658defd7b604a7c770e9bea
 SHA512:
-  metadata.gz: 67ec27c240a1ffe651d5dec12808ff8a4c4819dd40427937aafbe487254d0159011ce331611e1cb0c77be469df85bf52f56cc51725c7b2eaa0cb13f1ef900b42
-  data.tar.gz: 8358352899f9973b85f288eaf9510618ddf3abf69922d5458a381066b06e3497616c5d6da49381644948c3f99ccbee6f982be4d387b26f5b4f6ee9bfba18f7ab
+  metadata.gz: 1933bc86835d0d2ac2e93d098a6bdb289f0be6a6a4610c0acb1a051b8dc0468006d744d5fb4283a704a06c5b03498f08e2af06fdb02f964d234ae2c35368809b
+  data.tar.gz: ae93875f77de5d16a70509d24df508e0dc8c46aec23176ae0aae7482c449d88105803e8e23ca76d52679ca522519c40479699f0a240d393fd2461850bb3c64d0

data/.github/workflows/typos.yml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.35.1
+      - uses: crate-ci/typos@v1.35.2
         with:
           config: .github/.typos.toml

data/lib/fbe/delete.rb

@@ -34,10 +34,11 @@ def Fbe.delete(fact, *props, fb: Fbe.fb, id: '_id')
       before[k] = v
     end
   end
+  before.delete(id)
   fb.query("(eq #{id} #{i})").delete!
   c = fb.insert
   before.each do |k, v|
-    c.send(:"#{k}=", v)
+    c.send(:"#{k}=", v) if c[k].nil?
   end
   c
 end

data/lib/fbe/fb.rb

@@ -33,7 +33,7 @@ def Fbe.fb(fb: $fb, global: $global, options: $options, loog: $loog)
   raise 'The $loog is not set' if loog.nil?
   global[:fb] ||=
     begin
-      rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
+      rules = Dir.glob(File.join(File.join(__dir__, '../../rules'), '*.fe')).map { |f| File.read(f) }
       fbe = Factbase::Rules.new(
         fb,
         "(and \n#{rules.join("\n")}\n)",

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

data/rules/basic.fe

@@ -63,6 +63,12 @@
     (one _time)
     (eq "Time" (type _time)))))
 
+(explain (when
+  (exists _job)
+  (and
+    (one _job)
+    (eq "Integer" (type _job)))))
+
 (explain (when
   (exists _version)
   (and

data/test/fbe/test_copy.rb

@@ -21,7 +21,9 @@ class TestCopy < Fbe::Test
     f2._id = 2
     Fbe.copy(f1, f2)
     assert_equal(2, f2._id)
+    assert_equal([2], f2['_id'])
     assert_equal(42, f2.foo)
+    assert_equal([42], f2['foo'])
   end
 
   def test_with_except

data/test/fbe/test_delete.rb

@@ -4,7 +4,10 @@
 # SPDX-License-Identifier: MIT
 
 require 'factbase'
+require 'judges/options'
+require 'loog'
 require_relative '../../lib/fbe/delete'
+require_relative '../../lib/fbe/fb'
 require_relative '../test__helper'
 
 # Test.
@@ -34,4 +37,37 @@ class TestDelete < Fbe::Test
     assert_equal(1, fb.size)
     assert_equal(0, fb.query('(exists hey)').each.to_a.size)
   end
+
+  def test_deletes_safely
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new(job_id: 42)
+    $loog = Loog::Buffer.new
+    f = Fbe.fb.insert
+    f.foo = 'hello'
+    Fbe.delete(f, 'foo')
+    f2 = Fbe.fb.query('(always)').each.to_a.first
+    assert_equal([1], f2['_id'])
+    assert_equal([42], f2['_job'])
+  end
+
+  def test_deletes_id
+    fb = Factbase.new
+    f = fb.insert
+    f._id = 44
+    Fbe.delete(f, '_id', fb:)
+    f2 = fb.query('(always)').each.to_a.first
+    assert_nil(f2['_id'])
+    assert_empty(f2.all_properties)
+  end
+
+  def test_deletes_when_duplicate_id
+    fb = Factbase.new
+    f = fb.insert
+    f._id = 44
+    f._id = 45
+    Fbe.delete(f, '_id', fb:)
+    f2 = fb.query('(always)').each.to_a.first
+    assert_nil(f2['_id'])
+  end
 end

data/test/fbe/test_fb.rb

@@ -49,6 +49,30 @@ class TestFb < Fbe::Test
     end
   end
 
+  def test_defends_against_duplicates
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new
+    $loog = Loog::Buffer.new
+    assert_raises(StandardError) do
+      Fbe.fb.insert.then do |f|
+        f._id = 42
+        f._id = 43
+      end
+    end
+  end
+
+  def test_sets_job
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new(job_id: 42)
+    $loog = Loog::Buffer.new
+    f = Fbe.fb.insert
+    f.what = 'hello'
+    f = Fbe.fb.query('(eq what "hello")').each.to_a.first
+    assert_equal([42], f['_job'])
+  end
+
   def test_increment_id_in_transaction
     $fb = Factbase.new
     $global = {}

data/test/fbe/test_octo.rb

@@ -176,7 +176,7 @@ class TestOcto < Fbe::Test
       { body: '', headers: { 'X-RateLimit-Remaining' => '5555' } },
       { body: '', headers: { 'X-RateLimit-Remaining' => '5' } }
     )
-    o = Fbe.octo(loog: Loog::VERBOSE, global: {}, options: Judges::Options.new)
+    o = Fbe.octo(loog: Loog::NULL, global: {}, options: Judges::Options.new)
     refute_predicate(o, :off_quota?)
     o.user(42)
     refute_predicate(o, :off_quota?)

data/test/fbe/test_overwrite.rb

@@ -26,6 +26,19 @@ class TestOverwrite < Fbe::Test
     assert_equal(2, fb.query('(always)').each.to_a.first['many'].size)
   end
 
+  def test_avoids_duplicates
+    fb = Factbase.new
+    f = fb.insert
+    f._id = 1
+    f._job = 42
+    f.foo = 'hello'
+    Fbe.overwrite(f, 'foo', 'bye', fb:)
+    f2 = fb.query('(exists foo)').each.to_a.first
+    assert_equal([1], f2['_id'])
+    assert_equal([42], f2['_job'])
+    assert_equal(['bye'], f2['foo'])
+  end
+
   def test_overwrite_twice
     fb = Factbase.new
     f = fb.insert

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.5
 platform: ruby
 authors:
 - Yegor Bugayenko