factbase 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4434f46130fcb63e9fa798f3c6bacf8441e91a680f789015faf03ba5cb2296b3
-  data.tar.gz: 2d461a92eb2121ca9394e9c07128afa48e3f62a06290678eb68a869fb6fdd501
+  metadata.gz: fc97bfbf967aa07fa189c2d3c696eb8d963f4647c06fb5d97ca4b0e2b4edb4db
+  data.tar.gz: b38987779b663f76cbf9876b4e117cd1fabb3e1c2ef07bd6ab433be0dede9a44
 SHA512:
-  metadata.gz: 4a8683f418df4a0bd0de1d1f8be145a2eb4b1ea2e3bb7993355df88b591b6195dbac3654da7222ff3d66c1f3255c4dfb98520ff68f45721527138e258726d454
-  data.tar.gz: 027e1d0262aeca3ef34ea2a9ab3bdca0e6f6975c0f5478bee62e707f15668281bf2950be04f6cfca636d55a0b79ba9cd38e9a5679d8f63b7d800f69943b9b40c
+  metadata.gz: 97cdc3269d4fbfea8d7246f6cee197be5bdf8b1e463573940b9be2384cbc2718a454e7f1291c5efc11554fc59c84a97c9349def6413d0ee54192118820cdb252
+  data.tar.gz: '049a1b2ae928bae38e1079f4e67d4f29a3efe3201e27c28c92f58bf4a2eda519a62a9a18095d857792337b19775e319921f8494643718a406bf6c377e36eefa6'

data/lib/factbase/fact.rb

@@ -25,6 +25,9 @@ require 'time'
 require_relative '../factbase'
 
 # Fact.
+#
+# This is an internal class, it is not supposed to be instantiated directly.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -37,7 +40,7 @@ class Factbase::Fact
   # Convert it to a string.
   # @return [String] String representation of it (in JSON)
   def to_s
-    @map.to_json
+    "[ #{@map.map { |k, v| "#{k}: #{v}" }.join(', ')} ]"
   end
 
   # When a method is missing, this method is called.

data/lib/factbase/inv.rb

@@ -61,6 +61,9 @@ class Factbase::Inv
   end
 
   # Fact decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Fact
     def initialize(fact, block)
       @fact = fact
@@ -89,6 +92,9 @@ class Factbase::Inv
   end
 
   # Query decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Query
     def initialize(query, block)
       @query = query

data/lib/factbase/looged.rb

@@ -63,7 +63,12 @@ class Factbase::Looged
   end
 
   # Fact decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Fact
+    MAX_LENGTH = 64
+
     def initialize(fact, loog)
       @fact = fact
       @loog = loog
@@ -79,7 +84,7 @@ class Factbase::Looged
       v = args[1]
       s = v.is_a?(Time) ? v.utc.iso8601 : v.to_s
       s = v.to_s.inspect if v.is_a?(String)
-      s = "#{s[0..40]}...#{s[-40..]}" if s.length > 80
+      s = "#{s[0..MAX_LENGTH / 2]}...#{s[-MAX_LENGTH / 2..]}" if s.length > MAX_LENGTH
       @loog.debug("Set '#{k[0..-2]}' to #{s} (#{v.class})") if k.end_with?('=')
       r
     end
@@ -96,6 +101,9 @@ class Factbase::Looged
   end
 
   # Query decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Query
     def initialize(query, expr, loog)
       @query = query

data/lib/factbase/query.rb

@@ -25,6 +25,9 @@ require_relative 'syntax'
 require_relative 'fact'
 
 # Query.
+#
+# This is an internal class, it is not supposed to be instantiated directly.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -40,11 +43,13 @@ class Factbase::Query
   # @return [Integer] Total number of facts yielded
   def each
     return to_enum(__method__) unless block_given?
-    term = Factbase::Syntax.new(@query).to_term.on(@maps)
+    term = Factbase::Syntax.new(@query).to_term
     yielded = 0
     @maps.each do |m|
       f = Factbase::Fact.new(@mutex, m)
-      next unless term.evaluate(f)
+      r = term.evaluate(f, @maps)
+      raise 'Unexpected evaluation result, must be boolean' unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
+      next unless r
       yield f
       yielded += 1
     end
