factbase 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d1b649fb808d571609f3231f90dbd57ba57683993d52ee2eaddd674e2aeb65
-  data.tar.gz: 717ea095ae2e1092d71509b39f1581cfc4b65d47ca9f39cb704d694eabbd91d9
+  metadata.gz: 72ae2c1184dfd8ab966591846cd054c3155b0536d8c7f2f7acf636df1eb7e045
+  data.tar.gz: fcf929766bf80cc040744ce9caa719503548fac719d956f676e9604374d78b8c
 SHA512:
-  metadata.gz: 9f6955bdf61ad153a2cf956935310fbd1d59782a34e479ae94e48c70ab8a1002dfdf61f2384e968bbdedb0be58d19ea556841d7b7300aa110927f78f1fdabaf9
-  data.tar.gz: 2364a4421fcf35c42b6e316e33f11afaf4abc69b33502b475fa08fc28e2e45b8dbe138cf72d26b8938212d2807dfd8c3b50aa40b166e481e15f363d2cf5629c8
+  metadata.gz: 0d6c3b87fd94afe4fc7984ca17be09ffd6dbff5d93951e264720201e2e5680e387fc0215331af563af7cc78ac3db9e199ca8a0aadc39d989fb377b975d3e1b8d
+  data.tar.gz: 26c9ffe593d79fc17d80949208cc0833d4147684a0fcd221dc6abd669c545da678dc4fd52723913bc29a68662ca43cf7470a9523022d0919af6dd42a440d69ca

data/fixtures/stories/empty.yml

@@ -19,3 +19,5 @@ queries:
     size: 3
   - query: (and (exists man) (empty (and (exists woman) (eq woman $wife))))
     size: 1
+  - query: (empty (eq woman $woman))
+    size: 4

data/lib/factbase/indexed/indexed_term.rb

@@ -54,8 +54,7 @@ module Factbase::IndexedTerm
         end
         vv =
           if @operands[1].is_a?(Symbol)
-            sym = @operands[1].to_s.gsub(/^\$/, '')
-            params[sym] || []
+            params[@operands[1].to_s] || []
           else
             [@operands[1]]
           end
@@ -84,8 +83,7 @@ module Factbase::IndexedTerm
         tuples = _as_tuples(
           @operands.sort_by { |o| o.operands.first }.map do |o|
             if o.operands[1].is_a?(Symbol)
-              sym = o.operands[1].to_s.gsub(/^\$/, '')
-              params[sym] || []
+              params[o.operands[1].to_s] || []
             else
               [o.operands[1]]
             end

data/lib/factbase/query.rb

@@ -44,7 +44,7 @@ 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)
-    maybe = @term.predict(@maps, params)
+    maybe = @term.predict(@maps, Factbase::Tee.new({}, params))
     (maybe || @maps).each do |m|
       extras = {}
       f = Factbase::Fact.new(m)

data/lib/factbase/rules.rb

@@ -61,7 +61,6 @@ class Factbase::Rules
   # Fact decorator.
   #
   # This is an internal class, it is not supposed to be instantiated directly.
-  #
   class Fact
     def initialize(fact, check, fb)
       @fact = fact
@@ -130,9 +129,10 @@ class Factbase::Rules
     end
 
     def it(fact, _fb)
+      return if @uid.nil?
       a = fact[@uid]
       return if a.nil?
-      @facts << a[0] unless @uid.nil?
+      @facts << a[0]
     end
 
     def include?(fact)

data/lib/factbase/tee.rb

@@ -31,12 +31,14 @@ class Factbase::Tee
   end
 
   others do |*args|
-    if args[0].to_s == '[]' && args[1].to_s.start_with?('$')
+    if args[0].to_s == '[]' && args[1].start_with?('$')
       n = args[1].to_s
       n = n[1..] unless @upper.is_a?(Factbase::Tee)
-      @upper[n]
+      r = @upper[n]
+      r = [r] unless r.respond_to?(:each) || r.nil?
+      r
     else
