factbase 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129d17fba6d19bc5131f853d6b90c2e963187e84626270be4f7766e926d4c2c9
-  data.tar.gz: 4196611d541b81bdc1a73bf31f4b1fe15077ad702d8d1ec558f0f61d5e530396
+  metadata.gz: 0ea2fe8670484d4eb3eac59caa947b547863a2106fa6ae771b8e9447b30573dc
+  data.tar.gz: b45d41378d4b61f0b3d8d01a3454819a4eca7724bd81adda7fe083c9594250ef
 SHA512:
-  metadata.gz: 1d87ddb11c2252043c963c6e086a617f216bc15a79441cfa121a0e3de3157f31705cfd1bfea7b6b89996488c76805ee27152f4be00627c7d3f3e1d506636c303
-  data.tar.gz: 5e913f0d675f19fc03cc83c80301af5fd390de8cdaf730a0ea2612768ae0056286be7f5f42686616ee0b1fc69cf22adc0009e9df5315251971e9c948da5ee739
+  metadata.gz: 40d6ca4cce2c4d64fe5e31b609c2fd15d05041358b8ae3be266c991f943ce242217378a8e83f96d8be83c50068fb65e04dff8c8c24708eeea8f79490e283c817
+  data.tar.gz: d09b19ac55775c511c0619b0a23be1260496f33d623927153e0b5b373b6919570a9f47104c0e2b1125299799f561e2b6fb39b2cb6ea5486b48ab76a05e15bfd1

data/Gemfile

@@ -26,7 +26,7 @@ gemspec
 gem 'minitest', '5.23.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
-gem 'rubocop', '1.64.0', require: false
+gem 'rubocop', '1.64.1', require: false
 gem 'rubocop-performance', '1.21.0', require: false
 gem 'rubocop-rspec', '2.29.2', require: false
 gem 'simplecov', '0.22.0', require: false

data/Gemfile.lock

@@ -70,7 +70,7 @@ GEM
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.24.0)
-    parser (3.3.1.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
@@ -125,7 +125,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -184,7 +184,7 @@ DEPENDENCIES
   minitest (= 5.23.1)
   rake (= 13.2.1)
   rspec-rails (= 6.1.2)
-  rubocop (= 1.64.0)
+  rubocop (= 1.64.1)
   rubocop-performance (= 1.21.0)
   rubocop-rspec (= 2.29.2)
   simplecov (= 0.22.0)

data/lib/factbase/query.rb

@@ -26,12 +26,17 @@ require_relative 'fact'
 
 # Query.
 #
-# This is an internal class, it is not supposed to be instantiated directly.
+# This is an internal class, it is not supposed to be instantiated directly. It
+# is created by the +query()+ method of the +Factbase+ class.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Factbase::Query
+  # Constructor.
+  # @param [Array<Fact>] maps Array of facts to start with
+  # @param [Mutex] mutex Mutex to sync all modifications to the +maps+
+  # @param [String] query The query as a string
   def initialize(maps, mutex, query)
     @maps = maps
     @mutex = mutex
@@ -48,7 +53,9 @@ class Factbase::Query
     @maps.each do |m|
       f = Factbase::Fact.new(@mutex, m)
       r = term.evaluate(f, @maps)
-      raise 'Unexpected evaluation result, must be boolean' unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
+      unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
+        raise "Unexpected evaluation result (#{r.class}), must be Boolean at #{@query}"
+      end
       next unless r
       yield f
       yielded += 1

data/lib/factbase/term.rb

@@ -66,7 +66,9 @@ class Factbase::Term
   def evaluate(fact, maps)
     send(@op, fact, maps)
   rescue NoMethodError => e
-    raise "Term '#{@op}' is not defined: #{e.message}"
+    raise "Term '#{@op}' is not defined at #{self}: #{e.message}"
+  rescue StandardError => e
+    raise "#{e.message} at #{self}"
   end
 
   # Simplify it if possible.
@@ -111,19 +113,19 @@ class Factbase::Term
 
   def not(fact, maps)
     assert_args(1)
-    !only_bool(the_values(0, fact, maps))
+    !only_bool(the_values(0, fact, maps), 0)
   end
 
   def or(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return true if only_bool(the_values(i, fact, maps))
+      return true if only_bool(the_values(i, fact, maps), 0)
     end
     false
   end
 
   def and(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return false unless only_bool(the_values(i, fact, maps))
+      return false unless only_bool(the_values(i, fact, maps), 0)
     end
     true
   end
@@ -339,6 +341,7 @@ class Factbase::Term
   end
 
   def agg(_fact, maps)
+    assert_args(2)
     selector = @operands[0]
     raise "A term expected, but #{selector} provided" unless selector.is_a?(Factbase::Term)
     term = @operands[1]
@@ -374,10 +377,12 @@ class Factbase::Term
     v
   end
 
-  def only_bool(val)
+  def only_bool(val, pos)
     val = val[0] if val.is_a?(Array)
     return false if val.nil?
-    raise "Boolean expected, while #{val.class} received" unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
+    unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
+      raise "Boolean expected, while #{val.class} received from #{@operands[pos]}"
+    end
     val
   end
 

data/lib/factbase.rb

@@ -79,12 +79,13 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.40'
+  VERSION = '0.0.41'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
 
   # Constructor.
+  # @param [Array<Hash>] facts Array of facts to start with
   def initialize(facts = [])
     @maps = facts
     @mutex = Mutex.new

data/test/factbase/test_term.rb

@@ -183,6 +183,22 @@ class TestTerm < Minitest::Test
     assert_equal([42], t.evaluate(fact('foo' => 4), []))
   end
 
+  def test_report_missing_term
+    t = Factbase::Term.new(:something, [])
+    msg = assert_raises do
+      t.evaluate(fact, [])
+    end.message
+    assert(msg.include?('not defined at (something)'), msg)
+  end
+
+  def test_report_other_error
+    t = Factbase::Term.new(:at, [])
+    msg = assert_raises do
+      t.evaluate(fact, [])
+    end.message
+    assert(msg.include?('at (at)'), msg)
+  end
+
   private
 
   def fact(map = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json