factbase 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2bcf895fa6934620163134f67815a20126515fcc163bdf7a232752a474bfcd
-  data.tar.gz: 2b96185e57e1ffa3176d34839940cff0a025b4cef8c7cd49b99bf9bdc79ab05c
+  metadata.gz: 1b9679d9fad6ba549ccccd428809c330ba6f2c3eefb3a8c32cd6b2ea9668f8e1
+  data.tar.gz: 5103850e97643459fda4640e5564fe8073bc0c949b699a325a83360bb32e7dfc
 SHA512:
-  metadata.gz: ac68811b7e3fd879a0a19079c537d5718095e0f8786de51b9fa949a1541f518dbd0f93ea9aedd749b41e90c965a9f81ec1fdd75b24e1959c0adc818d899f8017
-  data.tar.gz: dd39f0a82dc183b2c324660f1a9bb3ba6bf95cb2fa37c528d2684197aa96167dc62d6ee4797efd20c705a8c530c6e8ae09f332954023b1791c4dcb806f7b9a54
+  metadata.gz: cb9d62637fde56598cb1c2c01d492b6f2e0e9f144ee7eba1cbca88779be1214afc1f7ec43687baec3a9bc232ccb127856a9aad4b5732965667c2f69c91341229
+  data.tar.gz: 10c1b8ddeeb23a0b1ed8de099aad0bf55c2e19370fba0d6686384a24769a57f3483cb10de5313588b0607e8dee9b4484050dde929b8e7fe2a9b053a96f242b20

data/Rakefile

@@ -33,7 +33,7 @@ end
 desc 'Run them via Ruby, one by one'
 task :picks do
   next if OS.windows?
-  %w[text lib].each do |d|
+  %w[test lib].each do |d|
     Dir["#{d}/**/*.rb"].each do |f|
       qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
     end

data/lib/factbase/cached/cached_query.rb

@@ -36,9 +36,12 @@ class Factbase::CachedQuery
     key = "each #{@origin}" # params are ignored!
     before = @cache[key]
     @cache[key] = @origin.each(fb, params).to_a if before.nil?
+    c = 0
     @cache[key].each do |f|
+      c += 1
       yield Factbase::CachedFact.new(f, @cache)
     end
+    c
   end
 
   # Read a single value.

data/lib/factbase/indexed/indexed_query.rb

@@ -33,9 +33,11 @@ class Factbase::IndexedQuery
   # @return [Integer] Total number of facts yielded
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
-    @origin.each(fb, params).to_a.each do |f|
+    a = @origin.each(fb, params).to_a
+    a.each do |f|
       yield Factbase::IndexedFact.new(f, @idx)
     end
+    a.size
   end
 
   # Read a single value.

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/logged.rb

@@ -138,13 +138,14 @@ class Factbase::Logged
     def each(fb = @fb, params = {}, &)
       return to_enum(__method__, fb, params) unless block_given?
       start = Time.now
-      q = Factbase::Syntax.new(@term).to_term.to_s
       r = nil
+      qry = @fb.query(@term, @maps)
       tail =
         Factbase::Logged.elapsed do
-          r = @fb.query(@term, @maps).each(fb, params, &)
+          r = qry.each(fb, params, &)
         end
-      raise ".each of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
+      raise ".query(#{@term.to_s.inspect}).each() of #{qry.class} returned #{r.class}" unless r.is_a?(Integer)
+      q = Factbase::Syntax.new(@term).to_term.to_s
       if r.zero?
         @tube.say(start, "Zero/#{@fb.size} facts found by '#{q}' #{tail}")
       else

data/lib/factbase/query.rb

@@ -39,7 +39,7 @@ class Factbase::Query
   # @param [Factbase] fb The factbase
   # @param [Hash] params Optional params accessible in the query via the "$" symbol
   # @yield [Fact] Facts one-by-one
-  # @return [Integer] Total number of facts yielded
+  # @return [Integer] Total number of facts yielded (if block given), otherwise enumerator
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
     yielded = 0

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,10 +31,13 @@ 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 = @fact[n] if r.nil?
+      r = [r] unless r.respond_to?(:each) || r.nil?
+      r
     else
       @fact.method_missing(*args)
     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.6' unless const_defined?(:VERSION)
+  VERSION = '0.9.8' 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_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_logged.rb

@@ -7,6 +7,7 @@ require_relative '../test__helper'
 require 'loog'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/logged'
+require_relative '../../lib/factbase/cached/cached_factbase'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,6 +37,18 @@ class TestLogged < Factbase::Test
     assert_equal([42], fb.query('(agg (exists bar) (first bar))').one)
   end
 
+  def test_avoid_inner_logging
+    buf = Loog::Buffer.new
+    fb = Factbase.new
+    fb.insert
+    fb.insert.bar = 42
+    fb = Factbase::Logged.new(Factbase::CachedFactbase.new(fb), buf)
+    fb.query('(agg (exists bar) (count))').one
+    fb.query('(join "foo<=bar" (exists bar))').each.to_a
+    refute_includes(buf.to_s, '\'(count)\'')
+    refute_includes(buf.to_s, '\'(exists bar)\'')
+  end
+
   def test_with_txn
     log = Loog::Buffer.new
     fb = Factbase::Logged.new(Factbase.new, log)

data/test/factbase/test_query.rb

@@ -156,18 +156,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 +194,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(1, 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)")
+      end
+    end
+  end
+
   def test_scans_and_inserts
     with_factbases do |_, fb|
       fb.insert.foo = 42
@@ -277,8 +291,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

@@ -37,10 +37,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.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Yegor Bugayenko