-      @fact.method_missing(*args)
+      @fact.send(*args)
     end
   end
 end

data/lib/factbase/term.rb

@@ -218,6 +218,10 @@ class Factbase::Term
           [v]
         end
     end
+    raise 'Why not array?' unless v.is_a?(Array)
+    unless v.all? { |i| [Float, Integer, String, Time, TrueClass, FalseClass].any? { |t| i.is_a?(t) } }
+      raise 'Wrong type inside'
+    end
     v
   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.7' unless const_defined?(:VERSION)
+  VERSION = '0.9.9' 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_query.rb

@@ -40,6 +40,15 @@ class TestIndexedQuery < Factbase::Test
     end
   end
 
+  def test_fills_up_the_index
+    idx = {}
+    fb = Factbase::IndexedFactbase.new(Factbase.new, idx)
+    fb.query('(eq x 1)').each.to_a
+    assert_equal(1, idx.size)
+    fb.insert
+    assert_empty(idx)
+  end
+
   def test_finds_by_eq_with_symbol
     fb = Factbase::IndexedFactbase.new(Factbase.new)
     f = fb.insert
@@ -159,6 +168,15 @@ class TestIndexedQuery < Factbase::Test
     end
   end
 
+  def test_joins_simple_one
+    idx = {}
+    fb = Factbase::IndexedFactbase.new(Factbase.new, idx)
+    fb.insert.who = 4
+    fb.insert.friend = 4
+    assert_equal(1, fb.query('(and (exists who) (join "f<=friend" (eq friend $who)))').each.to_a.size)
+    assert_equal(2, idx.size)
+  end
+
   def test_joins_too
     fb = Factbase::IndexedFactbase.new(Factbase.new)
     total = 10_000

data/test/factbase/indexed/test_indexed_term.rb

@@ -19,7 +19,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_equal(2, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -29,7 +29,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_equal(3, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -39,7 +39,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [22, 42] }, { 'foo' => [] }])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_equal(1, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -49,7 +49,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22] }])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_equal(1, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -59,13 +59,13 @@ class TestIndexedTerm < Factbase::Test
       :and,
       [
         Factbase::Term.new(:eq, [:foo, 42]),
-        Factbase::Term.new(:eq, %i[bar $a])
+        Factbase::Term.new(:eq, %i[bar $jeff])
       ]
     )
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
-    n = term.predict(maps, { 'a' => [7] })
+    n = term.predict(maps, Factbase::Tee.new({}, { 'jeff' => [7] }))
     assert_equal(1, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -90,7 +90,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [22, 42] }, { 'foo' => [22, 42] }])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_equal(3, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
@@ -100,7 +100,7 @@ class TestIndexedTerm < Factbase::Test
     idx = {}
     term.redress!(Factbase::IndexedTerm, idx:)
     maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'alpha' => [] }, {}])
-    n = term.predict(maps, { a: 1 })
+    n = term.predict(maps, {})
     assert_nil(n)
   end
 end

data/test/factbase/terms/test_aggregates.rb

@@ -57,7 +57,7 @@ class TestAggregates < Factbase::Test
       { 'a' => [4], 'b' => [55] }
     ]
     t = Factbase::Syntax.new('(empty (eq b $x))').to_term
-    assert(t.evaluate(Factbase::Fact.new({ 'x' => 42 }), maps, Factbase.new))
-    refute(t.evaluate(Factbase::Fact.new({ 'x' => 44 }), maps, Factbase.new))
+    assert(t.evaluate(Factbase::Fact.new({ 'x' => [42] }), maps, Factbase.new))
+    refute(t.evaluate(Factbase::Fact.new({ 'x' => [44] }), maps, Factbase.new))
   end
 end

data/test/factbase/test_query.rb

@@ -116,7 +116,10 @@ class TestQuery < Factbase::Test
       "(and (exists time) (not (\t\texists pi)))" => 1,
       '(undef something)' => 3,
       "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1,
