factbase 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eee04582fea6db79e1c3bb37fed1b2beb634b3f8ae48b064e8836e97b3efb79
-  data.tar.gz: 82baa1bd13c66af88013dd14d3843a9b2d486d93dcc9c45cb634ea595a39a123
+  metadata.gz: 0d2252eb6486a27fae259f1e5d9d9819834da9f061984aa6da8cbfefb90fc4bc
+  data.tar.gz: 163de1b9c732b765eecdea82ed4bcef852db7399552fd27e8ae99ab1867f7d2d
 SHA512:
-  metadata.gz: d3e7d5bc5868230e0de935ea33e118475d6b17cb4c38e0814bbfb8537914af1677d29b0ba6dd91813bf40a17d8844323cf82008b01de56e412e279afc2e7bf56
-  data.tar.gz: dc0b12bf9ad9545f421a439a00e52635ca489d849122faad7f3b43fc71659f02eafaee1e0f60796061f6c483cf8bd22ebfd9ddd0bec1040c8c9561fc8a709475
+  metadata.gz: b554524f236df891c30c6ca120941914b6a2a4361af5f903244405421b1ffb96b47efd2a71b7426e3fa08c73f7d1aeb06081cf8945e64779d8f6c0a23d0efcff
+  data.tar.gz: 742d5b0abe98a24d893cd7a658175fdfa69c94063efb85e9ed517e449245155f9b6a183b866284921529f2da595e39a398efa3787098ce55785f7cb071144364

data/lib/factbase/logged.rb

@@ -60,7 +60,7 @@ class Factbase::Logged
     if rollback
       @tube.say(start, "Txn ##{id} rolled back in #{start.ago}")
     else
-      @tube.say(start, "Txn ##{id} touched #{r} in #{start.ago}")
+      @tube.say(start, "Txn ##{id} touched #{r.zero? ? 'nothing' : r} in #{start.ago}")
     end
     r
   end

data/lib/factbase/tallied.rb

@@ -36,8 +36,18 @@ class Factbase::Tallied
   end
 
   def txn
+    before = @churn.dup
+    commit = false
     @fb.txn do |fbt|
-      yield Factbase::Tallied.new(fbt, @churn)
+      catch :rollback do
+        yield Factbase::Tallied.new(fbt, @churn)
+        commit = true
+      end
+    rescue Factbase::Rollback => e
+      @churn = before
+      raise e
+    ensure
+      @churn = before unless commit
     end
   end
 

data/lib/factbase/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.16.3' unless const_defined?(:VERSION)
+  VERSION = '0.16.4' unless const_defined?(:VERSION)
 end

data/lib/factbase.rb

@@ -175,6 +175,8 @@ class Factbase
       end
     require_relative 'factbase/taped'
     taped = Factbase::Taped.new(before)
+    require_relative 'factbase/churn'
+    churn = Factbase::Churn.new
     catch :commit do
       require_relative 'factbase/light'
       commit = false
@@ -182,12 +184,10 @@ class Factbase
         yield Factbase::Light.new(Factbase.new(taped))
         commit = true
       end
-      return 0 unless commit
+      return churn unless commit
     rescue Factbase::Rollback
-      return 0
+      return churn
     end
-    require_relative 'factbase/churn'
-    churn = Factbase::Churn.new
     seen = []
     garbage = []
     taped.deleted.each do |oid|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Yegor Bugayenko