factbase 0.0.60 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebfb3fe82bdf543291f6fd7630c2b69deb3949e6788b79d85c5d58ea733240b3
-  data.tar.gz: 38d05a0630a444f8a77e67b96a3f90aa213ec5f47b764c25401fd90320449ae7
+  metadata.gz: 48e3aa4baba1a3e241c30002133a56627b43e9ef5ce903c46fbafe2873a8625f
+  data.tar.gz: f6fe14cbed445d1bd07e743f4b29f4eca2b65c3b46438a73c4654644626f8ae3
 SHA512:
-  metadata.gz: 29f84d7e12a5cd5b4260590cc40f0a74afa500bec5aaad9f8f3e2c0673fc7864ef9a7c7ac30d08bd5015c3fb87f23cf7123b2ae54306ba58d15c0d0d834f350c
-  data.tar.gz: 1aab5b40d3f47148377d302284af4bed085580bafb4de9acc7b3b9c602e502bdfd3814063095c33f80f63439fe213d190aa9067c55e93c00662f1c3556aa8287
+  metadata.gz: 0b9900e9aefabc39c5a84af552c34011fa54cffaa9828f3eb84aa677ec2f006ee6a32028cb74be5d04a65a7e68e7d516f072d7b78dd89aa91a04168c67fdd561
+  data.tar.gz: 915d162e0b9ff8f533ef3f34f9b39cca0593fd1823a14918acb99f0f1f9d88aaf08016d85d5fdfd892410ebe701392a16322f8c4dc8cb16fc93e064287b29d01

data/.github/workflows/copyrights.yml

@@ -27,4 +27,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: yegor256/copyrights-action@0.0.4
+      - uses: yegor256/copyrights-action@0.0.5

data/Gemfile

@@ -24,11 +24,12 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'minitest', '5.24.1', require: false
+gem 'minitest-reporters', '1.7.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false
-gem 'rubocop', '1.64.1', require: false
+gem 'rubocop', '1.65.0', require: false
 gem 'rubocop-performance', '1.21.1', require: false
-gem 'rubocop-rspec', '3.0.1', require: false
+gem 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -40,6 +40,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
+    ansi (1.5.0)
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
@@ -56,7 +57,7 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
@@ -66,6 +67,11 @@ GEM
       nokogiri (>= 1.12.0)
     loog (0.5.2)
     minitest (5.24.1)
+    minitest-reporters (1.7.1)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     mutex_m (0.2.0)
     nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
@@ -77,13 +83,13 @@ GEM
       racc (~> 1.4)
     others (0.0.3)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     racc (1.8.0)
-    rack (3.1.4)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -113,7 +119,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -132,13 +138,13 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
@@ -148,7 +154,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.1)
+    rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -181,11 +187,12 @@ PLATFORMS
 DEPENDENCIES
   factbase!
   minitest (= 5.24.1)
+  minitest-reporters (= 1.7.1)
   rake (= 13.2.1)
   rspec-rails (= 6.1.3)
-  rubocop (= 1.64.1)
+  rubocop (= 1.65.0)
   rubocop-performance (= 1.21.1)
-  rubocop-rspec (= 3.0.1)
+  rubocop-rspec (= 3.0.3)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   yard (= 0.9.36)

data/factbase.gemspec

@@ -42,13 +42,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'backtrace', '~>0.3'
-  s.add_runtime_dependency 'decoor', '~>0.0'
-  s.add_runtime_dependency 'json', '~>2.7'
-  s.add_runtime_dependency 'loog', '~>0.2'
-  s.add_runtime_dependency 'nokogiri', '~>1.10'
-  s.add_runtime_dependency 'others', '~>0.0'
-  s.add_runtime_dependency 'tago', '~>0.0'
-  s.add_runtime_dependency 'yaml', '~>0.3'
+  s.add_dependency 'backtrace', '~>0.3'
+  s.add_dependency 'decoor', '~>0.0'
+  s.add_dependency 'json', '~>2.7'
+  s.add_dependency 'loog', '~>0.2'
+  s.add_dependency 'nokogiri', '~>1.10'
+  s.add_dependency 'others', '~>0.0'
+  s.add_dependency 'tago', '~>0.0'
+  s.add_dependency 'yaml', '~>0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/syntax.rb

@@ -29,20 +29,37 @@ require_relative 'term'
 #
 # This is an internal class, it is not supposed to be instantiated directly.
 #
+# However, you can use it directly, if you need a parser of our syntax. You can
+# create your own "Term" class and let this parser make instances of it for
+# every term it meets in the query:
+#
+#  require 'factbase/syntax'
+#  t = Factbase::Syntax.new('(hello world)', MyTerm).to_term
+#
+# The +MyTerm+ class should have a constructor with two arguments:
+# the operator and the list of operands (Array).
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Factbase::Syntax
   # Ctor.
   # @param [String] query The query, for example "(eq id 42)"
-  def initialize(query)
+  # @param [Class] term The class to instantiate to make every term
+  def initialize(query, term: Factbase::Term)
     @query = query
+    @term = term
   end
 
   # Convert it to a term.
   # @return [Term] The term detected
   def to_term
-    build.simplify
+    @to_term ||=
+      begin
+        t = build
+        t = t.simplify if t.respond_to?(:simplify)
+        t
+      end
   rescue StandardError => e
     err = "#{e.message} in \"#{@query}\""
     err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
@@ -60,7 +77,7 @@ class Factbase::Syntax
     raise 'Too many terms' if @ast[1] != @tokens.size
     term = @ast[0]
     raise 'No terms found' if term.nil?
-    raise 'Not a term' unless term.is_a?(Factbase::Term)
+    raise 'Not a term' unless term.is_a?(@term)
     term
   end
 
@@ -89,7 +106,7 @@ class Factbase::Syntax
       operands << operand
       break if tokens[at] == :close
     end
-    [Factbase::Term.new(op, operands), at + 1]
+    [@term.new(op, operands), at + 1]
   end
 
   # Turns a query into an array of tokens.

data/lib/factbase/term.rb

@@ -130,13 +130,6 @@ class Factbase::Term
 
   private
 
-  def either(fact, maps)
-    assert_args(2)
-    v = the_values(0, fact, maps)
-    return v unless v.nil?
-    the_values(1, fact, maps)
-  end
-
   def at(fact, maps)
     assert_args(2)
     i = the_values(0, fact, maps)

data/lib/factbase/terms/logical.rb

@@ -57,6 +57,20 @@ module Factbase::Term::Logical
     true
   end
 
+  def when(fact, maps)
+    assert_args(2)
+    a = @operands[0]
+    b = @operands[1]
+    !a.evaluate(fact, maps) || (a.evaluate(fact, maps) && b.evaluate(fact, maps))
+  end
+
+  def either(fact, maps)
+    assert_args(2)
+    v = the_values(0, fact, maps)
+    return v unless v.nil?
+    the_values(1, fact, maps)
+  end
+
   def and_or_simplify
     strs = []
     ops = []
@@ -79,13 +93,6 @@ module Factbase::Term::Logical
     and_or_simplify
   end
 
-  def when(fact, maps)
-    assert_args(2)
-    a = @operands[0]
-    b = @operands[1]
-    !a.evaluate(fact, maps) || (a.evaluate(fact, maps) && b.evaluate(fact, maps))
-  end
-
   def _only_bool(val, pos)
     val = val[0] if val.is_a?(Array)
     return false if val.nil?

data/lib/factbase.rb

@@ -81,7 +81,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.60'
+  VERSION = '0.1.1'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
@@ -99,7 +99,7 @@ class Factbase
     Factbase.new(@maps.map { |m| m.transform_values(&:dup) })
   end
 
-  # Size.
+  # Size, the total number of facts in the factbase.
   # @return [Integer] How many facts are in there
   def size
     @maps.size
@@ -114,11 +114,11 @@ class Factbase
   #
   # @return [Factbase::Fact] The fact just inserted
   def insert
-    require_relative 'factbase/fact'
     map = {}
     @mutex.synchronize do
       @maps << map
     end
+    require_relative 'factbase/fact'
     Factbase::Fact.new(@mutex, map)
   end
 

data/test/factbase/terms/test_defn.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 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'
+
+# Defn test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 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!'])
+    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.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.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.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, []))
+  end
+
+  private
+
+  def fact(map = {})
+    Factbase::Fact.new(Mutex.new, map)
+  end
+end

data/test/factbase/terms/test_logical.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 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'
+
+# Logical test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestLogical < Minitest::Test
+  def test_not_matching
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:always, [])])
+    assert(!t.evaluate(fact('foo' => [100]), []))
+  end
+
+  def test_not_eq_matching
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, [:foo, 100])])
+    assert(t.evaluate(fact('foo' => [42, 12, -90]), []))
+    assert(!t.evaluate(fact('foo' => 100), []))
+  end
+
+  def test_either
+    t = Factbase::Term.new(:either, [Factbase::Term.new(:at, [5, :foo]), 42])
+    assert_equal([42], t.evaluate(fact('foo' => 4), []))
+  end
+
+  def test_or_matching
+    t = Factbase::Term.new(
+      :or,
+      [
+        Factbase::Term.new(:eq, [:foo, 4]),
+        Factbase::Term.new(:eq, [:bar, 5])
+      ]
+    )
+    assert(t.evaluate(fact('foo' => [4]), []))
+    assert(t.evaluate(fact('bar' => [5]), []))
+    assert(!t.evaluate(fact('bar' => [42]), []))
+  end
+
+  def test_when_matching
+    t = Factbase::Term.new(
+      :when,
+      [
+        Factbase::Term.new(:eq, [:foo, 4]),
+        Factbase::Term.new(:eq, [:bar, 5])
+      ]
+    )
+    assert(t.evaluate(fact('foo' => 4, 'bar' => 5), []))
+    assert(!t.evaluate(fact('foo' => 4), []))
+    assert(t.evaluate(fact('foo' => 5, 'bar' => 5), []))
+  end
+
+  private
+
+  def fact(map = {})
+    Factbase::Fact.new(Mutex.new, map)
+  end
+end

data/test/factbase/terms/test_math.rb

@@ -106,6 +106,12 @@ class TestMath < Minitest::Test
     assert_equal('Float', t.evaluate(fact, []).class.to_s)
   end
 
+  def test_plus
+    t = Factbase::Term.new(:plus, [:foo, 42])
+    assert_equal(46, t.evaluate(fact('foo' => 4), []))
+    assert(t.evaluate(fact, []).nil?)
+  end
+
   private
 
   def fact(map = {})

data/test/factbase/terms/test_strings.rb

@@ -28,6 +28,13 @@ require_relative '../../../lib/factbase/term'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class TestStrings < Minitest::Test
+  def test_regexp_matching
+    t = Factbase::Term.new(:matches, [:foo, '[a-z]+'])
+    assert(t.evaluate(fact('foo' => 'hello'), []))
+    assert(t.evaluate(fact('foo' => 'hello 42'), []))
+    assert(!t.evaluate(fact('foo' => 42), []))
+  end
+
   def test_concat
     t = Factbase::Term.new(:concat, [42, 'hi', 3.14, :hey, Time.now])
     s = t.evaluate(fact, [])
@@ -40,7 +47,7 @@ class TestStrings < Minitest::Test
   end
 
   def test_sprintf
-    t = Factbase::Term.new(:sprintf, ['hi, %s!', 'Jeff', :hey])
+    t = Factbase::Term.new(:sprintf, ['hi, %s!', 'Jeff'])
     assert_equal('hi, Jeff!', t.evaluate(fact, []))
   end
 

data/test/factbase/test_query.rb

@@ -120,8 +120,13 @@ class TestQuery < Minitest::Test
       '(agg (always) (count))' => 2,
       '(agg (eq bar $v) (count))' => 1,
       '(agg (eq z 40) (count))' => 0
-    }.each do |q, r|
-      assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).one(v: 4), "#{q} -> #{r}")
+    }.each do |q, expected|
+      result = Factbase::Query.new(maps, Mutex.new, q).one(v: 4)
+      if expected.nil?
+        assert_nil(result, "#{q} -> nil")
+      else
+        assert_equal(expected, result, "#{q} -> #{expected}")
+      end
     end
   end
 

data/test/factbase/test_syntax.rb

@@ -35,7 +35,7 @@ class TestSyntax < Minitest::Test
       "(foo 'one two three   ')",
       "(foo 'one two three   ' 'tail tail')"
     ].each do |q|
-      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s)
+      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s, q)
     end
   end
 
@@ -50,7 +50,7 @@ class TestSyntax < Minitest::Test
       "(foo 'Hello,\n\nworld!\r\t\n')\n",
       "(or ( a 4) (b 5) (always) (and (always) (c 5) \t\t(r 7 w8s w8is 'Foo')))"
     ].each do |q|
-      Factbase::Syntax.new(q).to_term
+      assert(!Factbase::Syntax.new(q).to_term.nil?)
     end
   end
 
@@ -70,7 +70,7 @@ class TestSyntax < Minitest::Test
       '(eq t 3.0e+21)',
       "(foo (x (f (t (y 42 'Hey you'))) (never) (r 3)) y z)"
     ].each do |q|
-      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s)
+      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s, q)
     end
   end
 

data/test/factbase/test_term.rb

@@ -33,17 +33,6 @@ class TestTerm < Minitest::Test
     assert(!t.evaluate(fact('foo' => [100]), []))
   end
 
-  def test_not_matching
-    t = Factbase::Term.new(:not, [Factbase::Term.new(:always, [])])
-    assert(!t.evaluate(fact('foo' => [100]), []))
-  end
-
-  def test_not_eq_matching
-    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, [:foo, 100])])
-    assert(t.evaluate(fact('foo' => [42, 12, -90]), []))
-    assert(!t.evaluate(fact('foo' => 100), []))
-  end
-
   def test_size_matching
     t = Factbase::Term.new(:size, [:foo])
     assert_equal(3, t.evaluate(fact('foo' => [42, 12, -90]), []))
@@ -74,74 +63,6 @@ class TestTerm < Minitest::Test
     assert_equal('nil', t.evaluate(fact, []))
   end
 
-  def test_regexp_matching
-    t = Factbase::Term.new(:matches, [:foo, '[a-z]+'])
-    assert(t.evaluate(fact('foo' => 'hello'), []))
-    assert(t.evaluate(fact('foo' => 'hello 42'), []))
-    assert(!t.evaluate(fact('foo' => 42), []))
-  end
-
-  def test_or_matching
-    t = Factbase::Term.new(
-      :or,
-      [
-        Factbase::Term.new(:eq, [:foo, 4]),
-        Factbase::Term.new(:eq, [:bar, 5])
-      ]
-    )
-    assert(t.evaluate(fact('foo' => [4]), []))
-    assert(t.evaluate(fact('bar' => [5]), []))
-    assert(!t.evaluate(fact('bar' => [42]), []))
-  end
-
-  def test_when_matching
-    t = Factbase::Term.new(
-      :when,
-      [
-        Factbase::Term.new(:eq, [:foo, 4]),
-        Factbase::Term.new(:eq, [:bar, 5])
-      ]
-    )
-    assert(t.evaluate(fact('foo' => 4, 'bar' => 5), []))
-    assert(!t.evaluate(fact('foo' => 4), []))
-    assert(t.evaluate(fact('foo' => 5, 'bar' => 5), []))
-  end
-
-  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!'])
-    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.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.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.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, []))
-  end
-
   def test_past
     t = Factbase::Term.new(:prev, [:foo])
     assert_nil(t.evaluate(fact('foo' => 4), []))
@@ -154,17 +75,6 @@ class TestTerm < Minitest::Test
     assert_equal(5, t.evaluate(fact('foo' => [4, 5]), []))
   end
 
-  def test_either
-    t = Factbase::Term.new(:either, [Factbase::Term.new(:at, [5, :foo]), 42])
-    assert_equal([42], t.evaluate(fact('foo' => 4), []))
-  end
-
-  def test_plus
-    t = Factbase::Term.new(:plus, [:foo, 42])
-    assert_equal(46, t.evaluate(fact('foo' => 4), []))
-    assert(t.evaluate(fact, []).nil?)
-  end
-
   def test_report_missing_term
     t = Factbase::Term.new(:something, [])
     msg = assert_raises do

data/test/test__helper.rb

@@ -29,3 +29,6 @@ require 'simplecov-cobertura'
 SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 require 'minitest/autorun'
+
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.1.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -183,6 +183,8 @@ files:
 - renovate.json
 - test/factbase/terms/test_aggregates.rb
 - test/factbase/terms/test_aliases.rb
+- test/factbase/terms/test_defn.rb
+- test/factbase/terms/test_logical.rb
 - test/factbase/terms/test_math.rb
 - test/factbase/terms/test_strings.rb
 - test/factbase/test_accum.rb