factbase 0.0.34 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c84ac9e67311e6333da8c6da3d69ae445aad64686017a69bc702f50d703223
-  data.tar.gz: c275ca48a224b42f09e71551b563585036b866f99acf8dd58e13311bdaa0beec
+  metadata.gz: c801d7ec256766a03b081de5949367aef74dc991b67207ae30c6e6229f11c425
+  data.tar.gz: 2cfc12996cc7e4d85fad86377ddc9b87916d5d2a1cbe5542ba8128488c1e0049
 SHA512:
-  metadata.gz: 1ef21c5e33b3cf5f67e7f5edb56110e9f4d62c970cbc52158ca3922661d9a3d3ed411c26b95b2be97c1d6b6a4a5ebb5c521c87401325da42e585bd61f31b403f
-  data.tar.gz: 9f02e0addedcff827c76f7c5a58cae70c84b73c02522ab429ba0607bf967f0412c8a82ba1b8caa49c0c0329498f0f440dc95e861fed563362bd1f7295bea52ba
+  metadata.gz: 6d2d1ec011eaf2d34f00068fa71809bf8bd3fe794b6097eeb1292ad25f1a6916e319490a137fa4c1908c00ce640f19c8efff27444ca277e72048daf5e688c3ef
+  data.tar.gz: 7f20423de58a836eb68261a8d7ad45ec00056a4f991b8f34c68dd4833a42bbb0009bca75a4a8092112cfb80599e2be04e5cca9a9bfe18b3ae18102622d98f9a6

data/README.md

@@ -54,7 +54,7 @@ f2.import(File.read(file))
 assert(f2.query('(eq foo 42)').each.to_a.size == 1)
 ```
 
-All terms available in a query:
+There are some terms available in a query:
 
 * `(always)` and `(never)` are "true" and "false"
 * `(not t)` inverses the `t` if it's boolean (exception otherwise)
@@ -68,14 +68,39 @@ All terms available in a query:
 * `(gt a b)` returns true if `a` is greater than `b`
 * `(size k)` returns cardinality of `k` property (zero if property is absent)
 * `(type a)` returns type of `a` ("String", "Integer", "Float", or "Time")
+* `(many a)` return true if there are many values in the `a` property
+* `(one a)` returns true if there is only one value in the `a` property
+* `(at i a)` returns the `i`-th value of the `a` property
+* `(nonil a b)` returns `b` if `a` is `nil`
 * `(matches a re)` returns true when `a` matches regular expression `re`
 * `(defn foo "self.to_s")` defines a new term using Ruby syntax and returns true
 
-There are also terms that match the entire factbase:
+Also, some simple arithmetic:
 
-* `(max k)` returns true if the value of `k` property
-is the largest in the entire factbase
-* `(min k)` returns true if the value of `k` is the smallest
+* `(plus a b)` is a sum of `a` and `b`
+* `(minus a b)` is a deducation of `b` from `a`
+* `(times a b)` is a multiplication of `a` and `b`
+* `(div a b)` is a division of `a` by `b`
+
+There are terms that are history of search aware:
+
+* `(prev a)` returns the value of `a` in the previously seen fact
+
+There are also terms that match the entire factbase
+and must be used inside the `(agg ..)` term:
+
+* `(count)` returns the tally of facts
+* `(max k)` returns the maximum value of the `k` property in all facts
+* `(min k)` returns the minimum
+* `(sum k)` returns the arithmetic sum of all values of the `k` property
+
+The `agg` term enables sub-queries by evaluating the first argument (term)
+over all available facts, passing the entire subset to the second argument,
+and then returning the result as an atomic value:
+
+* `(lt age (agg (eq gender 'F') (max age)))` selects all facts where
+the `age` is smaller than the maximum `age` of all women
+* `(eq id (agg (always) (max id)))` selects the fact with the largest `id`
 
 ## How to contribute
 

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.
@@ -45,7 +48,7 @@ class Factbase::Fact
     k = args[0].to_s
     if k.end_with?('=')
       kk = k[0..-2]
-      raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z][_a-zA-Z0-9]*$/)
+      raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
       raise "Prohibited prop name '#{kk}'" if kk == 'to_s'
       v = args[1]
       raise "Prop value can't be nil" if v.nil?

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,6 +63,9 @@ class Factbase::Looged
   end
 
   # Fact decorator.
+  #
+  # This is an internal class, it is not supposed to be instantiated directly.
+  #
   class Fact
     MAX_LENGTH = 64
 
@@ -98,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
@@ -126,9 +129,9 @@ class Factbase::Syntax
       elsif t.start_with?('\'', '"')
         raise 'String literal can\'t be empty' if t.length <= 2
         t[1..-2]
-      elsif t.match?(/^[0-9]+$/)
+      elsif t.match?(/^(\+|-)?[0-9]+$/)
         t.to_i
-      elsif t.match?(/^[0-9]+\.[0-9]+(e\+[0-9]+)?$/)
+      elsif t.match?(/^(\+|-)?[0-9]+\.[0-9]+(e\+[0-9]+)?$/)
         t.to_f
       elsif t.match?(/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/)
         Time.parse(t)

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_values(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_values(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_values(i, fact, maps))
     end
     true
   end
@@ -140,36 +132,90 @@ 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 nonil(fact, maps)
+    assert_args(2)
+    v = the_values(0, fact, maps)
+    return v unless v.nil?
+    the_values(1, fact, maps)
   end
 
-  def lt(fact)
-    arithmetic(:<, fact)
+  def at(fact, maps)
+    assert_args(2)
+    i = the_values(0, fact, maps)
+    raise 'Too many values at first position, one expected' unless i.size == 1
+    i = i[0]
+    return nil if i.nil?
+    v = the_values(1, fact, maps)
+    return nil if v.nil?
+    v[i]
+  end
+
+  def prev(fact, maps)
+    assert_args(1)
+    before = @prev
+    v = the_values(0, fact, maps)
+    @prev = v
+    before
   end
 
-  def gt(fact)
-    arithmetic(:>, fact)
+  def many(fact, maps)
+    assert_args(1)
+    v = the_values(0, fact, maps)
+    !v.nil? && v.size > 1
   end
 
-  def size(fact)
+  def one(fact, maps)
+    assert_args(1)
+    v = the_values(0, fact, maps)
+    !v.nil? && v.size == 1
+  end
+
+  def plus(fact, maps)
+    arithmetic(:+, fact, maps)
+  end
+
+  def minus(fact, maps)
+    arithmetic(:-, fact, maps)
+  end
+
+  def times(fact, maps)
+    arithmetic(:*, fact, maps)
+  end
+
+  def div(fact, maps)
+    arithmetic(:/, fact, maps)
+  end
+
+  def eq(fact, maps)
+    cmp(:==, fact, maps)
+  end
+
+  def lt(fact, maps)
+    cmp(:<, fact, maps)
+  end
+
+  def gt(fact, maps)
+    cmp(:>, fact, maps)
+  end
+
+  def size(fact, _maps)
     assert_args(1)
     v = by_symbol(0, fact)
     return 0 if v.nil?
@@ -177,29 +223,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_values(0, fact, maps)
+    return false if str.nil?
     raise 'Exactly one string expected' unless str.size == 1
-    re = the_value(1, fact)
+    re = the_values(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 cmp(op, fact, maps)
     assert_args(2)
-    lefts = the_value(0, fact)
+    lefts = the_values(0, fact, maps)
     return false if lefts.nil?
-    rights = the_value(1, fact)
+    rights = the_values(1, fact, maps)
     return false if rights.nil?
     lefts.any? do |l|
       l = l.floor if l.is_a?(Time) && op == :==
@@ -210,34 +256,69 @@ class Factbase::Term
     end
   end
 
-  def defn(_fact)
+  def arithmetic(op, fact, maps)
+    assert_args(2)
+    lefts = the_values(0, fact, maps)
+    raise 'The first argument is NIL, while literal expected' if lefts.nil?
+    raise 'Too many values at first position, one expected' unless lefts.size == 1
+    rights = the_values(1, fact, maps)
+    raise 'The second argument is NIL, while literal expected' if rights.nil?
+    raise 'Too many values at second position, one expected' unless rights.size == 1
+    lefts[0].send(op, rights[0])
+  end
+
+  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, maps)
+    @max ||= 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 count(_fact, maps)
+    @count ||= maps.size
   end
 
-  def max_on(maps)
-    @max = 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 min_on(maps)
-    @min = best(maps) { |v, b| v < b }
+  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 +334,9 @@ class Factbase::Term
     fact[k]
   end
 
-  def the_value(pos, fact)
+  def the_values(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/tuples.rb

@@ -23,6 +23,22 @@
 require_relative '../factbase'
 
 # 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

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.34'
+  VERSION = '0.0.36'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_fact.rb

@@ -80,8 +80,8 @@ class TestFact < Minitest::Test
 
   def test_set_by_name
     f = Factbase::Fact.new(Mutex.new, {})
-    f.send('foo_bar=', 42)
-    assert_equal(42, f.foo_bar, f.to_s)
+    f.send('_foo_bar=', 42)
+    assert_equal(42, f._foo_bar, f.to_s)
   end
 
   def test_set_twice_same_value

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,
@@ -53,20 +53,30 @@ class TestQuery < Minitest::Test
       '(gt num 60)' => 1,
       "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
+      '(eq pi +3.14)' => 1,
       '(not (exists hello))' => 3,
       '(eq "Integer" (type num))' => 2,
+      '(when (eq num 0) (exists time))' => 2,
+      '(many num)' => 1,
+      '(one num)' => 2,
+      '(gt num (minus 1 (nonil (at 0 (prev num)) 0)))' => 3,
+      '(and (not (many num)) (eq num (plus 21 +21)))' => 1,
+      '(and (not (many num)) (eq num (minus -100 -142)))' => 1,
+      '(and (one num) (eq num (times 7 6)))' => 1,
+      '(and (one pi) (eq pi (div -6.28 -2)))' => 1,
       '(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
+      "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1
     }.each do |q, r|
       assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)
     end

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,33 @@ 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
+
+  def test_past
+    t = Factbase::Term.new(:prev, [:foo])
+    assert_nil(t.evaluate(fact('foo' => 4), []))
+    assert_equal([4], t.evaluate(fact('foo' => 5), []))
+  end
+
+  def test_at
+    t = Factbase::Term.new(:at, [1, :foo])
+    assert_nil(t.evaluate(fact('foo' => 4), []))
+    assert_equal(5, t.evaluate(fact('foo' => [4, 5]), []))
+  end
+
+  def test_nonil
+    t = Factbase::Term.new(:nonil, [Factbase::Term.new(:at, [5, :foo]), 42])
+    assert_equal([42], t.evaluate(fact('foo' => 4), []))
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.36
 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