factbase 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9aeae89fbcf5e3c1b74f475a8ad001867869d29eab8b861a26b07a2fee9db93
-  data.tar.gz: 0c20ed8b499cb495ca438621b30c24c9c837a73c8cffdde812ecacabc7b9a49c
+  metadata.gz: d4918d14dba9ff6a434de85e418f0f8249b4e3ea2e3bf7ae1c7cd1ed0836b20c
+  data.tar.gz: 2810d6061d951226e42b51f8d0f6afb27698ad16bdda448088a7dff7dd930937
 SHA512:
-  metadata.gz: 5f342a46704cdfa9f4355726fd7ca98f6a20d44090fd84c70e69189167abb97c378aca6f52fb295e736acbe4f501d61c65dd93ae833338327be8e81c9bb8f9a7
-  data.tar.gz: 0ec8785757ba4a370e0b1f50b3a7d50271e5245278b23d1b6a45618c90676517bf45763af7f5b150c606c22571992fcd15a95e771e661d2f62308add8e97d93a
+  metadata.gz: 975e9b4c4deda01bd2177c44adbf9049b784ffa76e17b3718f9a6103582eda766c5ae9df7eb92235acaa25823ed8a5bfa42cfd5245a11182132d977c2851ff65
+  data.tar.gz: 914915154434ed8265aad9c1cda22e8e6dbd14ba3f2248478f45579418aa4dcb90752550eab337c80936faba9e384dd09b44539a6ff74278b71d4298b2efc858

data/Gemfile.lock

@@ -14,9 +14,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -24,13 +24,13 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (8.0.1)
-      activesupport (= 8.0.1)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -66,7 +66,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.10.1)
+    json (2.10.2)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.6.6)
@@ -100,7 +100,7 @@ GEM
       date
       stringio
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -115,9 +115,9 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)

data/README.md

