factbase 0.19.13 → 0.19.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637517dba0f659ed627e82e2b7959e113ea5b5a7b1193f800018492cde27d761
-  data.tar.gz: c59487d4138740f493f220d9b338139cc26d0de206b0913d078fe4ecec26e2b2
+  metadata.gz: 0f6fa1160712c0f180b90cc7e3d15f9228c0266f5e8bdb227506aa2c9289cbf8
+  data.tar.gz: da6b63c4a95759dbc1ea4eb62cd204d4a0ec71dcc31b3bfc853fc197bb7ce183
 SHA512:
-  metadata.gz: d78b66be0333c5c19d9db04931360a7d30b0a01115dc259daeaf5146a861211f884396c91ccf3e17ee0ff607aba7e4f95a4e2dba8a18e3a79d57b262fe5c3624
-  data.tar.gz: 714a0e0a2a023348f3e65250c2721e05b17d2c5649b45dcaed3d50a59e66a79cb1077895c8fba16cc26ba0417e9c8d817ead2874d9df4320eb27dba4bacaf15d
+  metadata.gz: 32bab5bb943f397e259d2efd5c8f7ca90ee12da9e8595b416025f06b6ad72890221f20e72cd4e7b787d02102c6faf82b3e2b3bbc8bcd59b7e014fcab80782ee1
+  data.tar.gz: 25fa777f6fe8aeaf1bf55f92fc326512cc2228b3ec8b7d284d496abcde65c161bf3ad0006fbce73bc284c7d52b72cba49a2e613bb489f0fe25bf14a4a7f9a1cf

data/Gemfile.lock

@@ -21,7 +21,7 @@ GEM
     backtrace (0.4.1)
     benchmark (0.5.0)
     builder (3.3.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     date (3.5.1)
     decoor (0.1.0)
     docile (1.4.1)
@@ -31,8 +31,8 @@ GEM
       tago (~> 0.1)
     ellipsized (0.3.0)
     erb (6.0.4)
-    json (2.19.5)
-    language_server-protocol (3.17.0.5)
+    json (2.20.0)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     loog (0.8.0)
@@ -46,13 +46,13 @@ GEM
       builder
       minitest (>= 5.0, < 7)
       ruby-progressbar
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x64-mingw-ucrt)
+    nokogiri (1.19.4-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
     os (1.1.4)
     others (0.1.1)
@@ -78,7 +78,7 @@ GEM
       tsort
     regexp_parser (2.12.0)
     rexml (3.4.4)
-    rubocop (1.86.2)
+    rubocop (1.88.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -89,10 +89,10 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-elegant (0.5.1)
+    rubocop-elegant (0.7.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.75)
     rubocop-minitest (0.39.1)
@@ -111,7 +111,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.1.0)
+    simplecov-cobertura (3.2.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)

data/README.md

@@ -357,24 +357,24 @@ This is the result of the benchmark:
 <!-- benchmark_begin -->
 ```text
                                                                    user
-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
+void scan                                                      0.001099
+20k facts: export: 2970KB                                      0.836539
+20k facts: import: 2970KB                                      1.034012
+50k facts: read                                                0.000256
+50k facts: read in txn                                         0.002758
+50k facts: insert                                              0.000100
+50k facts: insert in txn                                       0.000257
+50k facts: modify                                              1.484502
+50k facts: modify in txn                                       2.812194
+12k facts: large query: match 3k                              14.318373
+12k facts: large query: match 3k in txn                       19.628950
+12k facts: large query: match zero                            15.134839
+12k facts: large query: match zero in txn                     20.974642
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2026-06-14 at 16:40,
+on 2026-06-19 at 04:35,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/27505290212
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/27805571606

data/lib/factbase/inv.rb

@@ -7,17 +7,25 @@ require 'decoor'
 require 'others'
 require_relative '../factbase'
 
+# @todo #644:30min Add a test that validates YARD docstring examples
+#  match the actual API signatures. The docstring in this class was
+#  recently fixed because the block signature was documented as
+#  |f, fbt| but the actual implementation passes |property, value|.
+#  A general test that parses docstrings and checks their examples
+#  against the real method signatures would prevent this class of
+#  bugs from recurring across the codebase.
+#
 # 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+:
+# For example, you can use this decorator if you want to make sure that
+# no property +b+ is set to a +String+ value:
 #
-#  fb = Factbase::Inv.new(Factbase.new) do |f, fbt|
-#    assert !f['when'].nil?
+#  fb = Factbase::Inv.new(Factbase.new) do |p, v|
+#    raise "b cannot be a string" if p == 'b' && v.is_a?(String)
 #  end
 #
-# The second argument passed to the block is the factbase, while the first
-# one is the fact just touched.
+# The first block argument is the property name (a +String+), the second
+# is the value being assigned.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024-2026 Yegor Bugayenko

data/lib/factbase/logged.rb

@@ -131,10 +131,11 @@ class Factbase::Logged
       @maps = maps
       @tube = tube
       @fb = fb
+      @termtext = term.is_a?(Factbase::Term) ? term.to_s : term
     end
 
     def to_s
-      @term.to_s
+      @termtext
     end
 
     def each(fb = @fb, params = {}, &)
@@ -147,10 +148,14 @@ class Factbase::Logged
           r = qry.each(fb, params, &)
         end
       unless r.is_a?(Integer)
-        raise(StandardError, ".query(#{@term.to_s.inspect}).each() of #{qry.class} returned #{r.class}")
+        raise(StandardError, ".query(#{@termtext.inspect}).each() of #{qry.class} returned #{r.class}")
       end
-      q = Factbase::Syntax.new(@term).to_term.to_s
-      q = "#{q} with {#{params.map { |k, v| "#{k}=#{v}" }.join(', ')}}" if params.is_a?(Hash) && !params.empty?
+      if params.is_a?(Hash) && !params.empty?
+        q = "#{@termtext} with {#{params.map do |k, v|
+          "#{k}=#{v}"
+        end.join(', ')}}"
+      end
+      q ||= @termtext
       if r.zero?
         @tube.say(mono, "Zero/#{@fb.size} facts found by #{q} #{tail}")
       else
@@ -161,16 +166,15 @@ class Factbase::Logged
 
     def one(fb = @fb, params = {})
       mono = Process.clock_gettime(Factbase::Logged::MONO)
-      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(mono, "Nothing found by '#{q}' #{tail}")
+        @tube.say(mono, "Nothing found by '#{@termtext}' #{tail}")
       else
-        @tube.say(mono, "Found #{r} (#{r.class}) by '#{q}' #{tail}")
+        @tube.say(mono, "Found #{r} (#{r.class}) by '#{@termtext}' #{tail}")
       end
       r
     end

data/lib/factbase/rules.rb

@@ -122,8 +122,10 @@ class Factbase::Rules
 
     def it(fact, fb)
       return if Factbase::Syntax.new(@expr).to_term.evaluate(fact, [], fb)
-      e = "#{@expr[0..32]}..." if @expr.length > 32
-      raise(ArgumentError, "The fact doesn't match the #{e.inspect} rule: #{fact}")
+      raise(
+        ArgumentError,
+        "The fact doesn't match the #{(@expr.length > 32 ? "#{@expr[0..31]}..." : @expr).inspect} rule: #{fact}"
+      )
     end
   end
 

data/lib/factbase/terms/arithmetic.rb

@@ -47,7 +47,7 @@ class Factbase::Arithmetic < Factbase::TermBase
         when 'weeks', 'week'
           num * 60 * 60 * 24 * 7
         else
-          raise(ArgumentError, "Unknown time unit '#{units}' in '#{r}")
+          raise(ArgumentError, "Unknown time unit '#{units}' in '#{r}'")
         end
     end
     v.__send__(@op, r)

data/lib/factbase/terms/env.rb

@@ -22,7 +22,12 @@ class Factbase::Env < Factbase::TermBase
   # @return [String] The value of the environment variable or the default
   def evaluate(fact, maps, fb)
     assert_args(2)
-    n = _values(0, fact, maps, fb)[0]
-    ENV.fetch(n.upcase) { _values(1, fact, maps, fb)[0] }
+    n = _values(0, fact, maps, fb)
+    return if n.nil?
+    ENV.fetch(n[0].upcase) do
+      d = _values(1, fact, maps, fb)
+      return if d.nil?
+      d[0]
+    end
   end
 end

data/lib/factbase/terms/to_float.rb

@@ -23,6 +23,14 @@ class Factbase::ToFloat < Factbase::TermBase
     assert_args(1)
     vv = _values(0, fact, maps, fb)
     return if vv.nil?
-    Float(vv[0])
+    to_float(vv[0])
+  end
+
+  private
+
+  def to_float(value)
+    Float(value.to_s)
+  rescue ArgumentError, TypeError => e
+    raise(RuntimeError, "Cannot convert '#{value}' to Float in (to_float ...): #{e.message}")
   end
 end

data/lib/factbase/terms/to_integer.rb

@@ -23,6 +23,14 @@ class Factbase::ToInteger < Factbase::TermBase
     assert_args(1)
     vv = _values(0, fact, maps, fb)
     return if vv.nil?
-    Integer(vv[0])
+    to_integer(vv[0])
+  end
+
+  private
+
+  def to_integer(value)
+    Integer(value)
+  rescue ArgumentError, TypeError => e
+    raise(RuntimeError, "Cannot convert '#{value}' to Integer in (to_integer ...): #{e.message}")
   end
 end

data/lib/factbase/version.rb

@@ -8,5 +8,5 @@
 # Copyright:: Copyright (c) 2024-2026 Yegor Bugayenko
 # License:: MIT
 class Factbase
-  VERSION = '0.19.13' unless const_defined?(:VERSION)
+  VERSION = '0.19.15' unless const_defined?(:VERSION)
 end

data/lib/factbase.rb

@@ -17,7 +17,7 @@ require 'yaml'
 #  f = fb.insert # new fact created
 #  f.name = 'Jeff Lebowski'
 #  f.age = 42
-#  found = f.query('(gt 20 age)').each.to_a[0]
+#  found = fb.query('(gt 20 age)').each.to_a[0]
 #  assert(found.age == 42)
 #
 # Every fact is a key-value hash map. Every value is a non-empty set of values.

metadata

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