factbase 0.0.48 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a6a221e2344538c324a601f49ad655f4d5e3b6682b5e717e8f798a6eb46030
-  data.tar.gz: 94bb595173fbea968c4a8e8af2b8d6cf08689127e2dfd2c2c296420659da5304
+  metadata.gz: f62ac48c3d2c181b0064e519947fa2fed0ecb0b81660663c91319233eb2fc529
+  data.tar.gz: f3131120095c0ece6cb01313bad9f55d58145ee289dfc4a4f8bd7e949778521b
 SHA512:
-  metadata.gz: fe4eb95604ae3ba22d24ef01a4c86b1dcdf4c9b3ff38969cbc459653a6a72a201d317bdf86f71c22206c771deebb5511ba1c64ce014c77fdf995e18926646fa2
-  data.tar.gz: b48c9c7243f74713bcf5b9fbad3f0ef901aa79d107d7be78e3d08d9970e898a21f9bb4938cfaac5057edc11c53150b0934a46b125019c132906114a702c90d89
+  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

@@ -5,14 +5,15 @@ PATH
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
+      tago (~> 0.0)
       yaml (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -20,13 +21,13 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -39,8 +40,8 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
+    builder (3.3.0)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.1)
@@ -69,14 +70,14 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -91,9 +92,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -104,10 +105,10 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.0)
@@ -138,10 +139,10 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-capybara (2.21.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)
@@ -150,8 +151,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -164,6 +165,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
     strscan (3.1.0)
+    tago (0.0.2)
     thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/factbase.gemspec

@@ -42,9 +42,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'json', '~> 2.7'
+  s.add_runtime_dependency 'json', '~>2.7'
   s.add_runtime_dependency 'loog', '~>0.2'
-  s.add_runtime_dependency 'nokogiri', '~> 1.10'
-  s.add_runtime_dependency 'yaml', '~> 0.3'
+  s.add_runtime_dependency 'nokogiri', '~>1.10'
+  s.add_runtime_dependency 'tago', '~>0.0'
+  s.add_runtime_dependency 'yaml', '~>0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/looged.rb

@@ -22,6 +22,7 @@
 
 require 'time'
 require 'loog'
+require 'tago'
 require_relative 'syntax'
 
 # A decorator of a Factbase, that logs all operations.
@@ -53,14 +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
+      rollback = true
+      raise e
+    end
+    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
-    @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
     r
   end
 
@@ -172,6 +181,6 @@ class Factbase::Looged
   def self.elapsed
     start = Time.now
     yield
-    "in #{format('%.2f', (Time.now - start) * 1000)}ms"
+    "in #{start.ago}"
   end
 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.48'
+  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_flatten.rb

@@ -30,8 +30,8 @@ require_relative '../../lib/factbase/flatten'
 # License:: MIT
 class TestFlatten < Minitest::Test
   def test_mapping
-    maps = [{ 'b' => [42] }, { 'a' => 33 }, { 'c' => %w[hey you] }]
-    to = Factbase::Flatten.new(maps).it
+    maps = [{ 'b' => [42], 'i' => 1 }, { 'a' => 33, 'i' => 0 }, { 'c' => %w[hey you], 'i' => 2 }]
+    to = Factbase::Flatten.new(maps, 'i').it
     assert(33, to[0]['a'])
     assert(42, to[1]['b'])
     assert(2, to[2]['c'].size)

data/test/factbase/test_looged.rb

@@ -57,6 +57,15 @@ class TestLooged < Minitest::Test
     assert(log.to_s.include?('modified'), log)
   end
 
+  def test_with_txn_rollback
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
+    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
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)

data/test/factbase/test_query.rb

@@ -46,11 +46,13 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'num' => 42, 'name' => 'Jeff' }
     maps << { 'pi' => 3.14, 'num' => [42, 66, 0], 'name' => 'peter' }
-    maps << { 'time' => Time.now - 100, 'num' => 0, 'hi' => [4] }
+    maps << { 'time' => Time.now - 100, 'num' => 0, 'hi' => [4], 'nome' => ['Walter'] }
     {
       '(eq num 444)' => 0,
+      '(eq hi 4)' => 1,
       '(eq time 0)' => 0,
       '(gt num 60)' => 1,
+      '(gt hi 3)' => 1,
       "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
       '(eq pi +3.14)' => 1,
@@ -70,6 +72,7 @@ class TestQuery < Minitest::Test
       '(and (one pi) (eq pi (div -6.28 -2)))' => 1,
       '(gt (size num) 2)' => 1,
       '(matches name "^[a-z]+$")' => 1,
+      '(matches nome "^Walter$")' => 1,
       '(lt (size num) 2)' => 2,
       '(eq (size _hello) 0)' => 3,
       '(eq num pi)' => 0,

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.48
+  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
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: tago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: yaml
   requirement: !ruby/object:Gem::Requirement