@@ -209,33 +209,33 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user     system      total        real
-insert 20000 facts                                             0.561512   0.006100   0.567612 (  0.567669)
-export 20000 facts                                             0.021207   0.001926   0.023133 (  0.023136)
-import 411017 bytes (20000 facts)                              0.030268   0.004025   0.034293 (  0.034298)
-insert 10 facts                                                0.041799   0.003981   0.045780 (  0.045783)
-query 10 times w/txn                                           1.949384   0.022040   1.971424 (  1.971572)
-query 10 times w/o txn                                         0.766215   0.000000   0.766215 (  0.766298)
-modify 10 attrs w/txn                                          1.831320   0.019013   1.850333 (  1.850663)
-delete 10 facts w/txn                                          0.720217   0.000982   0.721199 (  0.721265)
-(and (eq what 'issue-was-closed') (exists... -> 200            2.699199   0.003986   2.703185 (  2.703395)
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        2.711764   0.003998   2.715762 (  2.716000)
-(and (eq what 'issue-was-closed') (exists... -> zero           4.091858   0.003001   4.094859 (  4.095101)
-(and (eq what 'issue-was-closed') (exists... -> zero/txn       4.156396   0.003004   4.159400 (  4.159589)
-(gt time '2024-03-23T03:21:43Z')                               0.104266   0.001002   0.105268 (  0.105284)
-(gt cost 50)                                                   0.090716   0.000000   0.090716 (  0.090721)
-(eq title 'Object Thinking 5000')                              0.005533   0.000002   0.005535 (  0.005536)
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.053251   0.000002   0.053253 (  0.053255)
-(eq id (agg (always) (max id)))                                0.300388   0.000000   0.300388 (  0.300414)
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        1.254507   0.002999   1.257506 (  1.257555)
-delete!                                                        0.051979   0.000000   0.051979 (  0.051982)
-Taped.append() x50000                                          0.028540   0.000000   0.028540 (  0.028543)
-Taped.each() x125                                              1.332618   0.000000   1.332618 (  1.332645)
-Taped.delete_if() x375                                         0.815309   0.000000   0.815309 (  0.815348)
+insert 20000 facts                                             0.625135   0.006294   0.631429 (  0.631443)
+export 20000 facts                                             0.023877   0.000991   0.024868 (  0.024873)
+import 411050 bytes (20000 facts)                              0.034864   0.004984   0.039848 (  0.039853)
+insert 10 facts                                                0.045526   0.002959   0.048485 (  0.048490)
+query 10 times w/txn                                           2.221776   0.028103   2.249879 (  2.249996)
+query 10 times w/o txn                                         0.842098   0.002019   0.844117 (  0.844159)
+modify 10 attrs w/txn                                          2.056211   0.014021   2.070232 (  2.070541)
+delete 10 facts w/txn                                          0.770236   0.003988   0.774224 (  0.774272)
+(and (eq what 'issue-was-closed') (exists... -> 200            2.805609   0.003005   2.808614 (  2.808765)
+(and (eq what 'issue-was-closed') (exists... -> 200/txn        2.812425   0.002000   2.814425 (  2.814779)
+(and (eq what 'issue-was-closed') (exists... -> zero           4.288405   0.000001   4.288406 (  4.288758)
+(and (eq what 'issue-was-closed') (exists... -> zero/txn       4.320962   0.008005   4.328967 (  4.329469)
+(gt time '2024-03-23T03:21:43Z')                               0.116707   0.001996   0.118703 (  0.118716)
+(gt cost 50)                                                   0.093508   0.000004   0.093512 (  0.093517)
+(eq title 'Object Thinking 5000')                              0.006989   0.000000   0.006989 (  0.006990)
+(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.060383   0.000002   0.060385 (  0.060385)
+(eq id (agg (always) (max id)))                                0.357125   0.000994   0.358119 (  0.358130)
+(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        1.350979   0.000001   1.350980 (  1.351072)
+delete!                                                        0.054491   0.000004   0.054495 (  0.054497)
+Taped.append() x50000                                          0.048166   0.001997   0.050163 (  0.050167)
+Taped.each() x125                                              1.347655   0.002002   1.349657 (  1.349747)
+Taped.delete_if() x375                                         0.846874   0.000003   0.846877 (  0.846926)
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-03-12 at 08:03,
+on 2025-03-12 at 13:25,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13806425302
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13812482648

data/lib/factbase/inv.rb

@@ -8,6 +8,17 @@ require 'decoor'
 require_relative '../factbase'
 
 # A decorator of a Factbase, that checks invariants on every set.
+#
+# For example, you can use this decorator if you want to check that every
+# fact has +when+:
+#
+#  fb = Factbase::Inv.new(Factbase.new) do |f, fbt|
+#    assert !f['when'].nil?
+#  end
+#
+# The second argument passed to the block is the factbase, while the first
+# one is the fact just touched.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
@@ -23,8 +34,8 @@ class Factbase::Inv
     Fact.new(@fb.insert, @block)
   end
 
-  def query(query)
-    Query.new(@fb.query(query), @block)
+  def query(query, maps = nil)
+    Query.new(@fb.query(query, maps), @block, self)
   end
 
   def txn
@@ -65,14 +76,15 @@ class Factbase::Inv
   class Query
     decoor(:query)
 
-    def initialize(query, block)
+    def initialize(query, block, fb)
       @query = query
       @block = block
+      @fb = fb
     end
 
-    def each
-      return to_enum(__method__) unless block_given?
-      @query.each do |f|
+    def each(fb = @fb, params = {})
+      return to_enum(__method__, fb, params) unless block_given?
+      @query.each(fb, params) do |f|
         yield Fact.new(f, @block)
       end
     end

data/lib/factbase/logged.rb

@@ -22,7 +22,7 @@ class Factbase::Logged
   # @param [Print] tube The tube to use, if log is NIL
   def initialize(fb, log = nil, time_tolerate: 1, tube: nil)
     raise 'The "fb" is nil' if fb.nil?
-    @fb = fb
+    @origin = fb
     if log.nil?
       raise 'Either "log" or "tube" must be non-NIL' if tube.nil?
       @tube = tube
@@ -31,17 +31,18 @@ class Factbase::Logged
     end
   end
 
-  decoor(:fb)
+  decoor(:origin)
 
   def insert
     start = Time.now
-    f = @fb.insert
-    @tube.say(start, "Inserted new fact ##{@fb.size} in #{start.ago}")
+    f = @origin.insert
+    @tube.say(start, "Inserted new fact ##{@origin.size} in #{start.ago}")
     Fact.new(f, tube: @tube)
   end
 
-  def query(query)
-    Query.new(query, @tube, @fb)
+  def query(term, maps = nil)
+    term = to_term(term) if term.is_a?(String)
+    Query.new(term, maps, @tube, @origin)
   end
 
   def txn
@@ -49,7 +50,7 @@ class Factbase::Logged
     id = nil
     rollback = false
     r =
-      @fb.txn do |fbt|
+      @origin.txn do |fbt|
         id = fbt.object_id
         yield Factbase::Logged.new(fbt, tube: @tube)
       rescue Factbase::Rollback => e
@@ -122,40 +123,25 @@ class Factbase::Logged
   # Query decorator.
   #
   # This is an internal class, it is not supposed to be instantiated directly.
-  #
   class Query
-    def initialize(expr, tube, fb)
-      @expr = expr
+    def initialize(term, maps, tube, fb)
+      @term = term
+      @maps = maps
       @tube = tube
       @fb = fb
     end
 
-    def one(fb = @fb, params = {})
-      start = Time.now
-      q = Factbase::Syntax.new(@expr).to_term.to_s
-      r = nil
-      tail =
-        Factbase::Logged.elapsed do
-          r = fb.query(@expr).one(fb, params)
-        end
-      if r.nil?
-        @tube.say(start, "Nothing found by '#{q}' #{tail}")
-      else
-        @tube.say(start, "Found #{r} (#{r.class}) by '#{q}' #{tail}")
-      end
-      r
-    end
-
-    def each(fb = @fb, params = {}, &)
+    def each(fb = nil, params = {}, &)
+      return to_enum(__method__, fb, params) unless block_given?
       start = Time.now
-      q = Factbase::Syntax.new(@expr).to_term.to_s
+      q = Factbase::Syntax.new(@term).to_term.to_s
       if block_given?
         r = nil
         tail =
           Factbase::Logged.elapsed do
-            r = fb.query(@expr).each(fb, params, &)
+            r = @fb.query(@term, @maps).each(@fb, params, &)
           end
-        raise ".each of #{@expr.class} returned #{r.class}" unless r.is_a?(Integer)
+        raise ".each of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
           @tube.say(start, "Nothing found by '#{q}' #{tail}")
         else
@@ -166,7 +152,7 @@ class Factbase::Logged
         array = []
         tail =
           Factbase::Logged.elapsed do
-            fb.query(@expr).each(fb, params) do |f|
+            @fb.query(@term, @maps).each(@fb, params) do |f|
               array << f
             end
           end
@@ -179,21 +165,37 @@ class Factbase::Logged
       end
     end
 
-    def delete!(fb = @fb)
+    def one(_fb = nil, params = {})
+      start = Time.now
+      q = Factbase::Syntax.new(@term).to_term.to_s
+      r = nil
+      tail =
+        Factbase::Logged.elapsed do
+          r = @fb.query(@term, @maps).one(@fb, params)
+        end
+      if r.nil?
+        @tube.say(start, "Nothing found by '#{q}' #{tail}")
+      else
+        @tube.say(start, "Found #{r} (#{r.class}) by '#{q}' #{tail}")
+      end
+      r
+    end
+
+    def delete!(_fb = nil)
       r = nil
       start = Time.now
-      before = fb.size
+      before = @fb.size
       tail =
         Factbase::Logged.elapsed do
-          r = @fb.query(@expr).delete!(fb)
+          r = @fb.query(@term).delete!(@fb)
         end
-      raise ".delete! of #{@expr.class} returned #{r.class}" unless r.is_a?(Integer)
+      raise ".delete! of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
       if before.zero?
-        @tube.say(start, "There were no facts, nothing deleted by '#{@expr}' #{tail}")
+        @tube.say(start, "There were no facts, nothing deleted by '#{@term}' #{tail}")
       elsif r.zero?
-        @tube.say(start, "No facts out of #{before} deleted by '#{@expr}' #{tail}")
+        @tube.say(start, "No facts out of #{before} deleted by '#{@term}' #{tail}")
       else
-        @tube.say(start, "Deleted #{r} fact(s) out of #{before} by '#{@expr}' #{tail}")
+        @tube.say(start, "Deleted #{r} fact(s) out of #{before} by '#{@term}' #{tail}")
       end
       r
     end

data/lib/factbase/rules.rb

@@ -40,8 +40,8 @@ class Factbase::Rules
     Fact.new(@fb.insert, @check, @fb)
   end
 
-  def query(query)
-    Query.new(@fb.query(query), @check, @fb)
+  def query(query, maps = nil)
+    Query.new(@fb.query(query, maps), @check, @fb)
   end
 
   def txn

data/lib/factbase/tallied.rb

@@ -31,8 +31,8 @@ class Factbase::Tallied
     f
   end
 
-  def query(query)
-    Query.new(@fb.query(query), @churn, @fb)
+  def query(query, maps = nil)
+    Query.new(@fb.query(query, maps), @churn, @fb)
   end
 
   def txn

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.0'
+  VERSION = '0.9.1'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/test_query.rb

@@ -4,9 +4,15 @@
 # SPDX-License-Identifier: MIT
 
 require_relative '../test__helper'
+require 'loog'
 require 'time'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/query'
+require_relative '../../lib/factbase/logged'
+require_relative '../../lib/factbase/pre'
+require_relative '../../lib/factbase/inv'
+require_relative '../../lib/factbase/rules'
+require_relative '../../lib/factbase/tallied'
 require_relative '../../lib/factbase/cached/cached_factbase'
 require_relative '../../lib/factbase/indexed/indexed_factbase'
 require_relative '../../lib/factbase/sync/sync_factbase'
@@ -227,9 +233,14 @@ class TestQuery < Factbase::Test
   def with_factbases(maps = [], &)
     {
       'plain' => Factbase.new(maps),
+      'pre+plain' => Factbase::Pre.new(Factbase.new(maps)) { nil },
+      'rules+plain' => Factbase::Rules.new(Factbase.new(maps), '(always)'),
+      'inv+plain' => Factbase::Inv.new(Factbase.new(maps)) { nil },
       'sync+plain' => Factbase::SyncFactbase.new(Factbase.new(maps)),
+      'tallied+plain' => Factbase::Tallied.new(Factbase.new(maps)),
       'indexed+plain' => Factbase::IndexedFactbase.new(Factbase.new(maps)),
       'cached+plain' => Factbase::CachedFactbase.new(Factbase.new(maps)),
+      'logged+plain' => Factbase::Logged.new(Factbase.new(maps), Loog::NULL),
       'indexed+cached+plain' => Factbase::IndexedFactbase.new(Factbase::CachedFactbase.new(Factbase.new(maps))),
       'cached+indexed+plain' => Factbase::CachedFactbase.new(Factbase::IndexedFactbase.new(Factbase.new(maps))),
       'sync+cached+indexed+plain' => Factbase::SyncFactbase.new(

metadata

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