factbase 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39eb84c924fd5a4c42a73f3a9cc077d3d48d2973d513602c81b7cebb2ed9c35f
-  data.tar.gz: 9187cac9070ee7444a0849eef2a48ce78118840bc53c2e1e01f642924c69ea91
+  metadata.gz: '05496abcbec07a37de19ac7f1218943d1d50d1f0b3611ab48e6b8489675d274c'
+  data.tar.gz: b8f33d58069745e5405d6f1714c80f6fb3badc437333ce1fe685af5fb245bc42
 SHA512:
-  metadata.gz: c27c52ab2a3c7e9e26b2964d6cecb504249d9d3be4ac1206367dbc885d9e7892671f89c37c681218818849189ccf672348b4478c7c93fa7117883e0e49cd63a4
-  data.tar.gz: b1a7b747bf06380b76369e73bed096a7805f100872809b61f12d3dcf6bec60871e69a822da739b961b62c4d6d3542d68229a403522f24121cee2b8b93765e6c6
+  metadata.gz: 1475969fc18741368eff7ababc1ff5764f36244f3e11276d21a5d4f03f9d5c3ce444cf9ecd0482be3e9f3a3b3fadbc11cba5a711244dd26b39fc4be60a6915f9
+  data.tar.gz: 2e30a6d6cc39ada5038f98d8b6112250e527b756a0f9d5f5a8aebecd661d8de8e022d4d5659065ec0273035fbe740f5ea655b3f82e701993084a6755c96700f4

data/lib/factbase/indexed/indexed_term.rb

@@ -20,9 +20,9 @@ module Factbase::IndexedTerm
   # @param [Hash] params Key/value params to use
   # @return [Array<Hash>|nil] Returns a new array, or NIL if the original array must be used
   def predict(maps, params)
+    key = [maps.object_id, @operands.first, @op]
     case @op
     when :one
-      key = [maps.object_id, @operands.first, @op]
       if @idx[key].nil?
         @idx[key] = []
         prop = @operands.first.to_s
@@ -32,7 +32,6 @@ module Factbase::IndexedTerm
       end
       (maps & []) | @idx[key]
     when :exists
-      key = [maps.object_id, @operands.first, @op]
       if @idx[key].nil?
         @idx[key] = []
         prop = @operands.first.to_s
@@ -43,7 +42,6 @@ module Factbase::IndexedTerm
       (maps & []) | @idx[key]
     when :eq
       if @operands.first.is_a?(Symbol) && _scalar?(@operands[1])
-        key = [maps.object_id, @operands.first, @op]
         if @idx[key].nil?
           @idx[key] = {}
           prop = @operands.first.to_s
@@ -79,7 +77,7 @@ module Factbase::IndexedTerm
         if r.nil?
           r = n
         else
-          r &= n
+          r &= n.to_a
         end
         break if r.empty?
       end
@@ -93,7 +91,7 @@ module Factbase::IndexedTerm
           break
         end
         r = maps & [] if r.nil?
-        r |= n
+        r |= n.to_a
       end
       r
     when :not

data/lib/factbase/query.rb

@@ -44,7 +44,8 @@ class Factbase::Query
     return to_enum(__method__, fb, params) unless block_given?
     yielded = 0
     params = params.transform_keys(&:to_s) if params.is_a?(Hash)
-    (@term.predict(@maps, params) || @maps).each do |m|
+    maybe = @term.predict(@maps, params)
+    (maybe || @maps).each do |m|
       extras = {}
       f = Factbase::Fact.new(m)
       f = Factbase::Tee.new(f, params)

data/lib/factbase/taped.rb

@@ -73,6 +73,7 @@ class Factbase::Taped
   end
 
   def |(other)
+    return Factbase::Taped.new(to_a, inserted: @inserted, deleted: @deleted, added: @added) if other == []
     join(other, &:|)
   end
 
@@ -143,20 +144,13 @@ class Factbase::Taped
 
   def join(other)
     n = yield @origin.to_a, other.to_a
-    if other.respond_to?(:inserted)
-      Factbase::Taped.new(
-        n,
-        inserted: @inserted | other.inserted,
-        deleted: @deleted | other.deleted,
-        added: @added | other.added
-      )
-    else
-      Factbase::Taped.new(
-        n,
-        inserted: @inserted,
-        deleted: @deleted,
-        added: @added
-      )
-    end
+    raise 'Cannot join with another Taped' if other.respond_to?(:inserted)
+    raise 'Can only join with array' unless other.is_a?(Array)
+    Factbase::Taped.new(
+      n,
+      inserted: @inserted,
+      deleted: @deleted,
+      added: @added
+    )
   end
 end

data/lib/factbase.rb

@@ -82,7 +82,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.9.4' unless const_defined?(:VERSION)
+  VERSION = '0.9.5' unless const_defined?(:VERSION)
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/indexed/test_indexed_factbase.rb

@@ -24,16 +24,33 @@ class TestIndexedFactbase < Factbase::Test
   end
 
   def test_queries_after_update_in_txn
-    origin = Factbase.new
-    fb = Factbase::IndexedFactbase.new(origin)
-    fb.insert.foo = 42
-    fb.txn do |fbt|
-      fbt.query('(exists foo)').each do |f|
-        f.bar = f.foo + 1
+    [
+      '(exists boom)',
+      '(one boom)',
+      '(and (exists boom) (exists boom))',
+      '(and (exists boom) (exists boom) (exists boom))',
+      '(and (one boom) (one boom))',
+      '(and (one boom) (one foo))',
+      '(and (one boom) (one boom) (one boom))',
+      '(and (one boom) (one boom) (one boom) (one foo))',
+      '(and (one boom) (exists boom))',
+      '(and (exists boom) (one boom) (one boom))',
+      '(and (exists boom) (exists boom) (one boom))',
+      '(and (eq foo 42) (exists boom) (one boom) (not (exists bar)))'
+    ].each do |q|
+      origin = Factbase.new
+      fb = Factbase::IndexedFactbase.new(origin)
+      f = fb.insert
+      f.foo = 42
+      f.boom = 33
+      fb.txn do |fbt|
+        fbt.query(q).each do |n|
+          n.bar = n.foo + 1
+        end
       end
+      refute_empty(origin.query('(exists bar)').each.to_a, q)
+      refute_empty(fb.query('(exists bar)').each.to_a, q)
     end
-    refute_empty(origin.query('(exists bar)').each.to_a)
-    refute_empty(fb.query('(exists bar)').each.to_a)
   end
 
   def test_queries_after_insert_in_txn

data/test/factbase/indexed/test_indexed_term.rb

@@ -21,6 +21,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(2, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_exists
@@ -30,6 +31,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(3, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_one
@@ -39,6 +41,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(1, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_not
@@ -48,6 +51,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(1, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_and
@@ -63,6 +67,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(1, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_or
@@ -79,6 +84,7 @@ class TestIndexedTerm < Factbase::Test
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
     n = term.predict(maps, { a: 1 })
     assert_equal(3, n.size)
+    assert_kind_of(Factbase::Taped, n)
   end
 
   def test_predicts_on_others

data/test/factbase/test_query.rb

@@ -238,7 +238,7 @@ class TestQuery < Factbase::Test
         fbt.query('(exists foo)').each do |f|
           f.bar = 33
         end
-        refute_empty(fbt.query('(exists bar)').each.to_a)
+        refute_empty(fbt.query('(exists bar)').each.to_a, "in #{badge}")
       end
       refute_empty(fb.query('(exists bar)').each.to_a, "in #{badge}")
       assert_empty(fb.query('(and (exists foo) (not (exists bar)))').each.to_a, "in #{badge}")
@@ -315,7 +315,10 @@ class TestQuery < Factbase::Test
               Factbase::SyncFactbase.new(
                 Factbase::CachedFactbase.new(
                   Factbase::IndexedFactbase.new(
-                    Factbase.new(maps)
+                    Factbase::Logged.new(
+                      Factbase.new(maps),
+                      Loog::NULL
+                    )
                   )
                 )
               )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace