factbase 0.0.49 → 0.0.51

data/test/factbase/test_query.rb

@@ -44,9 +44,9 @@ class TestQuery < Minitest::Test
 
   def test_complex_parsing
     maps = []
-    maps << { 'num' => 42, 'name' => 'Jeff' }
-    maps << { 'pi' => 3.14, 'num' => [42, 66, 0], 'name' => 'peter' }
-    maps << { 'time' => Time.now - 100, 'num' => 0, 'hi' => [4], 'nome' => ['Walter'] }
+    maps << { 'num' => [42], 'name' => ['Jeff'] }
+    maps << { 'pi' => [3.14], 'num' => [42, 66, 0], 'name' => ['peter'] }
+    maps << { 'time' => [Time.now - 100], 'num' => [0], 'hi' => [4], 'nome' => ['Walter'] }
     {
       '(eq num 444)' => 0,
       '(eq hi 4)' => 1,
@@ -65,6 +65,7 @@ class TestQuery < Minitest::Test
       '(unique pi)' => 1,
       '(many num)' => 1,
       '(one num)' => 2,
+      '(nil (agg (exists hello) (min num)))' => 3,
       '(gt num (minus 1 (either (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,
@@ -84,7 +85,8 @@ class TestQuery < Minitest::Test
       '(and (absent time) (exists pi))' => 1,
       "(and (exists time) (not (\t\texists pi)))" => 1,
       '(undef something)' => 3,
-      "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1
+      "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1,
+      '(eq 3 (agg (eq num $num) (count)))' => 1
     }.each do |q, r|
       assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)
     end
@@ -93,7 +95,7 @@ class TestQuery < Minitest::Test
   def test_simple_parsing_with_time
     maps = []
     now = Time.now.utc
-    maps << { 'foo' => now }
+    maps << { 'foo' => [now] }
     q = Factbase::Query.new(maps, Mutex.new, "(eq foo #{now.iso8601})")
     assert_equal(1, q.each.to_a.size)
   end
@@ -102,7 +104,7 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'foo' => [42] }
     maps << { 'bar' => [4, 5] }
-    maps << { 'bar' => 5 }
+    maps << { 'bar' => [5] }
     q = Factbase::Query.new(maps, Mutex.new, '(eq bar 5)')
     assert_equal(2, q.delete!)
     assert_equal(1, maps.size)
@@ -112,7 +114,7 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'foo' => [42] }
     maps << { 'bar' => [4, 5] }
-    maps << { 'bar' => 5 }
+    maps << { 'bar' => [5] }
     q = Factbase::Query.new(maps, Mutex.new, '(never)')
     assert_equal(0, q.delete!)
     assert_equal(3, maps.size)
@@ -126,8 +128,21 @@ class TestQuery < Minitest::Test
 
   def test_returns_int
     maps = []
-    maps << { 'foo' => 1 }
+    maps << { 'foo' => [1] }
     q = Factbase::Query.new(maps, Mutex.new, '(eq foo 1)')
     assert_equal(1, q.each(&:to_s))
   end
+
+  def test_with_aliases
+    maps = []
+    maps << { 'foo' => [42] }
+    assert_equal(45, Factbase::Query.new(maps, Mutex.new, '(as bar (plus foo 3))').each.to_a[0].bar)
+    assert_equal(1, maps[0].size)
+  end
+
+  def test_with_nil_alias
+    maps = []
+    maps << { 'foo' => [42] }
+    assert(Factbase::Query.new(maps, Mutex.new, '(as bar (plus xxx 3))').each.to_a[0]['bar'].nil?)
+  end
 end

data/test/factbase/test_rules.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/rules'
+require_relative '../../lib/factbase/pre'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -66,6 +67,18 @@ class TestRules < Minitest::Test
     assert(ok)
   end
 
+  def test_rollback_on_violation
+    fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
+    assert_raises do
+      fb.txn do |fbt|
+        f = fbt.insert
+        f.a = 1
+        f.c = 2
+      end
+    end
+    assert_equal(0, fb.size)
+  end
+
   def test_in_combination_with_pre
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
     fb = Factbase::Pre.new(fb) do |f|
@@ -81,6 +94,6 @@ class TestRules < Minitest::Test
       end
     end
     assert(ok)
