factbase 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9679d9fad6ba549ccccd428809c330ba6f2c3eefb3a8c32cd6b2ea9668f8e1
-  data.tar.gz: 5103850e97643459fda4640e5564fe8073bc0c949b699a325a83360bb32e7dfc
+  metadata.gz: 72ae2c1184dfd8ab966591846cd054c3155b0536d8c7f2f7acf636df1eb7e045
+  data.tar.gz: fcf929766bf80cc040744ce9caa719503548fac719d956f676e9604374d78b8c
 SHA512:
-  metadata.gz: cb9d62637fde56598cb1c2c01d492b6f2e0e9f144ee7eba1cbca88779be1214afc1f7ec43687baec3a9bc232ccb127856a9aad4b5732965667c2f69c91341229
-  data.tar.gz: 10c1b8ddeeb23a0b1ed8de099aad0bf55c2e19370fba0d6686384a24769a57f3483cb10de5313588b0607e8dee9b4484050dde929b8e7fe2a9b053a96f242b20
+  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/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/tee.rb

@@ -35,11 +35,10 @@ class Factbase::Tee
       n = args[1].to_s
       n = n[1..] unless @upper.is_a?(Factbase::Tee)
       r = @upper[n]
-      r = @fact[n] if r.nil?
       r = [r] unless r.respond_to?(:each) || r.nil?
       r
     else
-      @fact.method_missing(*args)
+      @fact.send(*args)
     end
   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.8' 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/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'] },
@@ -197,9 +200,9 @@ class TestQuery < Factbase::Test
   def test_finds_with_subsitution
     maps = [{ 'foo' => [42] }, { 'bar' => [7] }, { 'foo' => [666] }]
     with_factbases(maps) do |badge, fb|
-      assert_equal(1, fb.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge}")
+      assert_equal(0, fb.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge}")
       fb.txn do |fbt|
-        assert_equal(1, fbt.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge} (txn)")
+        assert_equal(0, fbt.query('(eq 2 (agg (eq foo $foo) (count)))').each.to_a.size, "with #{badge} (txn)")
       end
     end
   end

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

metadata

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