factbase 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88beb6f254052cd02b10e5c562bf1fe940c3a488274cbab3f4fcc61ef8ede0a7
-  data.tar.gz: 983417ddfaf3f8b2f4930f1bb4565e4bc9d19d84ad26636df39d7bbc810ac3c1
+  metadata.gz: f4cc974ce82891e109f03740f7562f798e955da874dc2b1a91b0858bda7206b0
+  data.tar.gz: 7aac5d75a5e10fca5a6f74e9fc2e5b83ecaf9cc9d669e3384c52b508b732b45f
 SHA512:
-  metadata.gz: 577a14d1021f170224be23a8afe4427a30565c2a78356e21f582031f80a65f44e314270e1e152c4d929f7b2b92e39cecccdca1c01bb37ebb1071b77e80170288
-  data.tar.gz: 956b6147cf616f2376ffffd6a171b75e129f268e4c9858ba85270f2fde86e7686601f346cfbd40487f4c03562c065ce5a105a730b2b9f4e21bbd0fcc3f07113d
+  metadata.gz: 436eb0bc06eabc25825b36fdf8293f2654219e42a0470512d42bc075670a25d51936006303a67a4c183b7208ef1a9c8a940ab227af838fc4b4f8ae8020be4c4e
+  data.tar.gz: e7ea774220cdef5e471cb66c666c3cea20ee0672991b1e0fa5797b60f31e5430c9a0e9b4a40298d68654d067b1c1c1c8318fff492ba0162217cdb9724af8133e

data/Gemfile.lock

@@ -157,7 +157,7 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)

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

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'backtrace'
 require 'time'
 require_relative '../factbase'
 require_relative 'fact'
@@ -45,12 +46,19 @@ 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
   def initialize(fb, query, term: Factbase::Term)
     @fb = fb
     @query = query
+    raise "Term must be a Class, while #{term.class.name} provided" unless term.is_a?(Class)
+    raise "The 'term' must be a child of Factbase::Term, while #{term.name} provided" unless term <= Factbase::Term
     @term = term
   end
 
@@ -64,7 +72,7 @@ class Factbase::Syntax
         t
       end
   rescue StandardError => e
-    err = "#{e.message} (#{e.backtrace[1]}) in \"#{@query}\""
+    err = "#{e.message} (#{Backtrace.new(e)}) in \"#{@query}\""
     err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
     raise err
   end
@@ -77,11 +85,11 @@ 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
-    term = @ast[0]
-    raise 'No terms found' if term.nil?
-    raise 'Not a term' unless term.is_a?(@term)
-    term
+    raise "Too many terms (#{@ast[1]} != #{@tokens.size})" if @ast[1] != @tokens.size
+    t = @ast[0]
+    raise 'No terms found in the AST' if t.nil?
+    raise "#{t.class.name} is not an instance of #{@term}, thus not a proper term" unless t.is_a?(@term)
+    t
   end
 
   # Reads the stream of tokens, starting at the +at+ position. If the
@@ -109,7 +117,9 @@ class Factbase::Syntax
       operands << operand
       break if tokens[at] == :close
     end
-    [Factbase::TermOnce.new(@term.new(@fb, op, operands), @fb.cache), at + 1]
+    t = @term.new(@fb, op, operands)
+    t = Factbase::TermOnce.new(t, @fb.cache) if t.instance_of?(Factbase::Term)
+    [t, at + 1]
   end
 
   # Turns a query into an array of tokens.
@@ -164,7 +174,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.2'
 
   # 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!',
@@ -144,4 +145,26 @@ class TestSyntax < Minitest::Test
       assert_equal(t, Factbase::Syntax.new(Factbase.new, s).to_term.to_s)
     end
   end
+
+  def test_fails_when_term_is_not_a_class
+    assert_raises(StandardError) { Factbase::Syntax.new(Factbase.new, '(foo 1)', term: 'hello') }
+  end
+
+  def test_fails_when_term_is_wrong_class
+    assert_raises(StandardError) { Factbase::Syntax.new(Factbase.new, '(bar 1)', term: String).to_term }
+  end
+
+  def test_fails_when_term_is_incorrectly_defined_class
+    assert_includes(
+      assert_raises(StandardError) { Factbase::Syntax.new(Factbase.new, '(bar 1)', term: FakeTerm).to_term }.message,
+      'wrong number of arguments'
+    )
+  end
+
+  class FakeTerm < Factbase::Term
+    def initialize(invalid)
+      super
+      @x = invalid
+    end
+  end
 end

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.2
 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