factbase 0.7.2 → 0.7.4

data/test/factbase/test_taped.rb

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/taped'
 
@@ -11,7 +11,7 @@ require_relative '../../lib/factbase/taped'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestTaped < Minitest::Test
+class TestTaped < Factbase::Test
   def test_tracks_insertion
     t = Factbase::Taped.new([])
     t << {}
@@ -33,4 +33,14 @@ class TestTaped < Minitest::Test
     assert_equal(1, t.added.size)
     assert_equal(h.object_id, t.added.first)
   end
+
+  def test_tracks_addition_uniquely
+    h = { f: 5 }
+    t = Factbase::Taped.new([h])
+    t.each do |m|
+      m[:bar] = 66
+      m[:foo] = 77
+    end
+    assert_equal(1, t.added.size)
+  end
 end

data/test/factbase/test_tee.rb

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/tee'
 require_relative '../../lib/factbase/fact'
@@ -12,7 +12,7 @@ require_relative '../../lib/factbase/fact'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestTee < Minitest::Test
+class TestTee < Factbase::Test
   def test_two_facts
     prim = Factbase::Fact.new(Factbase.new, Mutex.new, {})
     prim.foo = 42

data/test/factbase/test_term.rb

@@ -3,14 +3,14 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require_relative '../../lib/factbase/term'
 
 # Term test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestTerm < Minitest::Test
+class TestTerm < Factbase::Test
   def test_false_matching
     t = Factbase::Term.new(Factbase.new, :never, [])
     refute(t.evaluate(fact('foo' => [100]), []))

data/test/factbase/test_to_json.rb

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require 'loog'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/to_json'
@@ -12,7 +12,7 @@ require_relative '../../lib/factbase/to_json'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestToJSON < Minitest::Test
+class TestToJSON < Factbase::Test
   def test_simple_rendering
     fb = Factbase.new
     f = fb.insert

data/test/factbase/test_to_xml.rb

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require 'loog'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/to_xml'
@@ -12,7 +12,7 @@ require_relative '../../lib/factbase/to_xml'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestToXML < Minitest::Test
+class TestToXML < Factbase::Test
   def test_simple_rendering
     fb = Factbase.new
     fb.insert.t = Time.now

data/test/factbase/test_to_yaml.rb

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
+require_relative '../test__helper'
 require 'loog'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/to_yaml'
@@ -12,7 +12,7 @@ require_relative '../../lib/factbase/to_yaml'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestToYAML < Minitest::Test
+class TestToYAML < Factbase::Test
   def test_simple_rendering
     fb = Factbase.new
     f = fb.insert

data/test/test__helper.rb

@@ -17,8 +17,10 @@ require 'minitest/autorun'
 require 'minitest/reporters'
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
 
+require_relative '../lib/factbase'
+
 # Default methods for all tests.
-class Minitest::Test
+class Factbase::Test < Minitest::Test
   def fact(map = {})
     require 'factbase/fact'
     Factbase::Fact.new(Factbase.new, Mutex.new, map)

data/test/test_factbase.rb

@@ -3,20 +3,20 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'minitest/autorun'
 require 'loog'
 require 'threads'
 require_relative '../lib/factbase'
-require_relative '../lib/factbase/rules'
 require_relative '../lib/factbase/inv'
+require_relative '../lib/factbase/logged'
 require_relative '../lib/factbase/pre'
-require_relative '../lib/factbase/looged'
+require_relative '../lib/factbase/rules'
+require_relative 'test__helper'
 
 # Factbase main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
-class TestFactbase < Minitest::Test
+class TestFactbase < Factbase::Test
   def test_injects_data_correctly
     maps = []
     fb = Factbase.new(maps)
@@ -104,11 +104,11 @@ class TestFactbase < Minitest::Test
 
   def test_txn_returns_boolean
     fb = Factbase.new
-    assert_equal(1, fb.txn(&:insert))
-    assert_equal(1, fb.txn { |fbt| fbt.insert.bar = 42 })
-    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a })
-    assert_equal(2, fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } })
-    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 })
+    assert_equal(1, fb.txn(&:insert).to_i)
+    assert_equal(1, fb.txn { |fbt| fbt.insert.bar = 42 }.to_i)
+    assert_equal(0, fb.txn { |fbt| fbt.query('(always)').each.to_a }.to_i)
+    assert_equal(2, fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } }.to_i)
+    assert_equal(1, fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 }.to_i)
   end
 
   def test_appends_in_txn
@@ -177,7 +177,7 @@ class TestFactbase < Minitest::Test
       Factbase::Rules.new(Factbase.new, '(always)'),
       Factbase::Inv.new(Factbase.new) { |_, _| true },
       Factbase::Pre.new(Factbase.new) { |_| true },
-      Factbase::Looged.new(Factbase.new, Loog::NULL)
+      Factbase::Logged.new(Factbase.new, Loog::NULL)
     ].each do |d|
       f = d.insert
       f.foo = 42
@@ -212,15 +212,48 @@ class TestFactbase < Minitest::Test
     assert_equal(1, fb.query('(exists xyz)').each.to_a.size)
   end
 
+  def test_evals_complex_txn
+    fb = Factbase.new
+    n = fb.insert
+    n.foo = 42
+    n.bar = 555
+    fb.txn do |fbt|
+      fbt.insert.foo = 333
+      fbt.insert.bar = 333
+      fbt.query('(eq bar 555)').delete!
+      fbt.insert.bar = 555
+      fbt.query('(eq bar 777)').delete! # nothing to be deleted
+      n1 = fbt.insert
+      n1.bar = 9
+      n1.bar = 99
+    end
+    assert_equal(4, fb.query('(always)').each.to_a.size)
+  end
+
   def test_txn_with_rollback
     fb = Factbase.new
