factbase 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7942029d876a9fee77f167bb9e9d7311445e16fa38c9654dfd6eae231fb9c366
-  data.tar.gz: 102f08927aafc6900d4563e90cbabb9311166307e1ca57a9bd4e484ff8be684a
+  metadata.gz: b1a1f43a45551ecd6d7dc96d1fc2d64e72b535ad92869f28b6efd1c2aafa6619
+  data.tar.gz: 716e6a3a3e44f7f91249feec8e385463eba0a1cc9ec695f361367d2ed6e0a5eb
 SHA512:
-  metadata.gz: d6877f4b3dbe627819256cda88214fd170e89e37521c2936daa0fed5a02b1450fc98157c53e92d2f38e48522dd617d901609ec1b23b96875abb68a7c231d5a47
-  data.tar.gz: 482f13ec05d51bf726049ed44627ec2719ee17b1a5b387eb7ebb6ee98a760523702f9f81540e6e10ff2dc211a90321742c5796cb63ef9ee4aa64fa6777886b81
+  metadata.gz: 92de5dea89b80df3856a438d0d045ea7de3c5a607295cc7d11615bc1e4d730e4e8de4fbdd710da8d3d33046917d35ef44f6c2ef768ce8f7a2210b2e8524de224
+  data.tar.gz: 2ef47978b1ebbe1736cf6b7b4a8d231823cb8c958bf602a015a7b4ea703448b70ec1fcfcb2e1a212b162e1f0967c088eb302f5452c135b7021caae08333212ac

data/.github/workflows/{license.yml → copyrights.yml}

@@ -18,40 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 ---
-name: license
+name: copyrights
 'on':
   push:
-    branches:
-      - master
   pull_request:
-    branches:
-      - master
 jobs:
-  license:
+  copyrights:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - shell: bash
-        run: |
-          header="Copyright (c) $(date +%Y) Yegor Bugayenko"
-          failed="false"
-          while IFS= read -r file; do
-            if ! grep -q "${header}" "${file}"; then
-              failed="true"
-              echo "⚠️ Copyright header is not found in: ${file}"
-            else
-              echo "File looks good: ${file}"
-            fi
-          done < <(find . -type f \( \
-            -name "Dockerfile" -o \
-            -name "LICENSE.txt" -o \
-            -name "Makefile" -o \
-            -name "Rakefile" -o \
-            -name "*.sh" -o \
-            -name "*.rb" -o \
-            -name "*.fe" -o \
-            -name "*.yml" \
-            \) -print)
-          if [ "${failed}" = "true" ]; then
-            exit 1
-          fi
+      - uses: yegor256/copyrights-action@0.0.4

data/Gemfile

@@ -28,7 +28,7 @@ gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.64.1', require: false
 gem 'rubocop-performance', '1.21.0', require: false
-gem 'rubocop-rspec', '2.30.0', require: false
+gem 'rubocop-rspec', '2.31.0', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -145,7 +145,7 @@ GEM
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.30.0)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -186,7 +186,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.2)
   rubocop (= 1.64.1)
   rubocop-performance (= 1.21.0)
-  rubocop-rspec (= 2.30.0)
+  rubocop-rspec (= 2.31.0)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   yard (= 0.9.36)

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,11 +49,19 @@ class Factbase::Looged
   end
 
   def query(query)
-    Query.new(@fb.query(query), query, @loog)
+    Query.new(@fb, query, @loog)
   end
 
   def txn(this = self, &)
-    @fb.txn(this, &)
+    before = @fb.size
+    tail = nil
+    r = @fb.txn(this) do |x|
+      tail = Factbase::Looged.elapsed do
+        yield x
+      end
+    end
+    @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
+    r
   end
 
   def export
@@ -106,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
@@ -117,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?
@@ -129,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
@@ -144,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.44'
+  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.
@@ -44,6 +45,25 @@ class TestLooged < Minitest::Test
     assert_equal(2, fb.size)
   end
 
+  def test_with_txn
+    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
     fb = Factbase.new
     fb.insert
@@ -92,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.44
+  version: 0.0.46
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -82,7 +82,7 @@ files:
 - ".gitattributes"
 - ".github/workflows/actionlint.yml"
 - ".github/workflows/codecov.yml"
-- ".github/workflows/license.yml"
+- ".github/workflows/copyrights.yml"
 - ".github/workflows/markdown-lint.yml"
 - ".github/workflows/pdd.yml"
 - ".github/workflows/rake.yml"