factbase 0.19.10 → 0.19.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b573b12e8a04a0b69a2e4c33c6ccd17c21c1c14a52a644c87564738388de546
-  data.tar.gz: b4c888226e04aee8054ff26d056cc04f34fd3a1fb29455ff6c77ce4dd2103d45
+  metadata.gz: f97152f34dd9eb3ba72cc5380a87d321bbec59c316078108b38c2c078c23a0fd
+  data.tar.gz: 0f678a254dc256d1983965742771c37d0956a89f93ec91e098f63b4d2957117a
 SHA512:
-  metadata.gz: a96ff08cc40deb0d17e25cc7c30f8e67d5c09b0179e623d7e941ade194ac7c52c2135730fb4a813faf7370097a1d151db74e1559de81a619bf572becb1eec408
-  data.tar.gz: 1f57d718a82c2c8d107c033c3d8b59440170822f5810fadfc3b99837cf4072493e96ec8a39bff41c73a913cc3dba75837a9f4ecc0804976da37ebe02c09b1777
+  metadata.gz: a8ebb9cd303ab0a6b34842ec06fa2d5f4ed1ec1d2c8fff89e1068531782386c1c6da2bba4f2d116635ca37532d314c25626fe0fdcac03a10ead6b57871483485
+  data.tar.gz: 1f2be490a544b5417059853ed135011c85215bbea7fb9b96551bcd67badc32e20a9384acf97d6a3b4908e63332937bb4502df168c79aa19ed95afc1a364ee4bd

data/Gemfile

@@ -10,16 +10,17 @@ gem 'benchmark', '~>0.5', require: false
 gem 'minitest', '~>6.0', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'os', '~>1.1', require: false
-gem 'psych', '5.3.1', require: false # GPL
+gem 'psych', '5.3.1', require: false
 gem 'qbash', '~>0.4', require: false
 gem 'rake', '~>13.2', require: false
-gem 'rdoc', '7.1.0', require: false # GPL
+gem 'rdoc', '7.1.0', require: false
 gem 'rubocop', '~>1.74', require: false
+gem 'rubocop-elegant', '~>0.5', require: false
 gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.25', require: false
 gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>3.0', require: false
-gem 'stackprof', '0.2.27', require: false, platforms: [:ruby] # GPL
+gem 'stackprof', '0.2.27', require: false, platforms: [:ruby]
 gem 'threads', '~>0.4', require: false
-gem 'yard', '0.9.38', require: false # GPL
+gem 'yard', '0.9.38', require: false

data/Gemfile.lock

@@ -30,15 +30,15 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    erb (6.0.1)
-    json (2.18.1)
+    erb (6.0.4)
+    json (2.19.5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     loog (0.8.0)
       ellipsized
       logger (~> 1.0)
-    minitest (6.0.5)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
     minitest-reporters (1.8.0)
@@ -46,25 +46,25 @@ GEM
       builder
       minitest (>= 5.0, < 7)
       ruby-progressbar
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x64-mingw-ucrt)
+    nokogiri (1.19.3-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     os (1.1.4)
     others (0.1.1)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (2.1.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
     psych (5.3.1)
       date
       stringio
-    qbash (0.8.3)
+    qbash (0.8.4)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -76,22 +76,25 @@ GEM
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
-    rubocop (1.84.2)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
+    rubocop-elegant (0.5.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.75)
     rubocop-minitest (0.39.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
@@ -148,6 +151,7 @@ DEPENDENCIES
   rake (~> 13.2)
   rdoc (= 7.1.0)
   rubocop (~> 1.74)
+  rubocop-elegant (~> 0.5)
   rubocop-minitest (~> 0.38)
   rubocop-performance (~> 1.25)
   rubocop-rake (~> 0.7)

data/README.md

@@ -11,7 +11,10 @@
 [![Yard Docs](https://img.shields.io/badge/yard-docs-blue.svg)](https://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)
+[![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%2Fyegor256%2Ffactbase?ref=badge_shield&issueType=license)
+
+> **WARNING:** `Factbase` is **NOT** thread-safe. Use `Factbase::SyncFactbase`
+> for concurrent access from multiple threads.
 
 This Ruby gem manages an in-memory database of facts.
 A fact is simply an associative array of properties and their values.
@@ -19,7 +22,8 @@ The values are either atomic literals or non-empty sets of literals.
 It is possible to delete a fact, but impossible to delete a property
 from a fact.
 
-Here is how you use it (it's thread-safe, by the way):
+Here is how you use it (wrap it with `Factbase::SyncFactbase`
+for thread-safe access):
 
 ```ruby
 fb = Factbase.new
@@ -119,6 +123,27 @@ end
 assert(0 == fb.size)
 ```
 
+## Query Parameters
+
+You can use `$name` variables in queries and pass values at runtime:
+
+```ruby
+fb = Factbase.new
+fb.insert.foo = 42
+fb.insert.foo = 99
+fb.query('(eq foo $bar)').each(Factbase.new, bar: [42]).to_a
+# Returns the fact with foo = 42
+```
+
+Variables are passed as keyword arguments to `each` or `one`. The value must
+be an array (even for a single value). This works with any term:
+
+```ruby
+fb.query(
+  '(eq salary (agg (eq dept $dept) (avg salary)))'
+).each(Factbase.new, dept: ['eng']).to_a
+```
+
 ## Terms
 
 There are some boolean terms available in a query
@@ -129,8 +154,7 @@ There are some boolean terms available in a query
 * `(not b)` is the inverse of `b`
 * `(or b1 b2 ...)` is `true` if at least one argument is `true`
 * `(and b1 b2 ...)` — if all arguments are `true`
-* `(when b1 b2)` — if `b1` is `true` and `b2` is `true`
-or `b1` is `false`
+* `(when b1 b2)` — true if `b1` is `false`, or if both `b1` and `b2` are `true`
 * `(exists p)` — if `p` property exists
 * `(absent p)` — if `p` property is absent
 * `(zero v)` — if any `v` equals to zero
@@ -145,6 +169,9 @@ There are string manipulators:
 * `(concat v1 v2 v3 ...)` — concatenates all `v`
 * `(sprintf v v1 v2 ...)` — creates a string by `v` format with params
 * `(matches v s)` — if any `v` matches the `s` regular expression
+* `(contains v s)` — if any value of `v` contains any value of `s` (substring match)
+* `(starts_with v s)` — if any `v` starts with `s`
+* `(ends_with v s)` — if any `v` ends with `s`
 
 There are a few terms that return non-boolean values:
 
@@ -152,7 +179,7 @@ There are a few terms that return non-boolean values:
 * `(size v)` is the cardinality of `v` (zero if `v` is `nil`)
 * `(type v)` is the type of `v`
 (`"String"`, `"Integer"`, `"Float"`, `"Time"`, or `"Array"`)
-* `(either v1 v1)` is `v2` if `v1` is `nil`
+* `(either v1 v2)` is `v2` if `v1` is `nil`
 
 It's possible to modify the facts retrieved, on fly:
 
@@ -227,6 +254,86 @@ There are some system-level terms:
 * `(env v1 v2)` returns the value of environment variable `v1` or the string
 `v2` if it's not set
 
+## Architecture
+
+The entire database is a single flat [Ruby](https://www.ruby-lang.org/en/)
+  `Array` of `Hash` objects held in RAM (`Factbase#@maps`). There are no
+  tables, schemas, or type enforcement beyond four scalar types: `Integer`,
+  `Float`, `String`, and `Time`. This contrasts with
+  [SQLite](https://sqlite.org/) (fixed-column tables on disk) and
+  [MongoDB](https://www.mongodb.com/) (typed document collections). New
+  programmers must understand that all data vanishes on process exit unless
+  `export`/`import` is called explicitly.
+
+Each property of a fact is a non-empty ordered set of values rather than a
+  single value. Assigning `f.foo = 1` then `f.foo = 2` produces
+  `f['foo'] == [1, 2]`; each assignment appends. Reading `f.foo` returns
+  the first element; `f['foo']` returns the full array. This accumulative
+  semantics differs from [SQL](https://www.iso.org/standard/76583.html)
+  (one value per column) and most NoSQL stores where assignment overwrites.
+  New programmers must expect multi-element arrays on every property read.
+
+Queries use a custom Lisp-style
+  [S-expression](https://en.wikipedia.org/wiki/S-expression) language:
+  `(and (eq kind 'book') (gt age 10))`. `Factbase::Syntax` tokenizes and
+  parses a query string into an AST of `Factbase::Term` objects;
+  `Factbase::Query#each` evaluates that AST against every fact. This
+  differs from [SQL](https://www.iso.org/standard/76583.html),
+  [XPath](https://www.w3.org/TR/xpath-31/), and
+  [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535). New
+  programmers add operators by implementing a term class, not by modifying
+  parser grammar.
+
+Each query operator (`eq`, `gt`, `agg`, `join`, etc.) is a separate class
+  under `lib/factbase/terms/`. `Factbase::Term` holds a dispatch hash
+  (`@terms`) mapping operator symbols to instances and delegates `evaluate`
+  and `predict` calls there. This is not a class hierarchy — adding a new
+  operator requires a new file in `terms/` and a registration line in the
+  `Factbase::Term` constructor. New programmers extending the query
+  language must follow this two-step pattern.
+
+Transactions are ACID and implemented via lazy copy-on-write journaling.
+  `Factbase#txn` wraps the array in `Factbase::LazyTaped`, which defers
+  physical duplication of hash objects until the first write. Inserts,
+  deletes, and property additions are tracked by Ruby `object_id`. On
+  commit the journal is replayed into the main array; raising
+  `Factbase::Rollback` discards it. Nesting transactions is explicitly
+  forbidden by `Factbase::Light`. This differs from SQLite's
+  [WAL](https://sqlite.org/wal.html) and PostgreSQL's
+  [MVCC](https://www.postgresql.org/docs/current/mvcc.html).
+
+Cross-cutting capabilities — thread safety, indexing, constraint
+  validation, logging, and change counting — are added via decorators:
+  `Factbase::SyncFactbase`, `Factbase::IndexedFactbase`,
+  `Factbase::Rules`, `Factbase::Logged`, and `Factbase::Tallied`. The
+  [`decoor`](https://github.com/yegor256/decoor) gem provides delegation
+  boilerplate. The bare `Factbase` class is not thread-safe; new
+  programmers must wrap it with `SyncFactbase` before sharing across
+  threads.
+
+Persistence uses Ruby's
+  [`Marshal`](https://ruby-doc.org/core/Marshal.html), serializing the
+  internal array of hashes to a binary blob via `Marshal.dump`. The format
+  is Ruby-version-specific and not portable across major Ruby versions or
+  platforms, unlike [JSON](https://www.json.org/json-en.html) or
+  [Protocol Buffers](https://protobuf.dev/). Output-only decorators
+  `Factbase::ToJSON`, `Factbase::ToXML`, and `Factbase::ToYAML` exist but
+  do not support round-trip import. Because `import` calls `Marshal.load`
+  on the incoming bytes, the input must come from a source the caller
+  trusts; a `Marshal` stream crafted by an attacker can execute arbitrary
+  code in the calling process, so factbase blobs received over the
+  network or read from a user-supplied path should be authenticated
+  out-of-band before being imported, as described in the
+  [Ruby security notes](https://docs.ruby-lang.org/en/3.3/security_rdoc.html#label-Marshal.load).
+
+`Factbase::IndexedFactbase` lazily builds a hash-based inverted index for
+  equality queries, keyed by array `object_id`, property name, and
+  operator. The index is built incrementally on each query and invalidated
+  entirely on any mutation (delete or property addition). Without this
+  decorator every `query#each` call performs a full linear scan over all
+  facts. New programmers should add `IndexedFactbase` whenever the
+  factbase holds more than a few thousand facts.
+
 ## How to contribute
 
 Read
@@ -250,24 +357,24 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user
-void scan                                                      0.001102
-20k facts: export: 2991KB                                      0.854774
-20k facts: import: 2991KB                                      1.035671
-50k facts: read                                                0.000138
-50k facts: read in txn                                         0.002754
-50k facts: insert                                              0.000090
-50k facts: insert in txn                                       0.000243
-50k facts: modify                                              1.085214
-50k facts: modify in txn                                       2.480409
-12k facts: large query: match 3k                              14.187596
-12k facts: large query: match 3k in txn                       19.396334
-12k facts: large query: match zero                            15.139695
-12k facts: large query: match zero in txn                     21.046074
+void scan                                                      0.001115
+20k facts: export: 2979KB                                      0.979531
+20k facts: import: 2979KB                                      1.055363
+50k facts: read                                                0.000212
+50k facts: read in txn                                         0.001724
+50k facts: insert                                              0.000081
+50k facts: insert in txn                                       0.000226
+50k facts: modify                                              1.604103
+50k facts: modify in txn                                       3.126437
+12k facts: large query: match 3k                              13.220472
+12k facts: large query: match 3k in txn                       18.484006
+12k facts: large query: match zero                            13.730576
+12k facts: large query: match zero in txn                     19.485743
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2026-04-16 at 17:08,
+on 2026-06-14 at 16:40,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/24523476155
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/27505290212

data/Rakefile

@@ -63,7 +63,7 @@ end
 desc 'Benchmark them all'
 task :benchmark, [:name, :cycles] do |_t, args|
   bname = args[:name] || 'essential'
-  cycles = (args[:cycles] || 5).to_i
+  cycles = Integer(args[:cycles] || 5)
   require_relative 'lib/factbase'
   require_relative 'lib/factbase/cached/cached_factbase'
   require_relative 'lib/factbase/indexed/indexed_factbase'
@@ -84,16 +84,11 @@ task :benchmark, [:name, :cycles] do |_t, args|
       fb = Factbase.new
       fb = Factbase::IndexedFactbase.new(fb)
       fb = Factbase::CachedFactbase.new(fb)
-      Kernel.send(File.basename(f).gsub(/\.rb$/, '').to_sym, b, fb, cycles)
+      Kernel.__send__(File.basename(f).gsub(/\.rb$/, '').to_sym, b, fb, cycles)
     end
   end
 end
 
-# Run profiling on a benchmark and generate a flamegraph.
-# To run this task, you need to have stackprof installed.
-# https://github.com/tmm1/stackprof
-# To run profiling for a specific benchmark you can run:
-#   bundle exec rake flamegraph\[bench_slow_query\]
 desc 'Profile a benchmark (e.g., flamegraph[bench_slow_query])'
 task :flamegraph, [:name] do |_t, args|
   require 'stackprof'

data/factbase.gemspec

@@ -7,7 +7,7 @@ require 'English'
 require_relative 'lib/factbase/version'
 
 Gem::Specification.new do |s|
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
   s.required_ruby_version = '>=3.0'
   s.name = 'factbase'
   s.version = Factbase::VERSION
@@ -25,15 +25,15 @@ Gem::Specification.new do |s|
   s.files = `git ls-files | grep -v -E '^(test/|\\.|fixtures|benchmark|renovate)'`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace', '~>0.4'
-  s.add_dependency 'decoor', '~>0.1'
-  s.add_dependency 'ellipsized', '~>0.3'
-  s.add_dependency 'json', '~>2.7'
-  s.add_dependency 'logger', '~>1.0'
-  s.add_dependency 'loog', '~>0.6'
-  s.add_dependency 'nokogiri', '~>1.10'
-  s.add_dependency 'others', '~>0.1'
-  s.add_dependency 'tago', '~>0.1'
-  s.add_dependency 'yaml', '~>0.3'
+  s.add_dependency('backtrace', '~>0.4')
+  s.add_dependency('decoor', '~>0.1')
+  s.add_dependency('ellipsized', '~>0.3')
+  s.add_dependency('json', '~>2.7')
+  s.add_dependency('logger', '~>1.0')
+  s.add_dependency('loog', '~>0.6')
+  s.add_dependency('nokogiri', '~>1.10')
+  s.add_dependency('others', '~>0.1')
+  s.add_dependency('tago', '~>0.1')
+  s.add_dependency('yaml', '~>0.3')
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/accum.rb

@@ -27,7 +27,7 @@ class Factbase::Accum
   end
 
   def all_properties
-    @fact.all_properties
+    @fact.all_properties | @props.keys
   end
 
   others do |*args|

data/lib/factbase/cached/cached_fact.rb

@@ -24,9 +24,8 @@ class Factbase::CachedFact
     @origin.to_s
   end
 
-  # When a method is missing, this method is called.
   others do |*args|
     @cache.clear if args[0].to_s.end_with?('=')
-    @origin.send(*args)
+    @origin.__send__(*args)
   end
 end

data/lib/factbase/cached/cached_factbase.rb

@@ -22,9 +22,9 @@ class Factbase::CachedFactbase
   # @param [Factbase] origin Original factbase to decorate
   # @param [Hash] cache Cache to use
   def initialize(origin, cache = {})
-    raise 'Wrong type of original' unless origin.respond_to?(:query)
+    raise(ArgumentError, 'Wrong type of original') unless origin.respond_to?(:query)
     @origin = origin
-    raise 'Wrong type of cache' unless cache.is_a?(Hash)
+    raise(ArgumentError, 'Wrong type of cache') unless cache.is_a?(Hash)
     @cache = cache
   end
 
@@ -58,7 +58,7 @@ class Factbase::CachedFactbase
   # @return [Factbase::Churn] How many facts have been changed (zero if rolled back)
   def txn
     @origin.txn do |fbt|
-      yield Factbase::CachedFactbase.new(fbt, @cache)
+      yield(Factbase::CachedFactbase.new(fbt, @cache))
     end
   end
 end

data/lib/factbase/cached/cached_query.rb

@@ -36,13 +36,12 @@ class Factbase::CachedQuery
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
     invalidate_if_dirty!
-    key = "each #{@origin}" # params are ignored!
-    before = @cache[key]
-    @cache[key] = @origin.each(fb, params).to_a if before.nil?
+    key = "each #{@origin}"
+    @cache[key] = @origin.each(fb, params).to_a if @cache[key].nil?
     c = 0
     @cache[key].each do |f|
       c += 1
-      yield Factbase::CachedFact.new(f, @cache)
+      yield(Factbase::CachedFact.new(f, @cache))
     end
     c
   end
@@ -54,8 +53,7 @@ class Factbase::CachedQuery
   def one(fb = @fb, params = {})
     invalidate_if_dirty!
     key = "one: #{@origin} #{params}"
-    before = @cache[key]
-    @cache[key] = @origin.one(fb, params) if before.nil?
+    @cache[key] = @origin.one(fb, params) if @cache[key].nil?
     @cache[key]
   end
 

data/lib/factbase/cached/cached_term.rb

@@ -19,8 +19,7 @@ module Factbase::CachedTerm
     return super unless static? && !abstract?
     return super if %i[head unique].include?(@op)
     key = [maps.object_id, to_s]
-    before = @cache[key]
-    @cache[key] = super if before.nil?
+    @cache[key] = super if @cache[key].nil?
     @cache[key]
   end
 end

data/lib/factbase/churn.rb

@@ -22,16 +22,16 @@ class Factbase::Churn
     if zero?
       'nothing'
     else
-      "#{@inserted}i/#{@deleted}d/#{@added}a"
+      "#{inserted}i/#{deleted}d/#{added}a"
     end
   end
 
   def zero?
-    @inserted.zero? && @deleted.zero? && @added.zero?
+    inserted.zero? && deleted.zero? && added.zero?
   end
 
   def to_i
-    @inserted + @deleted + @added
+    inserted + deleted + added
   end
 
   def append(ins, del, add)
@@ -43,10 +43,6 @@ class Factbase::Churn
   end
 
   def +(other)
-    Factbase::Churn.new(
-      @inserted + other.inserted,
-      @deleted + other.deleted,
-      @added + other.added
-    )
+    Factbase::Churn.new(inserted + other.inserted, deleted + other.deleted, added + other.added)
   end
 end

data/lib/factbase/fact.rb

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: MIT
 
 require 'json'
-require 'time'
 require 'others'
+require 'time'
 require_relative '../factbase'
 
 # A single fact in a factbase.
@@ -37,7 +37,7 @@ class Factbase::Fact
   # Convert it to a string.
   # @return [String] String representation of it (in JSON)
   def to_s
-    "[ #{@map.map { |k, v| "#{k}: #{v}" }.sort.join(', ')} ]"
+    "[ #{@map.map { |k, v| "#{k}: #{v}" }.sort!.join(', ')} ]"
   end
 
   # Get a list of all props.
@@ -50,12 +50,15 @@ class Factbase::Fact
     k = args[0].to_s
     if k.end_with?('=')
       kk = k[0..-2]
-      raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
-      raise "Prohibited prop name '#{kk}'" if methods.include?(kk.to_sym)
+      raise(ArgumentError, "Invalid prop name '#{kk}'") unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
+      raise(ArgumentError, "Prohibited prop name '#{kk}'") if methods.include?(kk.to_sym)
       v = args[1]
-      raise "The value of '#{kk}' can't be nil" if v.nil?
-      raise "The value of '#{kk}' can't be empty" if v == ''
-      raise "The type '#{v.class}' of '#{kk}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
+      raise(ArgumentError, "The value of '#{kk}' can't be nil") if v.nil?
+      raise(ArgumentError, "The value of '#{kk}' can't be empty") if v == ''
+      raise(ArgumentError, "The type '#{v.class}' of '#{kk}' is not allowed") unless [
+        String, Integer, Float,
+        Time
+      ].include?(v.class)
       v = v.utc if v.is_a?(Time)
       @map[kk] = [] if @map[kk].nil?
       @map[kk] << v
@@ -65,8 +68,8 @@ class Factbase::Fact
     else
       v = @map[k]
       if v.nil?
-        raise "Can't get '#{k}', the fact is empty" if @map.empty?
-        raise "Can't find '#{k}' attribute out of [#{@map.keys.join(', ')}]"
+        raise(ArgumentError, "Can't get '#{k}', the fact is empty") if @map.empty?
+        raise(ArgumentError, "Can't find '#{k}' attribute out of [#{@map.keys.join(', ')}]")
       end
       v[0]
     end

data/lib/factbase/flatten.rb

@@ -21,8 +21,8 @@ class Factbase::Flatten
   # @return [Array<HashMap>] The hashmaps, but improved
   def it
     @maps
-      .sort_by { |m| m[@sorter] || [] }
+      .sort_by { |m| Array(m[@sorter]).map(&:to_s) }
       .map { |m| m.sort.to_h }
-      .map { |m| m.transform_values { |v| v.size == 1 ? v[0] : v } }
+      .map! { |m| m.transform_values { |v| v.size == 1 ? v[0] : v } }
   end
 end

data/lib/factbase/impatient.rb

@@ -18,9 +18,9 @@ class Factbase::Impatient
   # @param [Factbase] fb The factbase to decorate
   # @param [Integer] timeout Timeout in seconds
   def initialize(fb, timeout: 15)
-    raise 'The "fb" is nil' if fb.nil?
+    raise(ArgumentError, 'The "fb" is nil') if fb.nil?
     @origin = fb
-    @timeout = timeout.to_f
+    @timeout = Float(timeout)
   end
 
   decoor(:origin)
@@ -36,7 +36,7 @@ class Factbase::Impatient
 
   def txn
     @origin.txn do |fbt|
-      yield Factbase::Impatient.new(fbt, timeout: @timeout)
+      yield(Factbase::Impatient.new(fbt, timeout: @timeout))
     end
   end
 
@@ -56,17 +56,15 @@ class Factbase::Impatient
     end
 
     def each(fb = @fb, params = {}, &)
-      a =
-        impatient('each') do
-          @fb.query(@term, @maps).each(fb, params).to_a
+      return to_enum(__method__, fb, params) unless block_given?
+      n = 0
+      impatient('each') do
+        @fb.query(@term, @maps).each(fb, params) do |f|
+          yield(f)
+          n += 1
         end
-      return a unless block_given?
-      yielded = 0
-      a.each do |f|
-        yield f
-        yielded += 1
       end
-      yielded
+      n
     end
 
     def one(fb = @fb, params = {})
@@ -86,7 +84,10 @@ class Factbase::Impatient
     def impatient(name, &)
       Timeout.timeout(@timeout, &)
     rescue Timeout::Error => e
-      raise "#{name}() timed out after #{@timeout.seconds} (#{e.message}), fb size is #{@fb.size}: #{@term}"
+      raise(
+        StandardError,
+        "#{name}() timed out after #{@timeout.seconds} (#{e.message}), fb size is #{@fb.size}: #{@term}"
+      )
     end
   end
 end