@@ -59,7 +64,7 @@ class Factbase::Query
     @mutex.synchronize do
       @maps.delete_if do |m|
         f = Factbase::Fact.new(@mutex, m)
-        if term.evaluate(f)
+        if term.evaluate(f, @maps)
           deleted += 1
           true
         else

data/lib/factbase/rules.rb

@@ -62,6 +62,9 @@ class Factbase::Rules
   end
 
   # Fact decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Fact
     def initialize(fact, check)
       @fact = fact
@@ -91,6 +94,9 @@ class Factbase::Rules
   end
 
   # Query decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Query
     def initialize(query, check)
       @query = query
@@ -110,6 +116,9 @@ class Factbase::Rules
   end
 
   # Check one fact.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Check
     def initialize(fb, expr)
       @fb = fb
@@ -117,7 +126,7 @@ class Factbase::Rules
     end
 
     def it(fact)
-      return if Factbase::Syntax.new(@expr).to_term.evaluate(fact)
+      return if Factbase::Syntax.new(@expr).to_term.evaluate(fact, [])
       raise "The fact is in invalid state: #{fact}"
     end
   end

data/lib/factbase/syntax.rb

@@ -26,6 +26,9 @@ require_relative 'fact'
 require_relative 'term'
 
 # Syntax.
+#
+# This is an internal class, it is not supposed to be instantiated directly.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT

data/lib/factbase/term.rb

@@ -24,6 +24,9 @@ require_relative '../factbase'
 require_relative 'fact'
 
 # Term.
+#
+# This is an internal class, it is not supposed to be instantiated directly.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -40,23 +43,12 @@ class Factbase::Term
 
   # Does it match the fact?
   # @param [Factbase::Fact] fact The fact
+  # @param [Array<Factbase::Fact>] maps All maps available
   # @return [bool] TRUE if matches
-  def evaluate(fact)
-    send(@op, fact)
-  rescue NoMethodError => _e
-    raise "Term '#{@op}' is not defined"
-  end
-
-  # Put it into the context: let it see the entire array of maps.
-  # @param [Array] maps The maps
-  # @return [Factbase::Term] Itself
-  def on(maps)
-    m = "#{@op}_on"
-    send(m, maps) if respond_to?(m, true)
-    @operands.each do |o|
-      o.on(maps) if o.is_a?(Factbase::Term)
-    end
-    self
+  def evaluate(fact, maps)
+    send(@op, fact, maps)
+  rescue NoMethodError => e
+    raise "Term '#{@op}' is not defined: #{e.message}"
   end
 
   # Simplify it if possible.
@@ -89,31 +81,31 @@ class Factbase::Term
 
   private
 
-  def always(_fact)
+  def always(_fact, _maps)
     assert_args(0)
     true
   end
 
-  def never(_fact)
+  def never(_fact, _maps)
     assert_args(0)
     false
   end
 
-  def not(fact)
+  def not(fact, maps)
     assert_args(1)
-    !only_bool(the_value(0, fact))
+    !only_bool(the_value(0, fact, maps))
   end
 
