factbase 0.16.2 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba34d6b5b9a1744ae6600684ad71297a340dced1caa385d85bc1f46790cf200
-  data.tar.gz: 2cb3a384559e9d7451adcef94891d97f4314532611a83d55b1bde2f124124930
+  metadata.gz: 0d2252eb6486a27fae259f1e5d9d9819834da9f061984aa6da8cbfefb90fc4bc
+  data.tar.gz: 163de1b9c732b765eecdea82ed4bcef852db7399552fd27e8ae99ab1867f7d2d
 SHA512:
-  metadata.gz: 8399dd7490033d036d092121216f9d58c07bd402b40ea7014445c2f215f2e6a6db8e206461dc6ef0aee47225b81d77c792acdf88652d7f79016e596c457cf61c
-  data.tar.gz: 5cccc18f353a9a93866d624ac4b3f03b6a32b820f7c83d6179f23b6f72b0a5b791f94382f61546d7910cea85aafde7b6fe824c5ae92e58bbf02f2e97a6d4c458
+  metadata.gz: b554524f236df891c30c6ca120941914b6a2a4361af5f903244405421b1ffb96b47efd2a71b7426e3fa08c73f7d1aeb06081cf8945e64779d8f6c0a23d0efcff
+  data.tar.gz: 742d5b0abe98a24d893cd7a658175fdfa69c94063efb85e9ed517e449245155f9b6a183b866284921529f2da595e39a398efa3787098ce55785f7cb071144364

data/lib/factbase/fact_as_yaml.rb

@@ -37,14 +37,26 @@ class Factbase::FactAsYaml
     hash.sort.to_h.map do |k, vv|
       [
         k,
-        ': [',
-        vv.map do |v|
-          v = v.ellipsized if v.is_a?(String)
-          v = v.utc.iso8601 if v.is_a?(Time)
-          v
-        end.map(&:inspect).join(', '),
-        ']'
-      ].join
+        ': ',
+        if vv.one?
+          v_to_s(vv.first)
+        else
+          [
+            '[',
+            vv.map { |v| v_to_s(v) }.join(', '),
+            ']'
+          ]
+        end
+      ].zip.join
     end.join("\n")
   end
+
+  private
+
+  def v_to_s(val)
+    s = val
+    s = s.inspect.ellipsized if s.is_a?(String)
+    s = s.utc.iso8601 if s.is_a?(Time)
+    s
+  end
 end

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.2' 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,30 +184,33 @@ 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
+    seen = []
+    garbage = []
+    taped.deleted.each do |oid|
+      garbage << pairs[oid]
+      seen << oid
+      churn.append(0, 1, 0)
     end
-    require_relative 'factbase/churn'
-    churn = Factbase::Churn.new
     taped.inserted.each do |oid|
+      next if seen.include?(oid)
       b = taped.find_by_object_id(oid)
       next if b.nil?
+      seen << oid
       @maps << b
       churn.append(1, 0, 0)
     end
-    garbage = []
     taped.added.each do |oid|
+      next if seen.include?(oid)
       b = taped.find_by_object_id(oid)
       next if b.nil?
       garbage << pairs[oid]
       @maps << b
       churn.append(0, 0, 1)
     end
-    taped.deleted.each do |oid|
-      garbage << pairs[oid]
-      churn.append(0, 1, 0)
-    end
     @maps.delete_if { |m| garbage.include?(m.object_id) } unless garbage.empty?
     churn
   end

metadata

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