-    assert_equal(1, fb.query('(eq hello 42)').each.to_a.size)
+    assert_equal(0, fb.query('(eq hello 42)').each.to_a.size)
   end
 end

data/test/factbase/test_syntax.rb

@@ -43,7 +43,7 @@ class TestSyntax < Minitest::Test
     [
       '(foo)',
       '(foo (bar) (zz 77)   ) # hey',
-      "# hello\n\n\n(foo (bar))",
+      "# hello\n\n\n(foo ($bar))",
       "(eq foo   \n\n 'Hello, world!'\n)\n",
       "(eq x 'Hello, \\' \n) \\' ( world!')",
       "# this is a comment\n(eq foo # test\n 42)\n\n# another comment\n",

data/test/factbase/test_tee.rb

@@ -0,0 +1,43 @@
+# 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/tee'
+require_relative '../../lib/factbase/fact'
+
+# Tee test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestTee < Minitest::Test
+  def test_two_facts
+    map = {}
+    prim = Factbase::Fact.new(Mutex.new, map)
+    prim.foo = 42
+    upper = Factbase::Fact.new(Mutex.new, map)
+    upper.bar = 13
+    t = Factbase::Tee.new(prim, upper)
+    assert_equal(42, t.foo)
+    assert_equal([13], t['$bar'])
+  end
+end

data/test/factbase/test_term.rb

@@ -22,67 +22,12 @@
 
 require 'minitest/autorun'
 require_relative '../../lib/factbase/term'
-require_relative '../../lib/factbase/syntax'
 
 # Term test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 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!']), []))
-  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' => []), []))
-  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]), []))
-  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), []))
-  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), []))
-  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]), []))
-  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]), []))
-  end
-
   def test_false_matching
     t = Factbase::Term.new(:never, [])
     assert(!t.evaluate(fact('foo' => [100]), []))
@@ -125,6 +70,7 @@ class TestTerm < Minitest::Test
     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('Integer', t.evaluate(fact('foo' => 1_000_000_000_000_000), []))
     assert_equal('nil', t.evaluate(fact, []))
   end
 
@@ -213,6 +159,12 @@ class TestTerm < Minitest::Test
     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
@@ -229,27 +181,6 @@ class TestTerm < Minitest::Test
     assert(msg.include?('at (at)'), msg)
   end
 
-  def test_aggregation
-    maps = [
-      { 'x' => 1, 'y' => 0, 'z' => 4 },
-      { 'x' => 2, 'y' => 42, 'z' => 3 },
-      { 'x' => 3, 'y' => 42, 'z' => 5 },
-      { 'x' => 4, 'y' => 42, 'z' => 2 },
-      { 'x' => 5, 'y' => 42, 'z' => 1 },
-      { 'x' => 8, 'y' => 0, 'z' => 6 }
-    ]
-    {
-      '(eq x (agg (eq y 42) (min x)))' => '(eq x 2)',
-      '(eq z (agg (eq y 0) (max z)))' => '(eq x 8)',
-      '(eq x (agg (and (eq y 42) (gt z 1)) (max x)))' => '(eq x 4)',
-      '(and (eq x (agg (eq y 42) (min x))) (eq z 3))' => '(eq x 2)'
-    }.each do |q, r|
-      t = Factbase::Syntax.new(q).to_term
-      f = maps.find { |m| t.evaluate(fact(m), maps) }
-      assert(Factbase::Syntax.new(r).to_term.evaluate(fact(f), []))
-    end
-  end
-
   private
 
   def fact(map = {})

data/test/factbase/test_to_xml.rb

@@ -73,6 +73,27 @@ class TestToXML < Minitest::Test
     assert(!xml.xpath('/fb/f/class').empty?)
   end
 
+  def test_show_types_as_attributes
+    fb = Factbase.new
+    f = fb.insert
+    f.a = 42
+    f.b = 3.14
+    f.c = 'Hello'
+    f.d = Time.now
+    f.e = 'e'
+    f.e = 4
+    out = Factbase::ToXML.new(fb).xml
+    xml = Nokogiri::XML.parse(out)
+    [
+      '/fb/f/a[@t="I"]',
+      '/fb/f/b[@t="F"]',
+      '/fb/f/c[@t="S"]',
+      '/fb/f/d[@t="T"]',
+      '/fb/f/e/v[@t="S"]',
+      '/fb/f/e/v[@t="I"]'
+    ].each { |x| assert(!xml.xpath(x).empty?, out) }
+  end
+
   def test_sorts_keys
     fb = Factbase.new
     f = fb.insert
