RubyGems - factbase - Versions diffs - 0.9.5 → 0.9.7 - Mend

factbase 0.9.5 → 0.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

checksums.yaml +4 -4
data/.rubocop.yml +4 -2
data/.rultor.yml +1 -0
data/Gemfile +9 -9
data/Gemfile.lock +31 -127
data/README.md +25 -24
data/Rakefile +7 -14
data/factbase.gemspec +6 -5
data/lib/factbase/cached/cached_query.rb +4 -1
data/lib/factbase/fact.rb +0 -5
data/lib/factbase/indexed/indexed_query.rb +3 -1
data/lib/factbase/indexed/indexed_term.rb +71 -10
data/lib/factbase/logged.rb +20 -31
data/lib/factbase/query.rb +1 -1
data/lib/factbase/rules.rb +1 -1
data/lib/factbase/taped.rb +4 -1
data/lib/factbase/term.rb +1 -0
data/lib/factbase.rb +1 -1
data/test/factbase/cached/test_cached_query.rb +21 -0
data/test/factbase/indexed/test_indexed_term.rb +10 -2
data/test/factbase/test_logged.rb +19 -0
data/test/factbase/test_query.rb +81 -6
data/test/factbase/test_taped.rb +12 -0
data/test/factbase/test_term.rb +2 -0
metadata +36 -22

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05496abcbec07a37de19ac7f1218943d1d50d1f0b3611ab48e6b8489675d274c'
-  data.tar.gz: b8f33d58069745e5405d6f1714c80f6fb3badc437333ce1fe685af5fb245bc42
+  metadata.gz: e7d1b649fb808d571609f3231f90dbd57ba57683993d52ee2eaddd674e2aeb65
+  data.tar.gz: 717ea095ae2e1092d71509b39f1581cfc4b65d47ca9f39cb704d694eabbd91d9
 SHA512:
-  metadata.gz: 1475969fc18741368eff7ababc1ff5764f36244f3e11276d21a5d4f03f9d5c3ce444cf9ecd0482be3e9f3a3b3fadbc11cba5a711244dd26b39fc4be60a6915f9
-  data.tar.gz: 2e30a6d6cc39ada5038f98d8b6112250e527b756a0f9d5f5a8aebecd661d8de8e022d4d5659065ec0273035fbe740f5ea655b3f82e701993084a6755c96700f4
+  metadata.gz: 9f6955bdf61ad153a2cf956935310fbd1d59782a34e479ae94e48c70ab8a1002dfdf61f2384e968bbdedb0be58d19ea556841d7b7300aa110927f78f1fdabaf9
+  data.tar.gz: 2364a4421fcf35c42b6e316e33f11afaf4abc69b33502b475fa08fc28e2e45b8dbe138cf72d26b8938212d2807dfd8c3b50aa40b166e481e15f363d2cf5629c8

data/.rubocop.yml CHANGED Viewed

@@ -20,6 +20,8 @@ Gemspec/RequiredRubyVersion:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Layout/MultilineMethodCallIndentation:
@@ -29,9 +31,9 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 50
 Metrics/CyclomaticComplexity:
-  Max: 40
+  Max: 100
 Metrics/PerceivedComplexity:
-  Max: 50
+  Max: 100
 Metrics/ClassLength:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:

data/.rultor.yml CHANGED Viewed

@@ -12,6 +12,7 @@ install: |
 release:
   pre: false
   script: |-
+    set -x
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     bundle exec rake
     rm -rf *.gem

data/Gemfile CHANGED Viewed

@@ -6,18 +6,18 @@
 source 'https://rubygems.org'
 gemspec
-gem 'minitest', '5.25.5', require: false
-gem 'minitest-reporters', '1.7.1', require: false
+gem 'minitest', '~>5.25', require: false
+gem 'minitest-reporters', '~>1.7', require: false
 gem 'os', '>0', require: false
 gem 'qbash', '>0', require: false
-gem 'rake', '13.2.1', require: false
-gem 'rspec-rails', '7.1.1', require: false
-gem 'rubocop', '1.74.0', require: false
+gem 'rake', '~>13.2', require: false
+gem 'rdoc', '~>6.13', require: false
+gem 'rubocop', '~>1.74', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false
 gem 'rubocop-rake', '>0', require: false
 gem 'rubocop-rspec', '>0', require: false
-gem 'simplecov', '0.22.0', require: false
-gem 'simplecov-cobertura', '2.1.0', require: false
-gem 'threads', '0.4.1', require: false
-gem 'yard', '0.9.37', require: false
+gem 'simplecov', '~>0.22', require: false
+gem 'simplecov-cobertura', '~>2.1', require: false
+gem 'threads', '~>0.4', require: false
+gem 'yard', '~>0.9', require: false

data/Gemfile.lock CHANGED Viewed

@@ -2,80 +2,34 @@ PATH
   remote: .
   specs:
     factbase (0.0.0)
-      backtrace (>= 0.4.0)
-      decoor (>= 0.0.1)
+      backtrace (~> 0.4)
+      decoor (~> 0.0)
       json (~> 2.7)
-      loog (>= 0.6.0)
+      logger (~> 1.0)
+      loog (~> 0.6)
       nokogiri (~> 1.10)
-      others (>= 0.0.3)
-      tago (>= 0.0.2)
+      others (~> 0.0)
+      tago (~> 0.0)
       yaml (~> 0.3)
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    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.2)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
     ansi (1.5.0)
-    ast (2.4.2)
+    ast (2.4.3)
     backtrace (0.4.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
     builder (3.3.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    crass (1.0.6)
     date (3.4.1)
     decoor (0.0.1)
-    diff-lcs (1.6.0)
     docile (1.4.1)
-    drb (2.2.1)
     elapsed (0.0.1)
       loog (> 0)
       tago (> 0)
-    erubi (1.13.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.1)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
     json (2.10.2)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
-    logger (1.6.6)
-    loofah (2.24.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
+    logger (1.7.0)
     loog (0.6.0)
     minitest (5.25.5)
     minitest-reporters (1.7.1)
@@ -83,23 +37,21 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.18.4-arm64-darwin)
+    nokogiri (1.18.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.4-x64-mingw-ucrt)
+    nokogiri (1.18.6-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-darwin)
+    nokogiri (1.18.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-linux-gnu)
+    nokogiri (1.18.6-x86_64-linux-gnu)
       racc (~> 1.4)
     os (1.1.4)
     others (0.0.3)
     parallel (1.26.3)
-    parser (3.3.7.1)
+    parser (3.3.7.3)
       ast (~> 2.4.1)
       racc
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
+    prism (1.4.0)
     psych (5.2.3)
       date
       stringio
@@ -109,55 +61,13 @@ GEM
       loog (> 0)
       tago (> 0)
     racc (1.8.1)
-    rack (3.1.12)
-    rack-session (2.1.0)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    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.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.12.0)
+    rdoc (6.13.1)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
-    reline (0.6.0)
-      io-console (~> 0.5)
     rexml (3.4.1)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
-    rspec-support (3.13.2)
-    rubocop (1.74.0)
+    rubocop (1.75.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -165,11 +75,12 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.43.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.39.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-minitest (0.37.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1, < 2.0)
@@ -185,7 +96,6 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -195,22 +105,16 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    stringio (3.1.5)
-    tago (0.0.2)
-    thor (1.3.2)
+    stringio (3.1.6)
+    tago (0.1.0)
     threads (0.4.1)
       backtrace (~> 0)
       concurrent-ruby (~> 1.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.3)
-    useragent (0.16.11)
     yaml (0.4.0)
     yard (0.9.37)
-    zeitwerk (2.7.2)
 PLATFORMS
   arm64-darwin-22
@@ -223,21 +127,21 @@ PLATFORMS
 DEPENDENCIES
   factbase!
-  minitest (= 5.25.5)
-  minitest-reporters (= 1.7.1)
+  minitest (~> 5.25)
+  minitest-reporters (~> 1.7)
   os (> 0)
   qbash (> 0)
-  rake (= 13.2.1)
-  rspec-rails (= 7.1.1)
-  rubocop (= 1.74.0)
+  rake (~> 13.2)
+  rdoc (~> 6.13)
+  rubocop (~> 1.74)
   rubocop-minitest (> 0)
   rubocop-performance (> 0)
   rubocop-rake (> 0)
   rubocop-rspec (> 0)
-  simplecov (= 0.22.0)
-  simplecov-cobertura (= 2.1.0)
-  threads (= 0.4.1)
-  yard (= 0.9.37)
+  simplecov (~> 0.22)
+  simplecov-cobertura (~> 2.1)
+  threads (~> 0.4)
+  yard (~> 0.9)
 BUNDLED WITH
    2.5.16

data/README.md CHANGED Viewed

@@ -10,6 +10,7 @@
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/yegor256/factbase/master/frames)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/factbase)](https://hitsofcode.com/view/github/yegor256/factbase)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/factbase/blob/master/LICENSE.txt)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fyegor256%2Ffactbase.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fyegor256%2Ffactbase?ref=badge_shield&issueType=license)
 This Ruby gem manages an in-memory database of facts.
 A fact is simply a map of properties and values.
@@ -209,33 +210,33 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user     system      total        real
-insert 20000 facts                                             0.571788   0.003758   0.575546 (  0.575570)
-export 20000 facts                                             0.020920   0.002996   0.023916 (  0.023920)
-import 410695 bytes (20000 facts)                              0.027100   0.007016   0.034116 (  0.034121)
-insert 10 facts                                                0.041616   0.004054   0.045670 (  0.045682)
-query 10 times w/txn                                           1.631523   0.024886   1.656409 (  1.656459)
-query 10 times w/o txn                                         0.108811   0.000990   0.109801 (  0.109804)
-modify 10 attrs w/txn                                          1.207344   0.019000   1.226344 (  1.226358)
-delete 10 facts w/txn                                          0.734874   0.001988   0.736862 (  0.736890)
-(and (eq what 'issue-was-closed') (exists... -> 200            5.046822   0.008973   5.055795 (  5.056175)
-(and (eq what 'issue-was-closed') (exists... -> 200/txn        5.006788   0.009980   5.016768 (  5.017401)
-(and (eq what 'issue-was-closed') (exists... -> zero           7.793528   0.003992   7.797520 (  7.797774)
-(and (eq what 'issue-was-closed') (exists... -> zero/txn       7.741986   0.001995   7.743981 (  7.744395)
-(gt time '2024-03-23T03:21:43Z')                               0.084850   0.000000   0.084850 (  0.084850)
-(gt cost 50)                                                   0.084610   0.001002   0.085612 (  0.085614)
-(eq title 'Object Thinking 5000')                              0.002526   0.000000   0.002526 (  0.002526)
-(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.163174   0.000000   0.163174 (  0.163207)
-(eq id (agg (always) (max id)))                                0.247507   0.001001   0.248508 (  0.248508)
-(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.622045   0.004995   0.627040 (  0.627095)
-delete!                                                        0.061154   0.000001   0.061155 (  0.061156)
-Taped.append() x50000                                          0.023736   0.003999   0.027735 (  0.027739)
-Taped.each() x125                                              1.350286   0.000002   1.350288 (  1.350416)
-Taped.delete_if() x375                                         0.803790   0.000000   0.803790 (  0.803852)
+insert 20000 facts                                             0.597725   0.004012   0.601737 (  0.601785)
+export 20000 facts                                             0.020481   0.003039   0.023520 (  0.023523)
+import 410961 bytes (20000 facts)                              0.021204   0.002017   0.023221 (  0.023223)
+insert 10 facts                                                0.042456   0.002961   0.045417 (  0.045418)
+query 10 times w/txn                                           1.594704   0.026991   1.621695 (  1.621807)
+query 10 times w/o txn                                         0.057308   0.000013   0.057321 (  0.057322)
+modify 10 attrs w/txn                                          1.225101   0.013972   1.239073 (  1.239349)
+delete 10 facts w/txn                                          0.735944   0.001018   0.736962 (  0.737102)
+(and (eq what 'issue-was-closed') (exists... -> 200            2.068974   0.008005   2.076979 (  2.077134)
+(and (eq what 'issue-was-closed') (exists... -> 200/txn        1.094799   0.000000   1.094799 (  1.094849)
+(and (eq what 'issue-was-closed') (exists... -> zero           2.384214   0.001004   2.385218 (  2.385610)
+(and (eq what 'issue-was-closed') (exists... -> zero/txn       1.255267   0.001916   1.257183 (  1.257310)
+(gt time '2024-03-23T03:21:43Z')                               0.110972   0.002000   0.112972 (  0.112986)
+(gt cost 50)                                                   0.087402   0.000000   0.087402 (  0.087411)
+(eq title 'Object Thinking 5000')                              0.002488   0.000000   0.002488 (  0.002488)
+(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))           0.022121   0.000001   0.022122 (  0.022123)
+(eq id (agg (always) (max id)))                                0.237595   0.000000   0.237595 (  0.237605)
+(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))        0.635953   0.003996   0.639949 (  0.640016)
+delete!                                                        0.060744   0.000997   0.061741 (  0.061741)
+Taped.append() x50000                                          0.037044   0.002000   0.039044 (  0.039048)
+Taped.each() x125                                              1.259629   0.002997   1.262626 (  1.262661)
+Taped.delete_if() x375                                         0.810420   0.000005   0.810425 (  0.810483)
 ```
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-03-18 at 12:45,
+on 2025-03-30 at 05:03,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/13923519605
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/14152813171

data/Rakefile CHANGED Viewed

@@ -3,12 +3,12 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
+require 'os'
 require 'qbash'
-require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'rubygems'
 require 'shellwords'
-require 'os'
 def name
   @name ||= File.basename(Dir['*.gemspec'].first, '.*')
@@ -18,7 +18,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
-task default: %i[clean test picks reqs rubocop yard]
+task default: %i[clean test picks rubocop yard]
 require 'rake/testtask'
 desc 'Run all unit tests'
@@ -33,16 +33,10 @@ end
 desc 'Run them via Ruby, one by one'
 task :picks do
   next if OS.windows?
-  Dir['test/**/*.rb'].each do |f|
-    qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
-  end
-end
-desc 'Require them via Ruby, one by one'
-task :reqs do
-  next if OS.windows?
-  Dir['lib/**/*.rb'].each do |f|
-    qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
+  %w[test lib].each do |d|
+    Dir["#{d}/**/*.rb"].each do |f|
+      qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
+    end
   end
 end
@@ -56,7 +50,6 @@ require 'rubocop/rake_task'
 desc 'Run RuboCop on all directories'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = true
-  task.requires << 'rubocop-rspec'
 end
 desc 'Benchmark them all'

data/factbase.gemspec CHANGED Viewed

@@ -25,13 +25,14 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace', '>=0.4.0'
-  s.add_dependency 'decoor', '>=0.0.1'
+  s.add_dependency 'backtrace', '~>0.4'
+  s.add_dependency 'decoor', '~>0.0'
   s.add_dependency 'json', '~>2.7'
-  s.add_dependency 'loog', '>=0.6.0'
+  s.add_dependency 'logger', '~>1.0'
+  s.add_dependency 'loog', '~>0.6'
   s.add_dependency 'nokogiri', '~>1.10'
-  s.add_dependency 'others', '>=0.0.3'
-  s.add_dependency 'tago', '>=0.0.2'
+  s.add_dependency 'others', '~>0.0'
+  s.add_dependency 'tago', '~>0.0'
   s.add_dependency 'yaml', '~>0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/cached/cached_query.rb CHANGED Viewed

@@ -36,14 +36,17 @@ 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.
   # @param [Hash] fb The factbase
-  # @param [Hash] _params Optional params accessible in the query via the "$" symbol (unused)
+  # @param [Hash] params Optional params accessible in the query via the "$" symbol (unused)
   # @return The value evaluated
   def one(fb = @fb, params = {})
     key = "one: #{@origin} #{params}"

data/lib/factbase/fact.rb CHANGED Viewed

@@ -46,11 +46,6 @@ class Factbase::Fact
     @map.keys
   end
-  # When a method is missing, this method is called.
-  # Method missing handler for dynamic property access and setting
-  # @param [Symbol] method The method name being called
-  # @param [Array] args Method arguments
-  # @return [Object] The value retrieved or nil if setting a value
   others do |*args|
     k = args[0].to_s
     if k.end_with?('=')

data/lib/factbase/indexed/indexed_query.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -68,18 +68,45 @@ module Factbase::IndexedTerm
       end
     when :and
       r = nil
-      @operands.each do |o|
-        n = o.predict(maps, params)
-        if n.nil?
-          r = nil
-          break
+      if @operands.all? { |o| o.op == :eq } && @operands.size > 1 \
+        && @operands.all? { |o| o.operands.first.is_a?(Symbol) && _scalar?(o.operands[1]) }
+        key = [maps.object_id, @operands.map { |o| o.operands.first }, :multi_eq]
+        props = @operands.map { |o| o.operands.first }.sort
+        if @idx[key].nil?
+          @idx[key] = {}
+          maps.to_a.each do |m|
+            _all_tuples(m, props).each do |t|
+              @idx[key][t] = [] if @idx[key][t].nil?
+              @idx[key][t].append(m)
+            end
+          end
         end
-        if r.nil?
-          r = n
-        else
-          r &= n.to_a
+        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] || []
+            else
+              [o.operands[1]]
+            end
+          end
+        )
+        j = tuples.map { |t| @idx[key][t] || [] }.reduce(&:|)
+        r = (maps & []) | j
+      else
+        @operands.each do |o|
+          n = o.predict(maps, params)
+          if n.nil?
+            r = nil
+            break
+          end
+          if r.nil?
+            r = n
+          else
+            r &= n.to_a
+          end
+          break if r.empty?
         end
-        break if r.empty?
       end
       r
     when :or
@@ -106,6 +133,40 @@ module Factbase::IndexedTerm
   private
+  # The input looks like this: [[6, 55], [3], [4, 3, 5]].
+  # The outputh should contain all possible combinations: [[6, 3, 4], [6, 3, 3], [55, 3, 5], ...]
+  def _as_tuples(values)
+    tuples = [values.first]
+    if values.size > 1
+      tails = _as_tuples(values[1..])
+      ext = []
+      tuples.each do |t|
+        tails.each do |tail|
+          ext << (t + tail)
+        end
+      end
+      tuples = ext
+    end
+    tuples
+  end
+  def _all_tuples(fact, props)
+    prop = props.first.to_s
+    tuples = []
+    tuples += (fact[prop] || []).zip
+    if props.size > 1
+      tails = _all_tuples(fact, props[1..])
+      ext = []
+      tuples.each do |t|
+        tails.each do |tail|
+          ext << (t + tail)
+        end
+      end
+      tuples = ext
+    end
+    tuples
+  end
   def _scalar?(item)
     item.is_a?(String) || item.is_a?(Time) || item.is_a?(Integer) || item.is_a?(Float) || item.is_a?(Symbol)
   end

data/lib/factbase/logged.rb CHANGED Viewed

@@ -131,47 +131,36 @@ class Factbase::Logged
       @fb = fb
     end
-    def each(fb = nil, params = {}, &)
+    def to_s
+      @term.to_s
+    end
+    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
-      if block_given?
-        r = nil
-        tail =
-          Factbase::Logged.elapsed do
-            r = @fb.query(@term, @maps).each(@fb, params, &)
-          end
-        raise ".each of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
-        if r.zero?
-          @tube.say(start, "Zero/#{@fb.size} facts found by '#{q}' #{tail}")
-        else
-          @tube.say(start, "Found #{r}/#{@fb.size} fact(s) by '#{q}' #{tail}")
+      r = nil
+      qry = @fb.query(@term, @maps)
+      tail =
+        Factbase::Logged.elapsed do
+          r = qry.each(fb, params, &)
         end
-        r
+      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
-        array = []
-        tail =
-          Factbase::Logged.elapsed do
-            @fb.query(@term, @maps).each(@fb, params) do |f|
-              array << f
-            end
-          end
-        if array.empty?
-          @tube.say(start, "Zero/#{@fb.size} found by '#{q}' #{tail}")
-        else
-          @tube.say(start, "Found #{array.size}/#{@fb.size} fact(s) by '#{q}' #{tail}")
-        end
-        array
+        @tube.say(start, "Found #{r}/#{@fb.size} fact(s) by '#{q}' #{tail}")
       end
+      r
     end
-    def one(_fb = nil, params = {})
+    def one(fb = @fb, 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)
+          r = @fb.query(@term, @maps).one(fb, params)
         end
       if r.nil?
         @tube.say(start, "Nothing found by '#{q}' #{tail}")
@@ -181,13 +170,13 @@ class Factbase::Logged
       r
     end
-    def delete!(_fb = nil)
+    def delete!(fb = @fb)
       r = nil
       start = Time.now
       before = @fb.size
       tail =
         Factbase::Logged.elapsed do
-          r = @fb.query(@term).delete!(@fb)
+          r = @fb.query(@term, @maps).delete!(fb)
         end
       raise ".delete! of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
       if before.zero?

data/lib/factbase/query.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -41,7 +41,7 @@ class Factbase::Rules
   end
   def query(query, maps = nil)
-    Query.new(@fb.query(query, maps), @check, @fb)
+    Query.new(@fb.query(query, maps), @check, self)
   end
   def txn

data/lib/factbase/taped.rb CHANGED Viewed

@@ -68,12 +68,15 @@ class Factbase::Taped
   end
   def &(other)
-    return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added) if other == []
+    if other == [] || @origin.empty?
+      return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added)
+    end
     join(other, &:&)
   end
   def |(other)
     return Factbase::Taped.new(to_a, inserted: @inserted, deleted: @deleted, added: @added) if other == []
+    return Factbase::Taped.new(other, inserted: @inserted, deleted: @deleted, added: @added) if @origin.empty?
     join(other, &:|)
   end

data/lib/factbase/term.rb CHANGED Viewed

@@ -104,6 +104,7 @@ class Factbase::Term
   # should be evaluated. If no prediction can be made,
   # the same list is returned.
   # @param [Array<Hash>] maps Records to iterate, maybe
+  # @param [Hash] _params Params to use (keys must be strings, not symbols, with values as arrays)
   # @return [Array<Hash>] Records to iterate
   def predict(maps, _params)
     maps

data/lib/factbase.rb CHANGED Viewed

@@ -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.5' unless const_defined?(:VERSION)
+  VERSION = '0.9.7' unless const_defined?(:VERSION)
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/cached/test_cached_query.rb CHANGED Viewed

@@ -3,8 +3,10 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
+require 'loog'
 require_relative '../../test__helper'
 require_relative '../../../lib/factbase'
+require_relative '../../../lib/factbase/logged'
 require_relative '../../../lib/factbase/cached/cached_factbase'
 require_relative '../../../lib/factbase/indexed/indexed_factbase'
 require_relative '../../../lib/factbase/sync/sync_factbase'
@@ -58,6 +60,25 @@ class TestCachedQuery < Factbase::Test
     end
   end
+  def test_works_with_logging
+    fb = Factbase::CachedFactbase.new(Factbase::Logged.new(Factbase.new, Loog::NULL))
+    total = 10
+    total.times do |i|
+      f = fb.insert
+      f.foo = i
+      f.hello = 1
+    end
+    3.times do
+      [
+        '(exists foo)',
+        '(and (gt foo -99) (exists hello))',
+        '(and (lt hello 1000.44) (exists foo) (not (exists bar)))'
+      ].each do |q|
+        assert_equal(total, fb.query(q).each.to_a.size)
+      end
+    end
+  end
   def test_caches_while_being_decorated
     fb = Factbase::SyncFactbase.new(Factbase::CachedFactbase.new(Factbase.new))
     10_000.times do |i|

data/test/factbase/indexed/test_indexed_term.rb CHANGED Viewed

@@ -59,17 +59,25 @@ class TestIndexedTerm < Factbase::Test
       :and,
       [
         Factbase::Term.new(:eq, [:foo, 42]),
-        Factbase::Term.new(:eq, [:bar, 7])
+        Factbase::Term.new(:eq, %i[bar $a])
       ]
     )
     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, { 'a' => [7] })
     assert_equal(1, n.size)
     assert_kind_of(Factbase::Taped, n)
   end
+  def test_predicts_on_single_and
+    term = Factbase::Term.new(:and, [Factbase::Term.new(:eq, [:foo, 42])])
+    idx = {}
+    term.redress!(Factbase::IndexedTerm, idx:)
+    maps = Factbase::Taped.new([{ 'foo' => [42] }, { 'bar' => [7], 'foo' => [4] }])
+    assert_equal(1, term.predict(maps, {}).size)
+  end
   def test_predicts_on_or
     term = Factbase::Term.new(
       :or,

data/test/factbase/test_logged.rb CHANGED Viewed

@@ -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)
@@ -92,6 +105,12 @@ class TestLogged < Factbase::Test
     assert_equal(0, Factbase::Logged.new(fb, Loog::NULL).query('(always)').each(&:to_s))
   end
+  def test_returns_to_s_correctly
+    fb = Factbase.new
+    q = '(always)'
+    assert_equal(q, fb.query(q).to_s)
+  end
   def test_logs_when_enumerator
     fb = Factbase::Logged.new(Factbase.new, Loog::NULL)
     assert_equal(0, fb.query('(always)').each.to_a.size)

data/test/factbase/test_query.rb CHANGED Viewed

@@ -123,11 +123,13 @@ class TestQuery < Factbase::Test
       { 'num' => [42, 66, 0], 'pi' => [3.14], 'name' => ['peter'] },
       { 'num' => [0], 'time' => [Time.now - 100], 'hi' => [4], 'nome' => ['Walter'] }
     ]
-    with_factbases(maps) do |badge, fb|
-      queries.each do |q, r|
-        assert_equal(r, fb.query(q).each.to_a.size, "#{q} in #{badge}")
-        fb.txn do |fbt|
-          assert_equal(r, fbt.query(q).each.to_a.size, "#{q} in #{badge} (txn)")
+    3.times do |cycle|
+      with_factbases(maps) do |badge, fb|
+        queries.each do |q, r|
+          assert_equal(r, fb.query(q).each.to_a.size, "#{q} in #{badge} (cycle ##{cycle})")
+          fb.txn do |fbt|
+            assert_equal(r, fbt.query(q).each.to_a.size, "#{q} in #{badge} (txn, cycle ##{cycle})")
+          end
         end
       end
     end
@@ -301,12 +303,85 @@ class TestQuery < Factbase::Test
       'sync+plain' => Factbase::SyncFactbase.new(Factbase.new(maps)),
       'tallied+plain' => Factbase::Tallied.new(Factbase.new(maps)),
       'indexed+plain' => Factbase::IndexedFactbase.new(Factbase.new(maps)),
+      'indexed+logged+plain' => Factbase::IndexedFactbase.new(
+        Factbase::Logged.new(
+          Factbase.new(maps),
+          Loog::NULL
+        )
+      ),
       'cached+plain' => Factbase::CachedFactbase.new(Factbase.new(maps)),
+      'cached+logged+plain' => Factbase::CachedFactbase.new(
+        Factbase::Logged.new(
+          Factbase.new(maps),
+          Loog::NULL
+        )
+      ),
       '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))),
+      'indexed+indexed+plain' => Factbase::IndexedFactbase.new(
+        Factbase::IndexedFactbase.new(Factbase.new(maps))
+      ),
+      'cached+cached+cached+plain' => Factbase::CachedFactbase.new(
+        Factbase::CachedFactbase.new(
+          Factbase::CachedFactbase.new(
+            Factbase.new(maps)
+          )
+        )
+      ),
+      'tallied+pre+rules+inv+plain' => Factbase::Tallied.new(
+        Factbase::Pre.new(
+          Factbase::Rules.new(
+            Factbase::Inv.new(
+              Factbase.new(maps)
+            ) { nil },
+            '(always)'
+          )
+        ) { nil }
+      ),
       'sync+cached+indexed+plain' => Factbase::SyncFactbase.new(
-        Factbase::CachedFactbase.new(Factbase::IndexedFactbase.new(Factbase.new(maps)))
+        Factbase::CachedFactbase.new(
+          Factbase::IndexedFactbase.new(
+            Factbase.new(maps)
+          )
+        )
+      ),
+      'sync+logged+plain' => Factbase::SyncFactbase.new(
+        Factbase::Logged.new(
+          Factbase.new(maps),
+          Loog::NULL
+        )
+      ),
+      'sync+cached+indexed+logged+plain' => Factbase::SyncFactbase.new(
+        Factbase::CachedFactbase.new(
+          Factbase::IndexedFactbase.new(
+            Factbase::Logged.new(
+              Factbase.new(maps),
+              Loog::NULL
+            )
+          )
+        )
+      ),
+      'sync+sync+sync+plain' => Factbase::SyncFactbase.new(
+        Factbase::SyncFactbase.new(
+          Factbase::SyncFactbase.new(
+            Factbase::SyncFactbase.new(
+              Factbase.new(maps)
+            )
+          )
+        )
+      ),
+      'logged+logged+logged+plain' => Factbase::SyncFactbase.new(
+        Factbase::Logged.new(
+          Factbase::Logged.new(
+            Factbase::Logged.new(
+              Factbase.new(maps),
+              Loog::NULL
+            ),
+            Loog::NULL
+          ),
+          Loog::NULL
+        )
       ),
       'all+plain' => Factbase::Tallied.new(
         Factbase::Pre.new(

data/test/factbase/test_taped.rb CHANGED Viewed

@@ -18,6 +18,18 @@ class TestTaped < Factbase::Test
     assert_equal(1, t.inserted.size)
   end
+  def test_joins_with_empty
+    t = Factbase::Taped.new([{ foo: 'yes' }])
+    t &= []
+    assert_equal(0, t.size)
+  end
+  def test_disjoins_with_empty
+    t = Factbase::Taped.new([{ bar: 'oops' }])
+    t |= []
+    assert_equal(1, t.size)
+  end
   def test_tracks_deletion
     t = Factbase::Taped.new([{ x: 1 }, { x: 2 }])
     t.delete_if { |m| m[:x] == 1 }

data/test/factbase/test_term.rb CHANGED Viewed

@@ -81,5 +81,7 @@ class TestTerm < Factbase::Test
     t.redress!(Factbase::IndexedTerm)
     require_relative '../../lib/factbase/cached/cached_term'
     t.redress!(Factbase::CachedTerm)
+    assert_kind_of(Factbase::CachedTerm, t)
+    refute_kind_of(Factbase::CachedTerm, Factbase::Term.new(:something, []))
   end
 end

metadata CHANGED Viewed

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: decoor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -51,20 +51,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -83,30 +97,30 @@ dependencies:
   name: others
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: tago
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: yaml
   requirement: !ruby/object:Gem::Requirement