+    n = fb.insert
+    n.bar = 55
     modified =
       fb.txn do |fbt|
         fbt.insert.bar = 33
+        fbt.query('(eq bar 55)').each.to_a.first.boom = 44
         raise Factbase::Rollback
       end
-    assert_equal(0, modified)
-    assert_equal(0, fb.query('(always)').each.to_a.size)
+    assert_equal(0, modified.to_i)
+    assert_equal(1, fb.query('(always)').each.to_a.size)
+    assert_equal(0, fb.query('(exists boom)').each.to_a.size)
+  end
+
+  def test_modifies_existing_fact_in_txn
+    fb = Factbase.new
+    n = fb.insert
+    n.foo = 1
+    fb.txn do |fbt|
+      f = fbt.query('(always)').each.to_a.first
+      f.bar = 2
+    end
+    assert_equal(1, fb.query('(eq foo 1)').each.to_a.size)
   end
 
   def test_simple_concurrent_inserts

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -158,7 +157,9 @@ files:
 - README.md
 - REUSE.toml
 - Rakefile
-- benchmarks/simple.rb
+- benchmark/bench_factbase.rb
+- benchmark/bench_query.rb
+- benchmark/bench_taped.rb
 - factbase.gemspec
 - lib/factbase.rb
 - lib/factbase/accum.rb
@@ -167,6 +168,7 @@ files:
 - lib/factbase/flatten.rb
 - lib/factbase/inv.rb
 - lib/factbase/light.rb
+- lib/factbase/logged.rb
 - lib/factbase/looged.rb
 - lib/factbase/pre.rb
 - lib/factbase/query.rb
@@ -209,6 +211,7 @@ files:
 - test/factbase/test_fact.rb
 - test/factbase/test_flatten.rb
 - test/factbase/test_inv.rb
+- test/factbase/test_logged.rb
 - test/factbase/test_looged.rb
 - test/factbase/test_pre.rb
 - test/factbase/test_query.rb
@@ -228,7 +231,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -244,8 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Factbase
 test_files: []

data/benchmarks/simple.rb

@@ -1,127 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
-# SPDX-License-Identifier: MIT
-
-require 'benchmark'
-require 'time'
-require_relative '../lib/factbase'
-
-def insert(fb, total)
-  time =
-    Benchmark.measure do
-      total.times do |i|
-        fact = fb.insert
-        fact.id = i
-        fact.title = "Object Thinking #{i}"
-        fact.time = Time.now.iso8601
-        fact.cost = rand(1..100)
-        fact.foo = rand(0.0..100.0).round(3)
-        fact.bar = rand(100..300)
-        fact.seenBy = "User#{i}" if i.even?
-        fact.zzz = "Extra#{i}" if (i % 10).zero?
-      end
-    end
-  {
-    title: '`fb.insert()`',
-    time: time.real,
-    details: "Inserted #{total} facts"
-  }
-end
-
-def query(fb, query)
-  total = 0
-  runs = 100
-  time =
-    Benchmark.measure do
-      runs.times do
-        total = fb.query(query).each.to_a.size
-      end
-    end
-  {
-    title: "`#{query}`",
-    time: time.real.round(6),
-    details: "#{total} facts x#{runs}"
-  }
-end
-
-def delete(fb, query)
-  total = 0
-  time =
-    Benchmark.measure do
-      total = fb.query(query).delete!
-    end
-  {
-    title: "`#{query}`",
-    time: time.real.round(6),
-    details: "Deleted #{total} fact(s)"
-  }
-end
-
-def impex(fb)
-  size = 0
-  time =
-    Benchmark.measure do
-      bin = fb.export
-      size = bin.size
-      fb2 = Factbase.new
-      fb2.import(bin)
-    end
-  {
-    title: '`.export()` + `.import()`',
-    time: time.real,
-    details: "#{size} bytes"
-  }
-end
-
-def txn(fb, scenario, &block)
-  modified = 0
-  time =
-    Benchmark.measure do
-      modified = fb.txn(&block)
-    end
-  {
-    title: "txn: `#{scenario}`",
-    time: time.real,
-    details: "modified #{modified} facts"
-  }
-end
-
-fb = Factbase.new
-rows = [
-  insert(fb, 25_000),
-  query(fb, '(gt time \'2024-03-23T03:21:43Z\')'),
-  query(fb, '(gt cost 50)'),
-  query(fb, '(eq title \'Object Thinking 5000\')'),
-  query(fb, '(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))'),
-  query(fb, '(eq id (agg (always) (max id)))'),
-  query(fb, '(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))'),
-  txn(fb, 'query()') do |fbt|
-    100.times do |i|
-      fbt.query("(gt foo #{i})").each.to_a
-    end
-  end,
-  txn(fb, 'insert()') do |fbt|
-    100.times do
-      fbt.insert
-    end
-  end,
-  txn(fb, 'add()') do |fbt|
-    100.times do |i|
-      fbt.query("(gt foo #{i})").each.to_a.first.bar = 55
-    end
-  end,
-  txn(fb, 'delete!()') do |fbt|
-    50.times do |i|
-      fbt.query("(gt foo #{100 - i})").delete!
-    end
-  end,
-  impex(fb),
-  delete(fb, '(gt cost 3)'),
-  delete(fb, '(gt bar 1)')
-].map { |r| "| #{r[:title]} | #{format('%0.3f', r[:time])} | #{r[:details]} |" }
-
-puts '| Action | Seconds | Details |'
-puts '| --- | --: | --- |'
-rows.each { |row| puts row }