-      '(eq 3 (agg (eq num $num) (count)))' => 1
+      '(eq 3 (agg (eq num $num) (count)))' => 1,
+      '(and (eq num 42) (not (empty (eq name "Jeff"))))' => 2,
+      '(and (eq num 42) (empty (eq x $name)))' => 2,
+      '(and (eq num 42) (not (empty (eq name $name))))' => 2
     }
     maps = [
       { 'num' => [42], 'name' => ['Jeff'] },
@@ -156,18 +159,22 @@ class TestQuery < Factbase::Test
 
   def test_reading_one
     maps = [
-      { 'foo' => [42] },
+      { 'foo' => [42], 'hello' => [4] },
       { 'bar' => [4, 5] }
     ]
     with_factbases(maps) do |badge, fb|
       {
+        '(agg (and (eq foo 42) (eq hello $v)) (min foo))' => 42,
+        '(agg (or (eq foo 42) (eq bar 4)) (min foo))' => 42,
         '(agg (exists foo) (first foo))' => [42],
         '(agg (exists z) (first z))' => nil,
         '(agg (always) (count))' => 2,
         '(agg (eq bar $v) (count))' => 1,
+        '(agg (eq foo 42) (min foo))' => 42,
+        '(agg (and (eq foo 42)) (min foo))' => 42,
         '(agg (eq z 40) (count))' => 0
       }.each do |q, expected|
-        result = fb.query(q).one(fb, v: 4)
+        result = fb.query(q).one(fb, 'v' => 4)
         if expected.nil?
           assert_nil(result, "#{q} -> nil in #{badge}")
         else
@@ -190,6 +197,16 @@ class TestQuery < Factbase::Test
     end
   end
 
+  def test_finds_with_subsitution
+    maps = [{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [666] }]
+    with_factbases(maps) do |badge, fb|
+      assert_equal(0, fb.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge}")
+      fb.txn do |fbt|
+        assert_equal(0, fbt.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge} (txn)")
+      end
+    end
+  end
+
   def test_scans_and_inserts
     with_factbases do |_, fb|
       fb.insert.foo = 42
@@ -277,8 +294,8 @@ class TestQuery < Factbase::Test
       found += 1
     end
     assert_equal(1, found)
-    assert_equal(1, Factbase::Query.new(maps, '(eq foo $bar)', Factbase.new).each(Factbase.new, bar: 42).to_a.size)
-    assert_equal(0, Factbase::Query.new(maps, '(eq foo $bar)', Factbase.new).each(Factbase.new, bar: 555).to_a.size)
+    assert_equal(1, Factbase::Query.new(maps, '(eq foo $bar)', Factbase.new).each(Factbase.new, bar: [42]).to_a.size)
+    assert_equal(0, Factbase::Query.new(maps, '(eq foo $bar)', Factbase.new).each(Factbase.new, bar: [555]).to_a.size)
   end
 
   def test_with_nil_alias

data/test/factbase/test_tee.rb

@@ -23,6 +23,13 @@ class TestTee < Factbase::Test
     assert_equal([13], t['$bar'])
   end
 
+  def test_no_trip_to_prim_if_not_found
+    prim = Factbase::Fact.new({})
+    prim.foo = 777
+    t = Factbase::Tee.new(prim, Factbase::Fact.new({}))
+    assert_nil(t['$foo'])
+  end
+
   def test_all_properties
     prim = Factbase::Fact.new({})
     prim.foo = 42
@@ -37,10 +44,10 @@ class TestTee < Factbase::Test
     map = {}
     prim = Factbase::Fact.new(map)
     prim.foo = 42
-    t = Factbase::Tee.new(Factbase::Fact.new({}), { 'bar' => 7 })
-    assert_equal(7, t['$bar'])
+    t = Factbase::Tee.new(Factbase::Fact.new({}), { 'bar' => [7] })
+    assert_equal([7], t['$bar'])
     t = Factbase::Tee.new(prim, t)
-    assert_equal(7, t['$bar'])
+    assert_equal([7], t['$bar'])
   end
 
   def test_prints_to_string

metadata

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