@@ -80,7 +101,10 @@ class TestToXML < Minitest::Test
     f.t = 40
     f.a = 10
     f.c = 1
-    xml = Factbase::ToXML.new(fb).xml
-    assert(xml.gsub(/\s*/, '').include?('<f><a>10</a><c>1</c><t>40</t><x>20</x></f>'), xml)
+    to = Factbase::ToXML.new(fb)
+    xml = Nokogiri::XML.parse(to.xml)
+    %w[a c t x].each_with_index do |e, i|
+      assert(!xml.xpath("/fb/f/#{e}[count(preceding-sibling::*) = #{i}]").empty?, e)
+    end
   end
 end

data/test/test_factbase.rb

@@ -68,15 +68,15 @@ class TestFactbase < Minitest::Test
     fb.insert.bar = 1
     fb.query('(exists bar)').each do |f|
       f.bar = 42
-      assert_equal([1, 42], f['bar'])
+      assert_equal(2, f['bar'].size)
     end
     found = 0
     fb.query('(always)').each do |f|
-      assert_equal([1, 42], f['bar'])
+      assert_equal(2, f['bar'].size)
       found += 1
     end
     assert_equal(1, found)
-    assert_equal([1, 42], fb.query('(always)').each.to_a[0]['bar'])
+    assert_equal(2, fb.query('(always)').each.to_a[0]['bar'].size)
   end
 
   def test_serialize_and_deserialize

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.51
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: backtrace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ files:
 - Rakefile
 - factbase.gemspec
 - lib/factbase.rb
+- lib/factbase/accum.rb
 - lib/factbase/fact.rb
 - lib/factbase/flatten.rb
 - lib/factbase/inv.rb
@@ -123,12 +138,25 @@ files:
 - lib/factbase/query.rb
 - lib/factbase/rules.rb
 - lib/factbase/syntax.rb
+- lib/factbase/tee.rb
 - lib/factbase/term.rb
+- lib/factbase/terms/aggregates.rb
+- lib/factbase/terms/aliases.rb
+- lib/factbase/terms/debug.rb
+- lib/factbase/terms/defn.rb
+- lib/factbase/terms/logical.rb
+- lib/factbase/terms/math.rb
+- lib/factbase/terms/meta.rb
+- lib/factbase/terms/ordering.rb
+- lib/factbase/terms/strings.rb
 - lib/factbase/to_json.rb
 - lib/factbase/to_xml.rb
 - lib/factbase/to_yaml.rb
-- lib/factbase/tuples.rb
 - renovate.json
+- test/factbase/terms/test_aggregates.rb
+- test/factbase/terms/test_aliases.rb
+- test/factbase/terms/test_math.rb
+- test/factbase/test_accum.rb
 - test/factbase/test_fact.rb
 - test/factbase/test_flatten.rb
 - test/factbase/test_inv.rb
@@ -137,11 +165,11 @@ files:
 - test/factbase/test_query.rb
 - test/factbase/test_rules.rb
 - test/factbase/test_syntax.rb
+- test/factbase/test_tee.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_tuples.rb
 - test/test__helper.rb
 - test/test_factbase.rb
 homepage: http://github.com/yegor256/factbase.rb

data/test/factbase/test_tuples.rb

@@ -1,106 +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/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
-
-  def test_with_chaining
-    fb = Factbase.new
-    f1 = fb.insert
-    f1.name = 'Jeff'
-    f1.friend = 'Walter'
-    f2 = fb.insert
-    f2.name = 'Walter'
-    f2.group = 1
-    f3 = fb.insert
-    f3.name = 'Donny'
-    f3.group = 1
-    tuples = Factbase::Tuples.new(
-      fb, ['(eq name "Jeff")', '(eq name "{f0.friend}")', '(eq group {f1.group})']
-    )
-    tuples.each do |fs|
-      assert_equal('Walter', fs[1].name)
-      assert(%w[Walter Donny].include?(fs[2].name))
-    end
-    assert_equal(2, tuples.each.to_a.size)
-  end
-end