factbase 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f50658ed4f005f217ac62d0d7915a02bda424b81b27b8fd28c04d72a87720f42
-  data.tar.gz: 96593b68ec2ead36739708e150794a640786f76bb015476a90f80814f0f211fb
+  metadata.gz: b1a1f43a45551ecd6d7dc96d1fc2d64e72b535ad92869f28b6efd1c2aafa6619
+  data.tar.gz: 716e6a3a3e44f7f91249feec8e385463eba0a1cc9ec695f361367d2ed6e0a5eb
 SHA512:
-  metadata.gz: 5595f2de94f831ed456771bfbf52efb86b2c3e29be426923dadcdee51389983ef2bedd2e41cdccb5246b91682cc7bb47164f7bf8adefbd2cf08f76812e8412a7
-  data.tar.gz: ccbf0464b43eb277c497e27f3827c7cd3051fc94e34c727c4c258d3a999d717a600635eda52c62a874165eb3bf7804a0665edbe1bdaf7eca47aa1e568db9bc17
+  metadata.gz: 92de5dea89b80df3856a438d0d045ea7de3c5a607295cc7d11615bc1e4d730e4e8de4fbdd710da8d3d33046917d35ef44f6c2ef768ce8f7a2210b2e8524de224
+  data.tar.gz: 2ef47978b1ebbe1736cf6b7b4a8d231823cb8c958bf602a015a7b4ea703448b70ec1fcfcb2e1a212b162e1f0967c088eb302f5452c135b7021caae08333212ac

data/lib/factbase/looged.rb

@@ -22,6 +22,7 @@
 
 require 'time'
 require 'loog'
+require_relative 'syntax'
 
 # A decorator of a Factbase, that logs all operations.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -48,17 +49,18 @@ class Factbase::Looged
   end
 
   def query(query)
-    Query.new(@fb.query(query), query, @loog)
+    Query.new(@fb, query, @loog)
   end
 
   def txn(this = self, &)
-    r = false
-    @fb.txn(this) do |x|
+    before = @fb.size
+    tail = nil
+    r = @fb.txn(this) do |x|
       tail = Factbase::Looged.elapsed do
-        r = yield x
+        yield x
       end
-      @loog.debug("Txn #{r ? 'modified' : 'did nothing'} #{tail}")
     end
+    @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
     r
   end
 
@@ -113,8 +115,8 @@ class Factbase::Looged
   # This is an internal class, it is not supposed to be instantiated directly.
   #
   class Query
-    def initialize(query, expr, loog)
-      @query = query
+    def initialize(fb, expr, loog)
+      @fb = fb
       @expr = expr
       @loog = loog
     end
@@ -124,7 +126,7 @@ class Factbase::Looged
       if block_given?
         r = nil
         tail = Factbase::Looged.elapsed do
-          r = @query.each(&)
+          r = @fb.query(@expr).each(&)
         end
         raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
@@ -136,7 +138,7 @@ class Factbase::Looged
       else
         array = []
         tail = Factbase::Looged.elapsed do
-          @query.each do |f|
+          @fb.query(@expr).each do |f|
             array << f
           end
         end
@@ -151,14 +153,17 @@ class Factbase::Looged
 
     def delete!
       r = nil
+      before = @fb.size
       tail = Factbase::Looged.elapsed do
-        r = @query.delete!
+        r = @fb.query(@expr).delete!
       end
       raise ".delete! of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
-      if r.zero?
-        @loog.debug("Nothing deleted by '#{@expr}' #{tail}")
+      if before.zero?
+        @loog.debug("There were no facts, nothing deleted by '#{@expr}' #{tail}")
+      elsif r.zero?
+        @loog.debug("No facts out of #{before} deleted by '#{@expr}' #{tail}")
       else
-        @loog.debug("Deleted #{r} fact(s) by '#{@expr}' #{tail}")
+        @loog.debug("Deleted #{r} fact(s) out of #{before} by '#{@expr}' #{tail}")
       end
       r
     end

data/lib/factbase.rb

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

data/test/factbase/test_looged.rb

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require 'loog'
+require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/looged'
 
 # Test.
@@ -45,13 +46,22 @@ class TestLooged < Minitest::Test
   end
 
   def test_with_txn
-    fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
     assert(
       fb.txn do |fbt|
         fbt.insert.foo = 42
       end
     )
     assert_equal(1, fb.size)
+    assert(log.to_s.include?('modified'), log)
+  end
+
+  def test_with_empty_txn
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
+    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert(log.to_s.include?('didn\'t touch'), log)
   end
 
   def test_returns_int
@@ -102,7 +112,7 @@ class TestLooged < Minitest::Test
       'Set \'bar\' to 3 (Integer)',
       'Set \'str\' to "Он поскорей звонит. Вбегает\n   ... Отъехать в поле к двум дубкам." (String)',
       'Found 1 fact(s) by \'(exists bar)\'',
-      'Deleted 3 fact(s) by \'(not (exists bar))\''
+      'Deleted 3 fact(s) out of 4 by \'(not (exists bar))\''
     ].each do |s|
       assert(log.to_s.include?(s), "#{log}\n")
     end

data/test/test_factbase.rb

@@ -72,6 +72,14 @@ class TestFactbase < Minitest::Test
     assert_equal(2, fb2.size)
   end
 
+  def test_txn_returns_boolean
+    fb = Factbase.new
+    assert(fb.txn { true }.is_a?(FalseClass))
+    assert(fb.txn(&:insert).is_a?(TrueClass))
+    assert(fb.txn { |fbt| fbt.insert.bar = 42 })
+    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a })
+  end
+
   def test_run_txn
     fb = Factbase.new
     fb.txn do |fbt|

metadata

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