factbase 0.0.51 → 0.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5185906fd48ccc7df8bfd07a8dd88ae4e7ce4636ec40b3cc3fc174cdeb347d1
-  data.tar.gz: a0bc08ef0001d876b9cd26c31fd4a59f094f9ad88dbbb002e345ca4c47cc1a7f
+  metadata.gz: a70fcc45481bd1611d6bf2ed5c41ef40fe6f1ce67494abfa769c3b859b215960
+  data.tar.gz: 609bd76eaca6f4668bbbf5678514503edb1f9184e9abd62321dc02cdd614f80c
 SHA512:
-  metadata.gz: ad553e4da47bb2a6af81a07a64d627dc03ebfe68f96000bc1862df8a25e5bd3cc1563d93ef3a184932af6af286e47912789ca232154cadef512cfc97a3341387
-  data.tar.gz: b85a0a97e043e3bc4fa03396a3073c63f18cc268bf296174df66045b7ce47ccd082eb2cbe92d1cd1b07c7a43225ebcd830f624abccdd7d71bfae78825c05dcc5
+  metadata.gz: 97e8cc3c9f53349aaf85aa3f95ba9f0e2525dd85f242ade079083b4ffab042dbb0b3f1ad776573646f7fae0107e709404b70e340fc9660b99ef8770a313aa8a9
+  data.tar.gz: e4d9404781d0314d4e6aa22f93affc3260fc053121c9e70204f8690d30de34feb26533254f15519b9e2562a5562e93398779d890ab78c3acc3afcd8ed8fba782

data/Gemfile

@@ -23,11 +23,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.23.1', require: false
+gem 'minitest', '5.24.0', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rspec-rails', '6.1.2', require: false
+gem 'rspec-rails', '6.1.3', require: false
 gem 'rubocop', '1.64.1', require: false
-gem 'rubocop-performance', '1.21.0', require: false
+gem 'rubocop-performance', '1.21.1', require: false
 gem 'rubocop-rspec', '3.0.1', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false

data/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     loog (0.5.1)
-    minitest (5.23.1)
+    minitest (5.24.0)
     mutex_m (0.2.0)
     nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
@@ -119,7 +119,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -141,7 +141,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (3.0.1)
@@ -176,11 +176,11 @@ PLATFORMS
 
 DEPENDENCIES
   factbase!
-  minitest (= 5.23.1)
+  minitest (= 5.24.0)
   rake (= 13.2.1)
-  rspec-rails (= 6.1.2)
+  rspec-rails (= 6.1.3)
   rubocop (= 1.64.1)
-  rubocop-performance (= 1.21.0)
+  rubocop-performance (= 1.21.1)
   rubocop-rspec (= 3.0.1)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)

data/README.md

@@ -86,8 +86,9 @@ It's possible to modify the facts retrieved, on fly:
 
 * `(as p v)` adds property `p` with the value `v`
 * `(join s t)` adds properties named by the `s` mask with the values retrieved
-by the `t` term, for example, `(join "foo_*" (gt x 5))` will add `foo_x` and
-all other properties found in the facts that match `(gt x 5)`
+by the `t` term, for example, `(join "x<=foo,y<=bar" (gt x 5))` will add
+`x` and `y` properties, setting them to values found in the `foo` and `bar`
+properties in the facts that match `(gt x 5)`
 
 Also, some simple arithmetic:
 
@@ -128,6 +129,10 @@ a positive integer)
 * `(min p)` returns the minimum
 * `(sum p)` returns the arithmetic sum of all values of the `p` property
 
+It's also possible to use a sub-query in a shorter form than with the `agg`:
+
+* `(empty q)` is true if the subquery `q` is empty
+
 ## How to contribute
 
 Read

data/lib/factbase/accum.rb

@@ -39,7 +39,7 @@ class Factbase::Accum
   end
 
   def to_s
-    @fact.to_s
+    "#{@fact} + #{@props}"
   end
 
   def method_missing(*args)
@@ -55,6 +55,7 @@ class Factbase::Accum
       kk = args[1].to_s
       vv = @props[kk].nil? ? [] : @props[kk]
       vvv = @fact.method_missing(*args)
+      vvv = [vvv] unless vvv.nil? || vvv.is_a?(Array)
       vv += vvv unless vvv.nil?
       vv.uniq!
       return vv.empty? ? nil : vv

data/lib/factbase/looged.rb

@@ -129,12 +129,26 @@ class Factbase::Looged
       @loog = loog
     end
 
-    def each(&)
+    def one(params = {})
+      q = Factbase::Syntax.new(@expr).to_term.to_s
+      r = nil
+      tail = Factbase::Looged.elapsed do
+        r = @fb.query(@expr).one(params)
+      end
+      if r.nil?
+        @loog.debug("Nothing found by '#{q}' #{tail}")
+      else
+        @loog.debug("Found #{r} (#{r.class}) by '#{q}' #{tail}")
+      end
+      r
+    end
+
+    def each(params = {}, &)
       q = Factbase::Syntax.new(@expr).to_term.to_s
       if block_given?
         r = nil
         tail = Factbase::Looged.elapsed do
-          r = @fb.query(@expr).each(&)
+          r = @fb.query(@expr).each(params, &)
         end
         raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
@@ -146,7 +160,7 @@ class Factbase::Looged
       else
         array = []
         tail = Factbase::Looged.elapsed do
-          @fb.query(@expr).each do |f|
+          @fb.query(@expr).each(params) do |f|
             array << f
           end
         end

data/lib/factbase/query.rb

@@ -24,6 +24,7 @@ require_relative '../factbase'
 require_relative 'syntax'
 require_relative 'fact'
 require_relative 'accum'
+require_relative 'tee'
 
 # Query.
 #
@@ -46,16 +47,19 @@ class Factbase::Query
     @query = query
   end
 
-  # Iterate them one by one.
+  # Iterate facts one by one.
+  # @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
-  def each
-    return to_enum(__method__) unless block_given?
+  def each(params = {})
+    return to_enum(__method__, params) unless block_given?
     term = Factbase::Syntax.new(@query).to_term
     yielded = 0
     @maps.each do |m|
       extras = {}
       f = Factbase::Fact.new(@mutex, m)
+      params = params.transform_keys(&:to_s) if params.is_a?(Hash)
+      f = Factbase::Tee.new(f, params)
       a = Factbase::Accum.new(f, extras, false)
       r = term.evaluate(a, @maps)
       unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
@@ -68,6 +72,19 @@ class Factbase::Query
     yielded
   end
 
+  # Read a single value.
+  # @param [Hash] params Optional params accessible in the query via the "$" symbol
+  # @return The value evaluated
+  def one(params = {})
+    term = Factbase::Syntax.new(@query).to_term
+    params = params.transform_keys(&:to_s) if params.is_a?(Hash)
+    r = term.evaluate(Factbase::Tee.new(nil, params), @maps)
+    unless %w[String Integer Float Time Array NilClass].include?(r.class.to_s)
+      raise "Incorrect type #{r.class} returned by #{@query}"
+    end
+    r
+  end
+
   # Delete all facts that match the query.
   # @return [Integer] Total number of facts deleted
   def delete!

data/lib/factbase/rules.rb

@@ -126,8 +126,12 @@ class Factbase::Rules
       @check = check
     end
 
-    def each
-      return to_enum(__method__) unless block_given?
+    def one(params = {})
+      @query.one(params)
+    end
+
+    def each(params = {})
+      return to_enum(__method__, params) unless block_given?
       @query.each do |f|
         yield Fact.new(f, @check)
       end

data/lib/factbase/tee.rb

@@ -41,8 +41,10 @@ class Factbase::Tee
   end
 
   def method_missing(*args)
-    return @upper[args[1].to_s[1..]] if args[0].to_s == '[]' && args[1].to_s.start_with?('$')
-    @fact.method_missing(*args)
+    return @fact.method_missing(*args) unless args[0].to_s == '[]' && args[1].to_s.start_with?('$')
+    n = args[1].to_s
+    n = n[1..] unless @upper.is_a?(Factbase::Tee)
+    @upper[n]
   end
 
   # rubocop:disable Style/OptionalBooleanParameter

data/lib/factbase/terms/aggregates.rb

@@ -81,10 +81,17 @@ module Factbase::Term::Aggregates
     raise "A term expected, but '#{selector}' provided" unless selector.is_a?(Factbase::Term)
     term = @operands[1]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    subset = maps.select { |m| selector.evaluate(Factbase::Tee.new(Factbase::Fact.new(Mutex.new, m), fact), maps) }
+    subset = Factbase::Query.new(maps, Mutex.new, selector.to_s).each(fact).to_a
     term.evaluate(nil, subset)
   end
 
+  def empty(fact, maps)
+    assert_args(1)
+    term = @operands[0]
+    raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
+    Factbase::Query.new(maps, Mutex.new, term.to_s).each(fact).to_a.empty?
+  end
+
   def best(maps)
     k = @operands[0]
     raise "A symbol expected, but #{k} provided" unless k.is_a?(Symbol)

data/lib/factbase/terms/aliases.rb

@@ -39,15 +39,19 @@ module Factbase::Term::Aliases
 
   def join(fact, maps)
     assert_args(2)
-    mask = @operands[0]
-    raise "A string expected as first argument of 'join'" unless mask.is_a?(String)
+    jumps = @operands[0]
+    raise "A string expected as first argument of 'join'" unless jumps.is_a?(String)
+    jumps = jumps.split(',')
+      .map(&:strip)
+      .map { |j| j.split('<=').map(&:strip) }
+      .map { |j| j.size == 1 ? [j[0], j[0]] : j }
     term = @operands[1]
     raise "A term expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
-    subset = maps.select { |m| term.evaluate(Factbase::Tee.new(Factbase::Fact.new(Mutex.new, m), fact), maps) }
-    subset.each do |m|
-      m.each do |k, vv|
-        vv.each do |v|
-          fact.send("#{mask.gsub('*', k)}=", v)
+    subset = Factbase::Query.new(maps, Mutex.new, term.to_s).each(fact).to_a
+    subset.each do |s|
+      jumps.each do |to, from|
+        s[from]&.each do |v|
+          fact.send("#{to}=", v)
         end
       end
     end

data/lib/factbase.rb

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

data/test/factbase/terms/test_aggregates.rb

@@ -31,12 +31,12 @@ require_relative '../../../lib/factbase/syntax'
 class TestAggregates < Minitest::Test
   def test_aggregation
     maps = [
-      { 'x' => 1, 'y' => 0, 'z' => 4 },
-      { 'x' => 2, 'y' => 42, 'z' => 3 },
-      { 'x' => 3, 'y' => 42, 'z' => 5 },
-      { 'x' => 4, 'y' => 42, 'z' => 2 },
-      { 'x' => 5, 'y' => 42, 'z' => 1 },
-      { 'x' => 8, 'y' => 0, 'z' => 6 }
+      { 'x' => [1], 'y' => [0], 'z' => [4] },
+      { 'x' => [2], 'y' => [42], 'z' => [3] },
+      { 'x' => [3], 'y' => [42], 'z' => [5] },
+      { 'x' => [4], 'y' => [42], 'z' => [2] },
+      { 'x' => [5], 'y' => [42], 'z' => [1] },
+      { 'x' => [8], 'y' => [0], 'z' => [6] }
     ]
     {
       '(eq x (agg (eq y 42) (min x)))' => '(eq x 2)',
@@ -54,6 +54,20 @@ class TestAggregates < Minitest::Test
     end
   end
 
+  def test_empty
+    maps = [
+      { 'x' => [1], 'y' => [0], 'z' => [4] },
+      { 'x' => [8], 'y' => [0] }
+    ]
+    {
+      '(empty (eq y 42))' => true,
+      '(empty (eq x 1))' => false
+    }.each do |q, r|
+      t = Factbase::Syntax.new(q).to_term
+      assert_equal(r, t.evaluate(nil, maps), q)
+    end
+  end
+
   private
 
   def fact(map = {})

data/test/factbase/terms/test_aliases.rb

@@ -51,19 +51,22 @@ class TestAliases < Minitest::Test
 
   def test_join
     maps = [
-      { 'x' => [1], 'y' => [0], 'z' => [4] },
+      { 'x' => 1, 'y' => 0, 'z' => 4 },
       { 'x' => [2], 'bar' => [44, 55, 66] }
     ]
     {
-      '(join "foo_*" (gt x 1))' => '(exists foo_x)',
-      '(join "foo_*" (exists bar))' => '(and (eq foo_bar 44) (eq foo_bar 55))',
-      '(join "foo_*" (eq fff 1))' => '(absent foo_bar)'
+      '(join "foo_x<=x" (gt x 1))' => '(exists foo_x)',
+      '(join "foo <=bar  " (exists bar))' => '(and (eq foo 44) (eq foo 55))',
+      '(join "uuu" (eq x 1))' => '(absent uuu)',
+      '(join "uuu <= fff" (eq fff 1))' => '(absent uuu)'
     }.each do |q, r|
       t = Factbase::Syntax.new(q).to_term
       maps.each do |m|
         f = Factbase::Accum.new(fact(m), {}, false)
+        require_relative '../../../lib/factbase/looged'
+        f = Factbase::Looged::Fact.new(f, Loog::NULL)
         next unless t.evaluate(f, maps)
-        assert(Factbase::Syntax.new(r).to_term.evaluate(f, []), "#{q} -> #{f}")
+        assert(Factbase::Syntax.new(r).to_term.evaluate(f, []), "#{q} -> #{f} doesn't match #{r}")
       end
     end
   end

data/test/factbase/test_looged.rb

@@ -45,6 +45,14 @@ class TestLooged < Minitest::Test
     assert_equal(2, fb.size)
   end
 
+  def test_reading_one
+    fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
+    fb.insert
+    fb.insert.bar = 42
+    assert_equal(1, fb.query('(agg (exists bar) (count))').one)
+    assert_equal([42], fb.query('(agg (exists bar) (first bar))').one)
+  end
+
   def test_with_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)

data/test/factbase/test_query.rb

@@ -110,6 +110,21 @@ class TestQuery < Minitest::Test
     assert_equal(1, maps.size)
   end
 
+  def test_reading_one
+    maps = []
+    maps << { 'foo' => [42] }
+    maps << { 'bar' => [4, 5] }
+    {
+      '(agg (exists foo) (first foo))' => [42],
+      '(agg (exists z) (first z))' => nil,
+      '(agg (always) (count))' => 2,
+      '(agg (eq bar $v) (count))' => 1,
+      '(agg (eq z 40) (count))' => 0
+    }.each do |q, r|
+      assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).one(v: 4), "#{q} -> #{r}")
+    end
+  end
+
   def test_deleting_nothing
     maps = []
     maps << { 'foo' => [42] }
@@ -140,6 +155,19 @@ class TestQuery < Minitest::Test
     assert_equal(1, maps[0].size)
   end
 
+  def test_with_params
+    maps = []
+    maps << { 'foo' => [42] }
+    maps << { 'foo' => [17] }
+    found = 0
+    Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: [42]) do
+      found += 1
+    end
+    assert_equal(1, found)
+    assert_equal(1, Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: 42).to_a.size)
+    assert_equal(0, Factbase::Query.new(maps, Mutex.new, '(eq foo $bar)').each(bar: 555).to_a.size)
+  end
+
   def test_with_nil_alias
     maps = []
     maps << { 'foo' => [42] }

data/test/factbase/test_rules.rb

@@ -53,6 +53,13 @@ class TestRules < Minitest::Test
     assert(f.to_s.length.positive?)
   end
 
+  def test_query_one
+    fb = Factbase::Rules.new(Factbase.new, '(always)')
+    f = fb.insert
+    f.foo = 42
+    assert_equal(1, fb.query('(agg (eq foo $v) (count))').one(v: 42))
+  end
+
   def test_check_only_when_txn_is_closed
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
     ok = false
@@ -94,6 +101,6 @@ class TestRules < Minitest::Test
       end
     end
     assert(ok)
-    assert_equal(0, fb.query('(eq hello 42)').each.to_a.size)
+    assert_equal(0, fb.query('(eq hello $v)').each(v: 42).to_a.size)
   end
 end

data/test/factbase/test_tee.rb

@@ -40,4 +40,14 @@ class TestTee < Minitest::Test
     assert_equal(42, t.foo)
     assert_equal([13], t['$bar'])
   end
+
+  def test_recursively
+    map = {}
+    prim = Factbase::Fact.new(Mutex.new, map)
+    prim.foo = 42
+    t = Factbase::Tee.new(nil, { 'bar' => 7 })
+    assert_equal(7, t['$bar'])
+    t = Factbase::Tee.new(prim, t)
+    assert_equal(7, t['$bar'])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace