factbase 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ec04ca7c6bf83d50a09c6325e396685e6eb0d2590a4ffca5ccee1fcafa45f1
-  data.tar.gz: 3550dd7bff7f9ad854689b5c78571211454bf34c09ec0b32fd4b240fc509939c
+  metadata.gz: f62ac48c3d2c181b0064e519947fa2fed0ecb0b81660663c91319233eb2fc529
+  data.tar.gz: f3131120095c0ece6cb01313bad9f55d58145ee289dfc4a4f8bd7e949778521b
 SHA512:
-  metadata.gz: 5d2aa256c677f5d93fb9d41cfbe2548d83ebce3490da521d4a920f06ec774305c5850dc4dea71c76df2e2cda827db3c0292b21f0dae8dc9cee136e6e4cdfb3d3
-  data.tar.gz: 0e96d7968129d750e5e71940ff5f114bdd920b7ae417ad87cbcea1ef7746c66142c9f1e312980a08cdf2e4ec259747ea6da7f268b6f70c4292225a3b4e6d775d
+  metadata.gz: d7325ad6538622ef5e8764547314ac2970827b44eb70dd37acde333505bd630370bf4ccfe7d1b35916592b89b4dd346c82bcb0c2f2d7532994cfbef0d2a23467
+  data.tar.gz: eb8554fb580ec058551d6f4f43e47dac22ff13ee427195595a1d9f40caf7f51c59c0c697a849136618a625addf82f726b658752caf755b7eab84b3482a0a8b28

data/.github/workflows/rake.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12, windows-2022]
-        ruby: [3.2, 3.3]
+        ruby: [3.2]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

data/Gemfile.lock

@@ -71,13 +71,13 @@ GEM
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     racc (1.8.0)
-    rack (3.1.0)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -105,7 +105,7 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     rexml (3.3.0)
       strscan
@@ -141,8 +141,8 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -151,8 +151,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -165,7 +165,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
     strscan (3.1.0)
-    tago (0.0.1)
+    tago (0.0.2)
     thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/lib/factbase/looged.rb

@@ -54,17 +54,22 @@ class Factbase::Looged
   end
 
   def txn(this = self, &)
+    start = Time.now
     before = @fb.size
-    tail = nil
+    id = nil
+    rollback = false
     r = @fb.txn(this) do |fbt|
-      tail = Factbase::Looged.elapsed do
-        yield fbt
-      end
+      id = fbt.object_id
+      yield fbt
     rescue Factbase::Rollback => e
-      @loog.debug('Txn rolled back')
+      rollback = true
       raise e
     end
-    @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
+    if rollback
+      @loog.debug("Txn ##{id} rolled back in #{start.ago}")
+    else
+      @loog.debug("Txn ##{id} #{r ? 'modified' : 'didn\'t touch'} #{before} facts in #{start.ago}")
+    end
     r
   end
 

data/lib/factbase/rules.rb

@@ -24,18 +24,30 @@ require_relative '../factbase'
 require_relative '../factbase/syntax'
 
 # A decorator of a Factbase, that checks rules on every set.
+#
+# Say, you want every fact to have +foo+ property. You want any attempt
+# to insert a fact without this property to lead to a runtime error. Here is how:
+#
+#  fb = Factbase.new
+#  fb = Factabase::Rules.new(fb, '(exists foo)')
+#  fb.txn do |fbt|
+#    f = fbt.insert
+#    f.bar = 3
+#  end # Runtime exception here (transaction won't commit)
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Factbase::Rules
-  def initialize(fb, rules, check = Check.new(rules))
+  def initialize(fb, rules, check = Check.new(rules), uid: nil)
     @fb = fb
     @rules = rules
     @check = check
+    @uid = uid
   end
 
   def dup
-    Factbase::Rules.new(@fb.dup, @rules, @check)
+    Factbase::Rules.new(@fb.dup, @rules, @check, uid: @uid)
   end
 
   def size
@@ -52,15 +64,16 @@ class Factbase::Rules
 
   def txn(this = self, &)
     before = @check
-    @check = Blind.new
-    modified = @fb.txn(this, &)
-    @check = before
-    if modified
-      @fb.query('(always)').each do |f|
+    later = Later.new(@uid)
+    @check = later
+    @fb.txn(this) do |fbt|
+      yield fbt
+      @check = before
+      fbt.query('(always)').each do |f|
+        next unless later.include?(f)
         @check.it(f)
       end
     end
-    modified
   end
 
   def export
@@ -88,7 +101,7 @@ class Factbase::Rules
     def method_missing(*args)
       r = @fact.method_missing(*args)
       k = args[0].to_s
-      @check.it(self) if k.end_with?('=')
+      @check.it(@fact) if k.end_with?('=')
       r
     end
 
@@ -143,9 +156,19 @@ class Factbase::Rules
   # Check one fact (never complaining).
   #
   # This is an internal class, it is not supposed to be instantiated directly.
-  class Blind
-    def it(_fact)
-      true
+  class Later
+    def initialize(uid)
+      @uid = uid
+      @facts = Set.new
+    end
+
+    def it(fact)
+      @facts << fact.send(@uid) unless @uid.nil?
+    end
+
+    def include?(fact)
+      return true if @uid.nil?
+      @facts.include?(fact.send(@uid))
     end
   end
 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.49'
+  VERSION = '0.0.50'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/test_looged.rb

@@ -63,6 +63,7 @@ class TestLooged < Minitest::Test
     assert(!fb.txn { raise Factbase::Rollback })
     assert_equal(0, fb.size)
     assert(log.to_s.include?('rolled back'), log)
+    assert(!log.to_s.include?('didn\'t touch'), log)
   end
 
   def test_with_modifying_txn

data/test/factbase/test_rules.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/rules'
+require_relative '../../lib/factbase/pre'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -66,6 +67,18 @@ class TestRules < Minitest::Test
     assert(ok)
   end
 
+  def test_rollback_on_violation
+    fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
+    assert_raises do
+      fb.txn do |fbt|
+        f = fbt.insert
+        f.a = 1
+        f.c = 2
+      end
+    end
+    assert_equal(0, fb.size)
+  end
+
   def test_in_combination_with_pre
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
     fb = Factbase::Pre.new(fb) do |f|
@@ -81,6 +94,6 @@ class TestRules < Minitest::Test
       end
     end
     assert(ok)
-    assert_equal(1, fb.query('(eq hello 42)').each.to_a.size)
+    assert_equal(0, fb.query('(eq hello 42)').each.to_a.size)
   end
 end

metadata

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