-  def or(fact)
+  def or(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return true if only_bool(the_value(i, fact))
+      return true if only_bool(the_value(i, fact, maps))
     end
     false
   end
 
-  def and(fact)
+  def and(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return false unless only_bool(the_value(i, fact))
+      return false unless only_bool(the_value(i, fact, maps))
     end
     true
   end
@@ -140,36 +132,36 @@ class Factbase::Term
     and_or_simplify
   end
 
-  def when(fact)
+  def when(fact, maps)
     assert_args(2)
     a = @operands[0]
     b = @operands[1]
-    !a.evaluate(fact) || (a.evaluate(fact) && b.evaluate(fact))
+    !a.evaluate(fact, maps) || (a.evaluate(fact, maps) && b.evaluate(fact, maps))
   end
 
-  def exists(fact)
+  def exists(fact, _maps)
     assert_args(1)
     !by_symbol(0, fact).nil?
   end
 
-  def absent(fact)
+  def absent(fact, _maps)
     assert_args(1)
     by_symbol(0, fact).nil?
   end
 
-  def eq(fact)
-    arithmetic(:==, fact)
+  def eq(fact, maps)
+    arithmetic(:==, fact, maps)
   end
 
-  def lt(fact)
-    arithmetic(:<, fact)
+  def lt(fact, maps)
+    arithmetic(:<, fact, maps)
   end
 
-  def gt(fact)
-    arithmetic(:>, fact)
+  def gt(fact, maps)
+    arithmetic(:>, fact, maps)
   end
 
-  def size(fact)
+  def size(fact, _maps)
     assert_args(1)
     v = by_symbol(0, fact)
     return 0 if v.nil?
@@ -177,29 +169,29 @@ class Factbase::Term
     v.size
   end
 
-  def type(fact)
+  def type(fact, _maps)
     assert_args(1)
     v = by_symbol(0, fact)
     return 'nil' if v.nil?
     v.class.to_s
   end
 
-  def matches(fact)
+  def matches(fact, maps)
     assert_args(2)
-    str = the_value(0, fact)
-    raise 'String is nil' if str.nil?
+    str = the_value(0, fact, maps)
+    return false if str.nil?
     raise 'Exactly one string expected' unless str.size == 1
-    re = the_value(1, fact)
+    re = the_value(1, fact, maps)
     raise 'Regexp is nil' if re.nil?
     raise 'Exactly one regexp expected' unless re.size == 1
     str[0].to_s.match?(re[0])
   end
 
-  def arithmetic(op, fact)
+  def arithmetic(op, fact, maps)
     assert_args(2)
-    lefts = the_value(0, fact)
+    lefts = the_value(0, fact, maps)
     return false if lefts.nil?
-    rights = the_value(1, fact)
+    rights = the_value(1, fact, maps)
     return false if rights.nil?
     lefts.any? do |l|
       l = l.floor if l.is_a?(Time) && op == :==
@@ -210,34 +202,58 @@ class Factbase::Term
     end
   end
 
-  def defn(_fact)
+  def defn(_fact, _maps)
     fn = @operands[0]
     raise 'A symbol expected as first argument of defn' unless fn.is_a?(Symbol)
-    e = "class Factbase::Term\nprivate\ndef #{fn}(fact)\n#{@operands[1]}\nend\nend"
+    e = "class Factbase::Term\nprivate\ndef #{fn}(fact, maps)\n#{@operands[1]}\nend\nend"
     # rubocop:disable Security/Eval
     eval(e)
     # rubocop:enable Security/Eval
     true
   end
 
-  def min(fact)
-    vv = the_value(0, fact)
-    return nil if vv.nil?
-    vv.any? { |v| v == @min }
+  def min(_fact, maps)
+    @min ||= best(maps) { |v, b| v < b }
   end
 
-  def max(fact)
-    vv = the_value(0, fact)
-    return nil if vv.nil?
-    vv.any? { |v| v == @max }
+  def max(_fact, maps)
+    @max ||= best(maps) { |v, b| v > b }
   end
 
-  def max_on(maps)
-    @max = best(maps) { |v, b| v > b }
+  def count(_fact, maps)
+    @count ||= maps.size
   end
 
-  def min_on(maps)
-    @min = best(maps) { |v, b| v < b }
+  def sum(_fact, maps)
+    @sum ||=
+      begin
+        k = @operands[0]
+        raise "A symbol expected, but provided: #{k}" unless k.is_a?(Symbol)
+        sum = 0
+        maps.each do |m|
+          vv = m[k.to_s]
+          next if vv.nil?
+          vv = [vv] unless vv.is_a?(Array)
+          vv.each do |v|
+            sum += v
+          end
+        end
+        sum
+      end
+  end
+
+  def agg(_fact, maps)
+    selector = @operands[0]
+    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 = maps.select { |m| selector.evaluate(m, maps) }
+    @agg ||=
+      if subset.empty?
+        term.evaluate(Factbase::Fact.new(Mutex.new, {}), subset)
+      else
+        term.evaluate(subset.first, subset)
+      end
   end
 
   def assert_args(num)
@@ -253,9 +269,9 @@ class Factbase::Term
     fact[k]
   end
 
-  def the_value(pos, fact)
+  def the_value(pos, fact, maps)
     v = @operands[pos]
-    v = v.evaluate(fact) if v.is_a?(Factbase::Term)
+    v = v.evaluate(fact, maps) if v.is_a?(Factbase::Term)
     v = fact[v.to_s] if v.is_a?(Symbol)
     return v if v.nil?
     v = [v] unless v.is_a?(Array)

data/lib/factbase/to_json.rb

@@ -25,6 +25,13 @@ require 'time'
 require_relative '../factbase'
 
 # Factbase to JSON converter.
+#
+# This class helps converting an entire Factbase to YAML format, for example:
+#
+#  require 'factbase/to_json'
+#  fb = Factbase.new
+#  puts Factbase::ToJSON.new(fb).json
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT

data/lib/factbase/to_xml.rb

@@ -25,6 +25,13 @@ require 'time'
 require_relative '../factbase'
 
 # Factbase to XML converter.
+#
+# This class helps converting an entire Factbase to YAML format, for example:
+#
+#  require 'factbase/to_xml'
+#  fb = Factbase.new
+#  puts Factbase::ToXML.new(fb).xml
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT

data/lib/factbase/to_yaml.rb

@@ -25,6 +25,13 @@ require 'time'
 require_relative '../factbase'
 
 # Factbase to YAML converter.
+#
+# This class helps converting an entire Factbase to YAML format, for example:
+#
+#  require 'factbase/to_yaml'
+#  fb = Factbase.new
+#  puts Factbase::ToYAML.new(fb).yaml
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT

data/lib/factbase/{spy.rb → tuples.rb}

@@ -22,80 +22,56 @@
 
 require_relative '../factbase'
 
-# Spy.
+# Tuples.
+#
+# With the help of this class, it's possible to select a few facts
+# from a factbase at a time, which depend on each other. For example,
+# it's necessary to find a fact where the +name+ is set and then find
+# another fact, where the salary is the +salary+ is the same as in the
+# first found fact. Here is how:
+#
+#  Factbase::Tuples.new(qt, ['(exists name)', '(eq salary, {f0.salary})']).each do |a, b|
+#    puts a.name
+#    puts b.salary
+#  end
+#
+# Here, the +{f0.salary}+ is a special substitution place, which is replaced
+# by the +salary+ of the fact that is found by the previous query. The indexing
+# of queries starts from zero.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
-class Factbase::Spy
-  def initialize(fb, key)
+class Factbase::Tuples
+  def initialize(fb, queries)
     @fb = fb
-    @key = key
-    @caught = []
-  end
-
-  def caught_keys
-    @caught
-  end
-
-  def dup
-    Factbase::Spy.new(@fb.dup, @key)
-  end
-
-  def size
-    @fb.size
-  end
-
-  def query(expr)
-    scan(Factbase::Syntax.new(expr).to_term)
-    @fb.query(expr)
-  end
-
-  def insert
-    SpyFact.new(@fb.insert, @key, @caught)
+    @queries = queries
   end
 
-  def export
-    @fb.export
-  end
-
-  def txn(this = self, &)
-    @fb.txn(this, &)
-  end
-
-  def import(data)
-    @fb.import(data)
-  end
-
-  # A fact that is spying.
-  class SpyFact
-    def initialize(fact, key, caught)
-      @fact = fact
-      @key = key
-      @caught = caught
-    end
-
-    def method_missing(*args)
-      @caught << args[1] if args[0].to_s == "#{@key}="
-      @fact.method_missing(*args)
-    end
-
-    # rubocop:disable Style/OptionalBooleanParameter
-    def respond_to?(method, include_private = false)
-      # rubocop:enable Style/OptionalBooleanParameter
-      @fact.respond_to?(method, include_private)
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      @fact.respond_to_missing?(method, include_private)
-    end
+  # Iterate them one by one.
+  # @yield [Array<Fact>] Arrays of facts one-by-one
+  # @return [Integer] Total number of arrays yielded
+  def each(&)
+    return to_enum(__method__) unless block_given?
+    each_rec([], @queries, &)
   end
 
   private
 
-  def scan(term)
-    @caught << term.operands[1] if term.op == :eq && term.operands[0].to_s == @key
-    term.operands.each do |o|
-      scan(o) if o.is_a?(Factbase::Term)
+  def each_rec(facts, tail, &)
+    qq = tail.dup
+    q = qq.shift
+    return if q.nil?
+    qt = q.gsub(/\{f([0-9]+).([a-z0-9_]+)\}/) do
+      facts[Regexp.last_match[1].to_i].send(Regexp.last_match[2])
+    end
+    @fb.query(qt).each do |f|
+      fs = facts + [f]
+      if qq.empty?
+        yield fs
+      else
+        each_rec(fs, qq, &)
+      end
     end
   end
 end

data/lib/factbase.rb

@@ -29,7 +29,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.33'
+  VERSION = '0.0.35'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_looged.rb

@@ -90,7 +90,7 @@ class TestLooged < Minitest::Test
       'Inserted new fact #1',
       'Inserted new fact #2',
       'Set \'bar\' to 3 (Integer)',
-      'Set \'str\' to "Он поскорей звонит. Вбегает\n      К нем...м\n      Отъехать в поле к двум дубкам." (String)',
+      'Set \'str\' to "Он поскорей звонит. Вбегает\n   ... Отъехать в поле к двум дубкам." (String)',
       'Found 1 fact(s) by \'(exists bar)\'',
       'Deleted 3 fact(s) by \'(not (exists bar))\''
     ].each do |s|

data/test/factbase/test_query.rb

@@ -44,8 +44,8 @@ class TestQuery < Minitest::Test
 
   def test_complex_parsing
     maps = []
-    maps << { 'num' => 42 }
-    maps << { 'pi' => 3.14, 'num' => [42, 66, 0] }
+    maps << { 'num' => 42, 'name' => 'Jeff' }
+    maps << { 'pi' => 3.14, 'num' => [42, 66, 0], 'name' => 'peter' }
     maps << { 'time' => Time.now - 100, 'num' => 0 }
     {
       '(eq num 444)' => 0,
@@ -55,15 +55,17 @@ class TestQuery < Minitest::Test
       '(exists pi)' => 1,
       '(not (exists hello))' => 3,
       '(eq "Integer" (type num))' => 2,
+      '(when (eq num 0) (exists time))' => 2,
       '(gt (size num) 2)' => 1,
+      '(matches name "^[a-z]+$")' => 1,
       '(lt (size num) 2)' => 2,
       '(eq (size hello) 0)' => 3,
       '(eq num pi)' => 0,
       '(absent time)' => 2,
-      '(max num)' => 1,
-      '(and (exists time) (max num))' => 0,
-      '(and (exists pi) (max num))' => 1,
-      '(min time)' => 1,
+      '(eq pi (agg (eq num 0) (sum pi)))' => 1,
+      '(eq num (agg (exists oops) (count)))' => 2,
+      '(lt num (agg (eq num 0) (max pi)))' => 2,
+      '(eq time (min time))' => 1,
       '(and (absent time) (exists pi))' => 1,
       "(and (exists time) (not (\t\texists pi)))" => 1,
       "(or (eq num 66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1

data/test/factbase/test_syntax.rb

@@ -83,7 +83,7 @@ class TestSyntax < Minitest::Test
       '(or (eq bar 888) (eq z 1))' => true,
       "(or (gt bar 100) (eq foo 'Hello, world!'))" => true
     }.each do |k, v|
-      assert_equal(v, Factbase::Syntax.new(k).to_term.evaluate(m), k)
+      assert_equal(v, Factbase::Syntax.new(k).to_term.evaluate(m, []), k)
     end
   end
 

data/test/factbase/test_term.rb

@@ -30,107 +30,107 @@ require_relative '../../lib/factbase/term'
 class TestTerm < Minitest::Test
   def test_simple_matching
     t = Factbase::Term.new(:eq, [:foo, 42])
-    assert(t.evaluate(fact('foo' => [42])))
-    assert(!t.evaluate(fact('foo' => 'Hello!')))
-    assert(!t.evaluate(fact('bar' => ['Hello!'])))
+    assert(t.evaluate(fact('foo' => [42]), []))
+    assert(!t.evaluate(fact('foo' => 'Hello!'), []))
+    assert(!t.evaluate(fact('bar' => ['Hello!']), []))
   end
 
   def test_eq_matching
     t = Factbase::Term.new(:eq, [:foo, 42])
-    assert(t.evaluate(fact('foo' => 42)))
-    assert(t.evaluate(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'])))
-    assert(!t.evaluate(fact('foo' => [100])))
-    assert(!t.evaluate(fact('foo' => [])))
-    assert(!t.evaluate(fact('bar' => [])))
+    assert(t.evaluate(fact('foo' => 42), []))
+    assert(t.evaluate(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf']), []))
+    assert(!t.evaluate(fact('foo' => [100]), []))
+    assert(!t.evaluate(fact('foo' => []), []))
+    assert(!t.evaluate(fact('bar' => []), []))
   end
 
   def test_eq_matching_time
     now = Time.now
     t = Factbase::Term.new(:eq, [:foo, Time.parse(now.iso8601)])
-    assert(t.evaluate(fact('foo' => now)))
-    assert(t.evaluate(fact('foo' => [now, Time.now])))
+    assert(t.evaluate(fact('foo' => now), []))
+    assert(t.evaluate(fact('foo' => [now, Time.now]), []))
   end
 
   def test_lt_matching
     t = Factbase::Term.new(:lt, [:foo, 42])
-    assert(t.evaluate(fact('foo' => [10])))
-    assert(!t.evaluate(fact('foo' => [100])))
-    assert(!t.evaluate(fact('foo' => 100)))
-    assert(!t.evaluate(fact('bar' => 100)))
+    assert(t.evaluate(fact('foo' => [10]), []))
+    assert(!t.evaluate(fact('foo' => [100]), []))
+    assert(!t.evaluate(fact('foo' => 100), []))
+    assert(!t.evaluate(fact('bar' => 100), []))
   end
 
   def test_gt_matching
     t = Factbase::Term.new(:gt, [:foo, 42])
-    assert(t.evaluate(fact('foo' => [100])))
-    assert(t.evaluate(fact('foo' => 100)))
-    assert(!t.evaluate(fact('foo' => [10])))
-    assert(!t.evaluate(fact('foo' => 10)))
-    assert(!t.evaluate(fact('bar' => 10)))
+    assert(t.evaluate(fact('foo' => [100]), []))
+    assert(t.evaluate(fact('foo' => 100), []))
+    assert(!t.evaluate(fact('foo' => [10]), []))
+    assert(!t.evaluate(fact('foo' => 10), []))
+    assert(!t.evaluate(fact('bar' => 10), []))
   end
 
   def test_lt_matching_time
     t = Factbase::Term.new(:lt, [:foo, Time.now])
-    assert(t.evaluate(fact('foo' => [Time.now - 100])))
-    assert(!t.evaluate(fact('foo' => [Time.now + 100])))
-    assert(!t.evaluate(fact('bar' => [100])))
+    assert(t.evaluate(fact('foo' => [Time.now - 100]), []))
+    assert(!t.evaluate(fact('foo' => [Time.now + 100]), []))
+    assert(!t.evaluate(fact('bar' => [100]), []))
   end
 
   def test_gt_matching_time
     t = Factbase::Term.new(:gt, [:foo, Time.now])
-    assert(t.evaluate(fact('foo' => [Time.now + 100])))
-    assert(!t.evaluate(fact('foo' => [Time.now - 100])))
-    assert(!t.evaluate(fact('bar' => [100])))
+    assert(t.evaluate(fact('foo' => [Time.now + 100]), []))
+    assert(!t.evaluate(fact('foo' => [Time.now - 100]), []))
+    assert(!t.evaluate(fact('bar' => [100]), []))
   end
 
   def test_false_matching
     t = Factbase::Term.new(:never, [])
-    assert(!t.evaluate(fact('foo' => [100])))
+    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])))
+    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)))
+    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])))
-    assert_equal(0, t.evaluate(fact('bar' => 100)))
+    assert_equal(3, t.evaluate(fact('foo' => [42, 12, -90]), []))
+    assert_equal(0, t.evaluate(fact('bar' => 100), []))
   end
 
   def test_exists_matching
     t = Factbase::Term.new(:exists, [:foo])
-    assert(t.evaluate(fact('foo' => [42, 12, -90])))
-    assert(!t.evaluate(fact('bar' => 100)))
+    assert(t.evaluate(fact('foo' => [42, 12, -90]), []))
+    assert(!t.evaluate(fact('bar' => 100), []))
   end
 
   def test_absent_matching
     t = Factbase::Term.new(:absent, [:foo])
-    assert(t.evaluate(fact('z' => [42, 12, -90])))
-    assert(!t.evaluate(fact('foo' => 100)))
+    assert(t.evaluate(fact('z' => [42, 12, -90]), []))
+    assert(!t.evaluate(fact('foo' => 100), []))
   end
 
   def test_type_matching
     t = Factbase::Term.new(:type, [:foo])
-    assert_equal('Integer', t.evaluate(fact('foo' => 42)))
-    assert_equal('Array', t.evaluate(fact('foo' => [1, 2, 3])))
-    assert_equal('String', t.evaluate(fact('foo' => 'Hello, world!')))
-    assert_equal('Float', t.evaluate(fact('foo' => 3.14)))
-    assert_equal('Time', t.evaluate(fact('foo' => Time.now)))
-    assert_equal('nil', t.evaluate(fact))
+    assert_equal('Integer', t.evaluate(fact('foo' => 42), []))
+    assert_equal('Array', t.evaluate(fact('foo' => [1, 2, 3]), []))
+    assert_equal('String', t.evaluate(fact('foo' => 'Hello, world!'), []))
+    assert_equal('Float', t.evaluate(fact('foo' => 3.14), []))
+    assert_equal('Time', t.evaluate(fact('foo' => Time.now), []))
+    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)))
+    assert(t.evaluate(fact('foo' => 'hello'), []))
+    assert(t.evaluate(fact('foo' => 'hello 42'), []))
+    assert(!t.evaluate(fact('foo' => 42), []))
   end
 
   def test_or_matching
@@ -141,9 +141,9 @@ class TestTerm < Minitest::Test
         Factbase::Term.new(:eq, [:bar, 5])
       ]
     )
-    assert(t.evaluate(fact('foo' => [4])))
-    assert(t.evaluate(fact('bar' => [5])))
-    assert(!t.evaluate(fact('bar' => [42])))
+    assert(t.evaluate(fact('foo' => [4]), []))
+    assert(t.evaluate(fact('bar' => [5]), []))
+    assert(!t.evaluate(fact('bar' => [42]), []))
   end
 
   def test_when_matching
@@ -154,16 +154,16 @@ class TestTerm < Minitest::Test
         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)))
+    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)))
+    assert_equal(true, t.evaluate(fact('foo' => 4), []))
     t1 = Factbase::Term.new(:foo, ['hello, world!'])
-    assert_equal('(foo \'hello, world!\')', t1.evaluate(fact))
+    assert_equal('(foo \'hello, world!\')', t1.evaluate(fact, []))
   end
 
   private

data/test/factbase/test_tuples.rb

@@ -0,0 +1,85 @@
+# 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'
+require_relative '../../lib/factbase/tuples'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestTuples < Minitest::Test
+  def test_passes_facts
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    f2 = fb.insert
+    f2.bar = 55
+    Factbase::Tuples.new(fb, ['(exists foo)', '(exists bar)']).each do |a, b|
+      assert_equal(42, a.foo)
+      assert_equal(55, b.bar)
+    end
+  end
+
+  def test_with_empty_list_of_queries
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    tuples = Factbase::Tuples.new(fb, [])
+    assert(tuples.each.to_a.empty?)
+  end
+
+  def test_is_reusable
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    tuples = Factbase::Tuples.new(fb, ['(exists foo)'])
+    assert_equal(1, tuples.each.to_a.size)
+    assert_equal(1, tuples.each.to_a.size)
+  end
+
+  def test_with_modifications
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    Factbase::Tuples.new(fb, ['(exists foo)']).each do |fs|
+      fs[0].bar = 1
+    end
+    assert_equal(1, fb.query('(exists bar)').each.to_a.size)
+  end
+
+  def test_with_txn
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    Factbase::Tuples.new(fb, ['(exists foo)']).each do |fs|
+      fb.txn do |fbt|
+        f = fbt.insert
+        f.bar = 1
+      end
+      fs[0].xyz = 'hey'
+    end
+    assert_equal(1, fb.query('(exists bar)').each.to_a.size)
+    assert_equal(1, fb.query('(exists xyz)').each.to_a.size)
+  end
+end

