factbase 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88beb6f254052cd02b10e5c562bf1fe940c3a488274cbab3f4fcc61ef8ede0a7
-  data.tar.gz: 983417ddfaf3f8b2f4930f1bb4565e4bc9d19d84ad26636df39d7bbc810ac3c1
+  metadata.gz: c672da652030c0c4a1405ce4d84b91e0ca776d342d1418be9b01d18ea6d70703
+  data.tar.gz: '068e446b24c80857c7c26724b22bd58d8644f8fa6db76223eb786d00fb422e1a'
 SHA512:
-  metadata.gz: 577a14d1021f170224be23a8afe4427a30565c2a78356e21f582031f80a65f44e314270e1e152c4d929f7b2b92e39cecccdca1c01bb37ebb1071b77e80170288
-  data.tar.gz: 956b6147cf616f2376ffffd6a171b75e129f268e4c9858ba85270f2fde86e7686601f346cfbd40487f4c03562c065ce5a105a730b2b9f4e21bbd0fcc3f07113d
+  metadata.gz: f3cc8aae4d769dc4103a5501d4ff8e3093dbbdb0084b3f705d0b8d4dc70667f7828ae7bc39585e68c45891c94a926828e899110e34f3a76aad918e8acf9f319c
+  data.tar.gz: 062e0dc1dd5f90e5d9555baa2f2d79f957180d2a1c823a35bb296db43708d9feacb9f9b1465c0bfc411245aeba981dee0a902d22c806febf99f6676911354a7d

data/Gemfile.lock

@@ -14,23 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionpack (7.2.2.1)
+      actionview (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
+      racc
+      rack (>= 2.2.4, < 3.2)
       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.1)
