factbase 0.4.0 → 0.5.0

data/lib/factbase/terms/aggregates.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Aggregating terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Aggregates
   def min(_fact, maps)
@@ -81,7 +81,7 @@ module Factbase::Term::Aggregates
     raise "A term expected, but '#{selector}' provided" unless selector.is_a?(Factbase::Term)
     term = @operands[1]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    subset = Factbase::Query.new(maps, Mutex.new, selector.to_s).each(fact).to_a
+    subset = @fb.query(selector.to_s, maps).each(fact).to_a
     term.evaluate(nil, subset)
   end
 
@@ -89,7 +89,7 @@ module Factbase::Term::Aggregates
     assert_args(1)
     term = @operands[0]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    Factbase::Query.new(maps, Mutex.new, term.to_s).each(fact).to_a.empty?
+    @fb.query(term.to_s, maps).each(fact).to_a.empty?
   end
 
   def best(maps)

data/lib/factbase/terms/aliases.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Aliases terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Aliases
   def as(fact, maps)
@@ -33,7 +33,7 @@ module Factbase::Term::Aliases
     a = @operands[0]
     raise "A symbol expected as first argument of 'as'" unless a.is_a?(Symbol)
     vv = the_values(1, fact, maps)
-    vv&.each { |v| fact.send("#{a}=", v) }
+    vv&.each { |v| fact.send(:"#{a}=", v) }
     true
   end
 
@@ -47,11 +47,11 @@ module Factbase::Term::Aliases
       .map { |j| j.size == 1 ? [j[0], j[0]] : j }
     term = @operands[1]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    subset = Factbase::Query.new(maps, Mutex.new, term.to_s).each(fact).to_a
+    subset = @fb.query(term.to_s, maps).each(fact).to_a
     subset.each do |s|
       jumps.each do |to, from|
         s[from]&.each do |v|
-          fact.send("#{to}=", v)
+          fact.send(:"#{to}=", v)
         end
       end
     end

data/lib/factbase/terms/casting.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Casting terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Casting
   def to_string(fact, maps)

data/lib/factbase/terms/debug.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Debug terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Debug
   def traced(fact, maps)

data/lib/factbase/terms/defn.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Defn terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Defn
   def defn(_fact, _maps)

data/lib/factbase/terms/logical.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Logical terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Logical
   def always(_fact, _maps)
@@ -82,7 +82,7 @@ module Factbase::Term::Logical
       ops << o
     end
     return ops[0] if ops.size == 1
-    Factbase::Term.new(@op, ops)
+    Factbase::Term.new(@fb, @op, ops)
   end
 
   def and_simplify

data/lib/factbase/terms/math.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Math terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Math
   def plus(fact, maps)

data/lib/factbase/terms/meta.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Meta terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Meta
   def exists(fact, _maps)

data/lib/factbase/terms/ordering.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # Ordering terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Ordering
   def prev(fact, maps)

data/lib/factbase/terms/strings.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # String terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Strings
   def concat(fact, maps)

data/lib/factbase/terms/system.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,7 +25,7 @@ require_relative '../../factbase'
 # System-level terms.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::System
   def env(fact, maps)

data/lib/factbase/to_json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -33,7 +33,7 @@ require_relative '../factbase/flatten'
 #  puts Factbase::ToJSON.new(fb).json
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase::ToJSON
   # Constructor.

data/lib/factbase/to_xml.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -34,7 +34,7 @@ require_relative '../factbase/flatten'
 #  puts Factbase::ToXML.new(fb).xml
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase::ToXML
   # Constructor.

data/lib/factbase/to_yaml.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -33,7 +33,7 @@ require_relative '../factbase/flatten'
 #  puts Factbase::ToYAML.new(fb).yaml
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase::ToYAML
   # Constructor.

data/lib/factbase.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -77,20 +77,23 @@ require 'yaml'
 # It is NOT thread-safe!
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
 
+  attr_reader :cache
+
   # Constructor.
   # @param [Array<Hash>] facts Array of facts to start with
   def initialize(facts = [])
     @maps = facts
     @mutex = Mutex.new
+    @cache = {}
   end
 
   # Make a deep duplicate of this factbase.
@@ -118,8 +121,9 @@ class Factbase
     @mutex.synchronize do
       @maps << map
     end
+    @cache.clear
     require_relative 'factbase/fact'
-    Factbase::Fact.new(@mutex, map)
+    Factbase::Fact.new(self, @mutex, map)
   end
 
   # Create a query capable of iterating.
@@ -140,9 +144,15 @@ class Factbase
   # +README.md+ file of the repository.
   #
   # @param [String] query The query to use for selections
-  def query(query)
+  # @param [Array<Hash>] maps Custom maps
+  def query(query, maps = @maps)
     require_relative 'factbase/query'
-    Factbase::Query.new(@maps, @mutex, query)
+    require_relative 'factbase/query_once'
+    Factbase::QueryOnce.new(
+      self,
+      Factbase::Query.new(self, maps, @mutex, query),
+      maps
+    )
   end
 
   # Run an ACID transaction, which will either modify the factbase

data/test/factbase/terms/test_aggregates.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@ require_relative '../../../lib/factbase/syntax'
 
 # Aggregates test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestAggregates < Minitest::Test
   def test_aggregation
@@ -47,10 +47,10 @@ class TestAggregates < Minitest::Test
       '(eq x (agg (eq y 0) (first x)))' => '(eq x 1)',
       '(agg (eq foo 42) (always))' => '(eq x 1)'
     }.each do |q, r|
-      t = Factbase::Syntax.new(q).to_term
+      t = Factbase::Syntax.new(Factbase.new, q).to_term
       f = maps.find { |m| t.evaluate(fact(m), maps) }
-      assert(!f.nil?, "nothing found by: #{q}")
-      assert(Factbase::Syntax.new(r).to_term.evaluate(fact(f), []))
+      refute_nil(f, "nothing found by: #{q}")
+      assert(Factbase::Syntax.new(Factbase.new, r).to_term.evaluate(fact(f), []))
     end
   end
 
@@ -63,7 +63,7 @@ class TestAggregates < Minitest::Test
       '(empty (eq y 42))' => true,
       '(empty (eq x 1))' => false
     }.each do |q, r|
-      t = Factbase::Syntax.new(q).to_term
+      t = Factbase::Syntax.new(Factbase.new, q).to_term
       assert_equal(r, t.evaluate(nil, maps), q)
     end
   end

data/test/factbase/terms/test_aliases.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative '../../../lib/factbase/accum'
 
 # Aliases test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestAliases < Minitest::Test
   def test_aliases
@@ -41,11 +41,11 @@ class TestAliases < Minitest::Test
       '(as foo (plus bar 1))' => '(absent foo)',
       '(as foo (minus t1 t2))' => '(when (exists foo) (eq "Float" (type foo)))'
     }.each do |q, r|
-      t = Factbase::Syntax.new(q).to_term
+      t = Factbase::Syntax.new(Factbase.new, q).to_term
       maps.each do |m|
         f = Factbase::Accum.new(fact(m), {}, false)
         next unless t.evaluate(f, maps)
-        assert(Factbase::Syntax.new(r).to_term.evaluate(f, []), "#{q} -> #{f}")
+        assert(Factbase::Syntax.new(Factbase.new, r).to_term.evaluate(f, []), "#{q} -> #{f}")
       end
     end
   end
@@ -61,13 +61,13 @@ class TestAliases < Minitest::Test
       '(join "uuu" (eq x 1))' => '(absent uuu)',
       '(join "uuu <= fff" (eq fff 1))' => '(absent uuu)'
     }.each do |q, r|
-      t = Factbase::Syntax.new(q).to_term
+      t = Factbase::Syntax.new(Factbase.new, q).to_term
       maps.each do |m|
         f = Factbase::Accum.new(fact(m), {}, false)
         require_relative '../../../lib/factbase/looged'
         f = Factbase::Looged::Fact.new(f, Loog::NULL)
         next unless t.evaluate(f, maps)
-        assert(Factbase::Syntax.new(r).to_term.evaluate(f, []), "#{q} -> #{f} doesn't match #{r}")
+        assert(Factbase::Syntax.new(Factbase.new, r).to_term.evaluate(f, []), "#{q} -> #{f} doesn't match #{r}")
       end
     end
   end

data/test/factbase/terms/test_casting.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -26,26 +26,26 @@ require_relative '../../../lib/factbase/term'
 
 # Math test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestCasting < Minitest::Test
   def test_to_str
-    t = Factbase::Term.new(:to_string, [Time.now])
+    t = Factbase::Term.new(Factbase.new, :to_string, [Time.now])
     assert_equal('String', t.evaluate(fact, []).class.to_s)
   end
 
   def test_to_integer
-    t = Factbase::Term.new(:to_integer, [[42, 'hello']])
+    t = Factbase::Term.new(Factbase.new, :to_integer, [[42, 'hello']])
     assert_equal('Integer', t.evaluate(fact, []).class.to_s)
   end
 
   def test_to_float
-    t = Factbase::Term.new(:to_float, [[3.14, 'hello']])
+    t = Factbase::Term.new(Factbase.new, :to_float, [[3.14, 'hello']])
     assert_equal('Float', t.evaluate(fact, []).class.to_s)
   end
 
   def test_to_time
-    t = Factbase::Term.new(:to_time, [%w[2023-01-01 hello]])
+    t = Factbase::Term.new(Factbase.new, :to_time, [%w[2023-01-01 hello]])
     assert_equal('Time', t.evaluate(fact, []).class.to_s)
   end
 end

data/test/factbase/terms/test_debug.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024-2025 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../../../lib/factbase/term'
+
+# Debug test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+class TestDebug < Minitest::Test
+  def test_traced
+    t = Factbase::Term.new(Factbase.new, :traced, [Factbase::Term.new(Factbase.new, :defn, [:test_debug, 'self.to_s'])])
+    assert_output("(traced (defn test_debug 'self.to_s')) -> true\n") do
+      assert(t.evaluate(fact, []))
+    end
+  end
+
+  def test_traced_raises
+    e = assert_raises(StandardError) { Factbase::Term.new(Factbase.new, :traced, ['foo']).evaluate(fact, []) }
+    assert_match(/A term expected, but 'foo' provided/, e.message)
+  end
+
+  def test_traced_raises_when_too_many_args
+    e =
+      assert_raises(StandardError) do
+        Factbase::Term.new(
+          Factbase.new, :traced,
+          [Factbase::Term.new(Factbase.new, :defn, [:debug, 'self.to_s']), 'something']
+        ).evaluate(fact, [])
+      end
+    assert_match(/Too many \(\d+\) operands for 'traced' \(\d+ expected\)/, e.message)
+  end
+end

data/test/factbase/terms/test_defn.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 Yegor Bugayenko
+# Copyright (c) 2024-2025 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,41 +25,41 @@ require_relative '../../../lib/factbase/term'
 
 # Defn test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class TestDefn < Minitest::Test
   def test_defn_simple
-    t = Factbase::Term.new(:defn, [:foo, 'self.to_s'])
-    assert_equal(true, t.evaluate(fact('foo' => 4), []))
-    t1 = Factbase::Term.new(:foo, ['hello, world!'])
+    t = Factbase::Term.new(Factbase.new, :defn, [:foo, 'self.to_s'])
+    assert(t.evaluate(fact('foo' => 4), []))
+    t1 = Factbase::Term.new(Factbase.new, :foo, ['hello, world!'])
     assert_equal('(foo \'hello, world!\')', t1.evaluate(fact, []))
   end
 
   def test_defn_again_by_mistake
-    t = Factbase::Term.new(:defn, [:and, 'self.to_s'])
-    assert_raises do
+    t = Factbase::Term.new(Factbase.new, :defn, [:and, 'self.to_s'])
+    assert_raises(StandardError) do
       t.evaluate(fact, [])
     end
   end
 
   def test_defn_bad_name_by_mistake
-    t = Factbase::Term.new(:defn, [:to_s, 'self.to_s'])
-    assert_raises do
+    t = Factbase::Term.new(Factbase.new, :defn, [:to_s, 'self.to_s'])
+    assert_raises(StandardError) do
       t.evaluate(fact, [])
     end
   end
 
   def test_defn_bad_name_spelling_by_mistake
-    t = Factbase::Term.new(:defn, [:'some-key', 'self.to_s'])
-    assert_raises do
+    t = Factbase::Term.new(Factbase.new, :defn, [:'some-key', 'self.to_s'])
+    assert_raises(StandardError) do
       t.evaluate(fact, [])
     end
   end
 
   def test_undef_simple
-    t = Factbase::Term.new(:defn, [:hello, 'self.to_s'])
-    assert_equal(true, t.evaluate(fact, []))
-    t = Factbase::Term.new(:undef, [:hello])
-    assert_equal(true, t.evaluate(fact, []))
+    t = Factbase::Term.new(Factbase.new, :defn, [:hello, 'self.to_s'])
+    assert(t.evaluate(fact, []))
+    t = Factbase::Term.new(Factbase.new, :undef, [:hello])
+    assert(t.evaluate(fact, []))
   end
 end