data/test/test_factbase.rb

@@ -110,8 +110,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::Spy.new(Factbase.new, 'ff')
+      Factbase::Looged.new(Factbase.new, Loog::NULL)
     ].each do |d|
       f = d.insert
       f.foo = 42

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.35
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-25 00:00:00.000000000 Z
+date: 2024-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -103,13 +103,12 @@ files:
 - lib/factbase/pre.rb
 - lib/factbase/query.rb
 - lib/factbase/rules.rb
-- lib/factbase/spy.rb
 - lib/factbase/syntax.rb
 - lib/factbase/term.rb
 - lib/factbase/to_json.rb
 - lib/factbase/to_xml.rb
 - lib/factbase/to_yaml.rb
-- lib/factbase/white_list.rb
+- lib/factbase/tuples.rb
 - renovate.json
 - test/factbase/test_fact.rb
 - test/factbase/test_inv.rb
@@ -117,13 +116,12 @@ files:
 - test/factbase/test_pre.rb
 - test/factbase/test_query.rb
 - test/factbase/test_rules.rb
-- test/factbase/test_spy.rb
 - test/factbase/test_syntax.rb
 - test/factbase/test_term.rb
 - test/factbase/test_to_json.rb
 - test/factbase/test_to_xml.rb
 - test/factbase/test_to_yaml.rb
-- test/factbase/test_white_list.rb
+- test/factbase/test_tuples.rb
 - test/test__helper.rb
 - test/test_factbase.rb
 homepage: http://github.com/yegor256/factbase.rb

data/lib/factbase/white_list.rb

@@ -1,79 +0,0 @@
-# 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_relative '../factbase'
-
-# White list.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class Factbase::WhiteList
-  def initialize(fb, key, list)
-    @fb = fb
-    @key = key
-    @allowed = list
-  end
-
-  def query(expr)
-    @fb.query(expr)
-  end
-
-  def insert
-    WhiteFact.new(@fb.insert, @key, @allowed)
-  end
-
-  def export
-    @fb.export
-  end
-
-  def import(data)
-    @fb.import(data)
-  end
-
-  def to_json(opt = nil)
-    @fb.to_json(opt)
-  end
-
-  # A fact that is allows only values from the list.
-  class WhiteFact
-    def initialize(fact, key, list)
-      @fact = fact
-      @key = key
-      @allowed = list
-    end
-
-    def method_missing(*args)
-      raise "#{args[0]} '#{args[1]}' not allowed" if args[0].to_s == "#{@key}=" && !@allowed.include?(args[1])
-      @fact.method_missing(*args)
-    end
-
-    # rubocop:disable Style/OptionalBooleanParameter
-    def respond_to?(method, include_private = false)
-      # rubocop:enable Style/OptionalBooleanParameter
-      @fact.respond_to?(method, include_private)
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      @fact.respond_to_missing?(method, include_private)
-    end
-  end
-end

data/test/factbase/test_spy.rb

@@ -1,43 +0,0 @@
-# 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'
-require_relative '../../lib/factbase/spy'
-
-# Spy test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class TestSpy < Minitest::Test
-  def test_simple_spying
-    fb = Factbase::Spy.new(Factbase.new, 'foo')
-    fb.insert.foo = 42
-    fb.insert.foo = 'hello'
-    fb.query('(eq foo "hello")').each do |f|
-      assert_equal('hello', f.foo)
-    end
-    assert_equal(3, fb.caught_keys.size)
-    assert(fb.caught_keys.include?('hello'))
-    assert(fb.caught_keys.include?(42))
-  end
-end

data/test/factbase/test_white_list.rb

@@ -1,39 +0,0 @@
-# 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'
-require_relative '../../lib/factbase/white_list'
-
-# WhiteList test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class TestWhiteList < Minitest::Test
-  def test_simple_white_listing
-    fb = Factbase::WhiteList.new(Factbase.new, 'foo', ['hello'])
-    fb.insert.foo = 'hello'
-    assert_raises do
-      fb.insert.foo = 42
-    end
-  end
-end