-      activesupport (= 8.0.1)
+    actionview (7.2.2.1)
+      activesupport (= 7.2.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.1)
+    activesupport (7.2.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -42,7 +43,6 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
     ansi (1.5.0)
     ast (2.4.2)
     backtrace (0.4.0)
@@ -114,9 +114,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 (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -189,11 +189,10 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
     useragent (0.16.11)
     yaml (0.4.0)
     yard (0.9.37)
-    zeitwerk (2.7.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22

data/README.md

@@ -184,19 +184,19 @@ This is the result of the benchmark:
 
 <!-- benchmark_begin -->
 | Action | Seconds | Details |
-| --- | --: | --: |
-| `fb.insert()` | 7.800 | Inserted 100000 facts |
-| `(gt time '2024-03-23T03:21:43Z')` | 0.070 | Found 100000 fact(s) |
-| `(gt cost 50)` | 0.072 | Found 49779 fact(s) |
-| `(eq title 'Object Thinking 5000')` | 0.050 | Found 1 fact(s) |
-| `(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))` | 0.060 | Found 0 fact(s) |
+| --- | --: | --- |
+| `fb.insert()` | 7.874 | Inserted 100000 facts |
+| `(gt time '2024-03-23T03:21:43Z')` | 0.072 | Found 100000 fact(s) |
+| `(gt cost 50)` | 0.069 | Found 50030 fact(s) |
+| `(eq title 'Object Thinking 5000')` | 0.051 | Found 1 fact(s) |
+| `(and (eq foo 42.998) (or (gt bar 200) (absent zzz)))` | 0.059 | Found 2 fact(s) |
 | `(eq id (agg (always) (max id)))` | 0.131 | Found 1 fact(s) |
-| `(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))` | 0.708 | Found 100000 fact(s) |
-| `.export()` + `.import()` | 2.110 | 11407716 bytes |
+| `(join "c<=cost,b<=bar" (eq id (agg (always) (max id))))` | 0.695 | Found 100000 fact(s) |
+| `.export()` + `.import()` | 1.931 | 11407636 bytes |
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-01-27 at 16:25,
+on 2025-01-27 at 16:51,
 on Linux with 4 CPUs.
 <!-- benchmark_end -->
 
-[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/12993508174
+[benchmark-gha]: https://github.com/yegor256/factbase/actions/runs/12994018323

data/lib/factbase/syntax.rb

@@ -45,6 +45,11 @@ require_relative 'term_once'
 # License:: MIT
 class Factbase::Syntax
   # Ctor.
+  #
+  # The class provided as the +term+ argument must have a three-argument
+  # constructor, similar to the class +Factbase::Term+. Also, it must be
+  # a child of +Factbase::Term+.
+  #
   # @param [Factbase] fb Factbase
   # @param [String] query The query, for example "(eq id 42)"
   # @param [Class] term The class to instantiate to make every term
@@ -64,7 +69,7 @@ class Factbase::Syntax
         t
       end
   rescue StandardError => e
-    err = "#{e.message} (#{e.backtrace[1]}) in \"#{@query}\""
+    err = "#{e.message} (#{e.backtrace.take(5).join('; ')}) in \"#{@query}\""
     err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
     raise err
   end
@@ -77,10 +82,10 @@ class Factbase::Syntax
     @tokens ||= to_tokens
     raise 'No tokens' if @tokens.empty?
     @ast ||= to_ast(@tokens, 0)
-    raise 'Too many terms' if @ast[1] != @tokens.size
+    raise "Too many terms (#{@ast[1]} != #{@tokens.size})" if @ast[1] != @tokens.size
     term = @ast[0]
     raise 'No terms found' if term.nil?
-    raise 'Not a term' unless term.is_a?(@term)
+    raise "Not a term: #{@term.class.name.inspect}" unless term.is_a?(@term)
     term
   end
 
@@ -164,7 +169,7 @@ class Factbase::Syntax
       elsif t.match?(/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/)
         Time.parse(t)
       else
-        raise "Wrong symbol format (#{t})" unless t.match?(/^[_a-z\$][a-zA-Z0-9_]*$/)
+        raise "Wrong symbol format (#{t})" unless t.match?(/^([_a-z][a-zA-Z0-9_]*|\$[a-z]+)$/)
         t.to_sym
       end
     end

data/lib/factbase.rb

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

data/test/factbase/test_syntax.rb

@@ -114,6 +114,7 @@ class TestSyntax < Minitest::Test
       '',
       '()',
       '(foo',
+      '(foo $)',
       '(foo 1) (bar 2)',
       'some text',
       '"hello, world!',

data/test/test_factbase.rb

@@ -294,20 +294,21 @@ class TestFactbase < Minitest::Test
   # See details here https://github.com/yegor256/factbase/actions/runs/10492255419/job/29068637032
   def test_concurrent_transactions_inserts
     skip('Does not work')
+    total = 100
     fb = Factbase.new
-    Threads.new(100).assert do |i|
+    Threads.new(total).assert do |i|
       fb.txn do |fbt|
         fact = fbt.insert
         fact.thread_id = i
       end
     end
-    assert_equal(100, fb.size)
-    assert_equal(100, fb.query('(exists thread_id)').each.to_a.size)
+    assert_equal(total, fb.size)
+    assert_equal(total, fb.query('(exists thread_id)').each.to_a.size)
   end
 
   def test_concurrent_transactions_with_rollbacks
     fb = Factbase.new
-    Threads.new(100).assert do |i|
+    Threads.new.assert do |i|
       fb.txn do |fbt|
         fact = fbt.insert
         fact.thread_id = i
@@ -319,7 +320,8 @@ class TestFactbase < Minitest::Test
 
   def test_concurrent_transactions_successful
     fb = Factbase.new
-    Threads.new(100).assert do |i|
+    total = 100
+    Threads.new(total).assert do |i|
       fb.txn do |fbt|
         fact = fbt.insert
         fact.thread_id = i
@@ -327,7 +329,7 @@ class TestFactbase < Minitest::Test
       end
     end
     facts = fb.query('(exists thread_id)').each.to_a
-    assert_equal(100, facts.size)
+    assert_equal(total, facts.size)
     facts.each do |fact|
       assert_equal(fact.value, fact.thread_id * 10)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace