factbase 0.0.31 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016b53cf00bc9efec24f50c333ab1fc14266151487fab61ce7d7ca533ba602a6
-  data.tar.gz: 89845aa58068bf78189d62602282dbcffe8f99a5d4b772dcf8bfd3ee4b3698d4
+  metadata.gz: 4434f46130fcb63e9fa798f3c6bacf8441e91a680f789015faf03ba5cb2296b3
+  data.tar.gz: 2d461a92eb2121ca9394e9c07128afa48e3f62a06290678eb68a869fb6fdd501
 SHA512:
-  metadata.gz: 0d2fecf64f6b62d4ad8796469f4aa937a63e2398f032a812fc15b95ea6be48f0aa25fe032bc469e4afd4ced351f6ba8fbc914bf1dc074dd07ae881b481e39d0b
-  data.tar.gz: 9843fdc79bf8b53aae6b366d1ea133f92185a85dc37ed5f6779d478d030655e621d5431cf793ee162f79fddc4c51ae49403850f25849cbcefb7ac793cc4975ae
+  metadata.gz: 4a8683f418df4a0bd0de1d1f8be145a2eb4b1ea2e3bb7993355df88b591b6195dbac3654da7222ff3d66c1f3255c4dfb98520ff68f45721527138e258726d454
+  data.tar.gz: 027e1d0262aeca3ef34ea2a9ab3bdca0e6f6975c0f5478bee62e707f15668281bf2950be04f6cfca636d55a0b79ba9cd38e9a5679d8f63b7d800f69943b9b40c

data/README.md

@@ -56,8 +56,7 @@ assert(f2.query('(eq foo 42)').each.to_a.size == 1)
 
 All terms available in a query:
 
-* `()` is true
-* `(nil)` is false
+* `(always)` and `(never)` are "true" and "false"
 * `(not t)` inverses the `t` if it's boolean (exception otherwise)
 * `(or t1 t2 ...)` returns true if at least one argument is true
 * `(and t1 t2 ...)` returns true if all arguments are true

data/lib/factbase/syntax.rb

@@ -71,7 +71,7 @@ class Factbase::Syntax
     return [tokens[at], at + 1] unless tokens[at] == :open
     at += 1
     op = tokens[at]
-    return [Factbase::Term.new(:nil, []), at + 1] if op == :close
+    raise 'No token found' if op == :close
     operands = []
     at += 1
     loop do

data/lib/factbase/term.rb

@@ -43,6 +43,8 @@ class Factbase::Term
   # @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.
@@ -87,11 +89,16 @@ class Factbase::Term
 
   private
 
-  def nil(_fact)
+  def always(_fact)
     assert_args(0)
     true
   end
 
+  def never(_fact)
+    assert_args(0)
+    false
+  end
+
   def not(fact)
     assert_args(1)
     !only_bool(the_value(0, fact))

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.31'
+  VERSION = '0.0.33'
 
   # Constructor.
   def initialize(facts = [])
@@ -86,8 +86,13 @@ class Factbase
     copy = this.dup
     yield copy
     @mutex.synchronize do
-      @maps = []
-      import(copy.export)
+      after = Marshal.load(copy.export)
+      after.each_with_index do |m, i|
+        @maps << {} if i >= @maps.size
+        m.each do |k, v|
+          @maps[i][k] = v
+        end
+      end
     end
   end
 

data/test/factbase/test_inv.rb

@@ -42,7 +42,7 @@ class TestInv < Minitest::Test
     end
     f.c = 256
     assert_equal(42, f.a)
-    assert_equal(1, fb.query('()').each.to_a.size)
+    assert_equal(1, fb.query('(always)').each.to_a.size)
   end
 
   def test_pre_and_inv

data/test/factbase/test_looged.rb

@@ -48,19 +48,19 @@ class TestLooged < Minitest::Test
     fb = Factbase.new
     fb.insert
     fb.insert
-    assert_equal(2, Factbase::Looged.new(fb, Loog::NULL).query('()').each(&:to_s))
+    assert_equal(2, Factbase::Looged.new(fb, Loog::NULL).query('(always)').each(&:to_s))
   end
 
   def test_returns_int_when_empty
     fb = Factbase.new
-    assert_equal(0, Factbase::Looged.new(fb, Loog::NULL).query('()').each(&:to_s))
+    assert_equal(0, Factbase::Looged.new(fb, Loog::NULL).query('(always)').each(&:to_s))
   end
 
   def test_logs_when_enumerator
     fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
-    assert_equal(0, fb.query('()').each.to_a.size)
+    assert_equal(0, fb.query('(always)').each.to_a.size)
     fb.insert
-    assert_equal(1, fb.query('()').each.to_a.size)
+    assert_equal(1, fb.query('(always)').each.to_a.size)
   end
 
   def test_proper_logging

data/test/factbase/test_pre.rb

@@ -33,6 +33,6 @@ class TestPre < Minitest::Test
     fb = Factbase::Pre.new(Factbase.new) { |f| f.foo = 42 }
     f = fb.insert
     assert_equal(42, f.foo)
-    assert_equal(1, fb.query('()').each.to_a.size)
+    assert_equal(1, fb.query('(always)').each.to_a.size)
   end
 end

data/test/factbase/test_query.rb

@@ -90,6 +90,16 @@ class TestQuery < Minitest::Test
     assert_equal(1, maps.size)
   end
 
+  def test_deleting_nothing
+    maps = []
+    maps << { 'foo' => [42] }
+    maps << { 'bar' => [4, 5] }
+    maps << { 'bar' => 5 }
+    q = Factbase::Query.new(maps, Mutex.new, '(never)')
+    assert_equal(0, q.delete!)
+    assert_equal(3, maps.size)
+  end
+
   def test_to_array
     maps = []
     maps << { 'foo' => [42] }

data/test/factbase/test_syntax.rb

@@ -41,13 +41,12 @@ class TestSyntax < Minitest::Test
 
   def test_simple_parsing
     [
-      '()',
       '(foo)',
       '(foo (bar) (zz 77)   )',
       "(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",
-      "(or ( a 4) (b 5) () (and () (c 5) \t\t(r 7 w8s w8is 'Foo')))"
+      "(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
     end
@@ -67,7 +66,7 @@ class TestSyntax < Minitest::Test
       '(eq t 2024-05-25T19:43:48Z)',
       '(eq t 3.1415926)',
       '(eq t 3.0e+21)',
-      "(foo (x (f (t (y 42 'Hey you'))) (f) (r 3)) y z)"
+      "(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)
     end
@@ -91,6 +90,7 @@ class TestSyntax < Minitest::Test
   def test_broken_syntax
     [
       '',
+      '()',
       '(foo',
       '(foo 1) (bar 2)',
       'some text',

data/test/factbase/test_term.rb

@@ -82,8 +82,13 @@ class TestTerm < Minitest::Test
     assert(!t.evaluate(fact('bar' => [100])))
   end
 
+  def test_false_matching
+    t = Factbase::Term.new(:never, [])
+    assert(!t.evaluate(fact('foo' => [100])))
+  end
+
   def test_not_matching
-    t = Factbase::Term.new(:not, [Factbase::Term.new(:nil, [])])
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:always, [])])
     assert(!t.evaluate(fact('foo' => [100])))
   end
 

data/test/test_factbase.rb

@@ -107,7 +107,7 @@ class TestFactbase < Minitest::Test
 
   def test_all_decorators
     [
-      Factbase::Rules.new(Factbase.new, '()'),
+      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),
@@ -126,7 +126,19 @@ class TestFactbase < Minitest::Test
       end
       d.import(d.export)
       assert_equal(4, d.size)
-      assert_equal(4, d.query('()').each.to_a.size)
+      assert_equal(4, d.query('(always)').each.to_a.size)
     end
   end
+
+  def test_txn_inside_query
+    fb = Factbase.new
+    fb.insert.foo = 42
+    fb.query('(exists foo)').each do |f|
+      fb.txn do |fbt|
+        fbt.insert.bar = 33
+      end
+      f.xyz = 1
+    end
+    assert_equal(1, fb.query('(exists xyz)').each.to_a.size)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.33
 platform: ruby
 authors:
 - Yegor Bugayenko