fbe 0.0.46 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2431cb14f0a8b96e3c7c1478004756c89c736c41e30a83908955883f677f223f
-  data.tar.gz: a60cfd3c3083d2e9b89de82992981737ab6d375c920fa10de7413ba584ec36f0
+  metadata.gz: 996eb38d3f323f055a2ea039e1d6079b7d3c93b45f89fc98c59a9fee5f2de496
+  data.tar.gz: 7f0e93d769434e73f322f0fc4e7307e65eab8b78fed7572493706deba7114256
 SHA512:
-  metadata.gz: ae5a89b06a88acfbde4e41601faad9df89d3155f09f545e8564d2944a18da7c1dfb27a928edfb79beaee51b357cc433bd4fb404542d3e3592305441c2e01a676
-  data.tar.gz: ffc6494268796dbe1edb4da92163bf107e84e422944000e233f419adc59842ddf0842012da4b43cd2a7ad6080fa1f0150bcde81c894c78e6fc0188bba80458e7
+  metadata.gz: a61ca5c4187a0ad95525df5159b2b57ce31e78fec1553933e8798223dba1de968298fb54bfaae5c865a335bd7cd22f6557477937a4ce3002a25b4e72271b162e
+  data.tar.gz: cc0c9b96673b4861404ac65985fbf11b3fda7acc6f7bbc1ac8d04d69ad40adce46d78baddd6297cfae353b9b0f3115344bc7a967bf7c19cd173c8b890d1c32d7

data/Gemfile.lock

@@ -79,7 +79,7 @@ GEM
     erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.3.0)
+    factbase (0.4.0)
       backtrace (> 0)
       decoor (> 0)
       json (~> 2.7)

data/lib/fbe/fb.rb

@@ -40,11 +40,12 @@ def Fbe.fb(fb: $fb, global: $global, options: $options, loog: $loog)
         uid: '_id'
       )
       fbe =
-        Factbase::Pre.new(fbe) do |f|
-          max = fb.query('(eq _id (max _id))').each.to_a.first
+        Factbase::Pre.new(fbe) do |f, fbt|
+          max = fbt.query('(eq _id (max _id))').each.to_a.first
           f._id = (max.nil? ? 0 : max._id) + 1
           f._time = Time.now
-          f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{options.judges_action_version}"
+          f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{options.action_version}"
+          f._job = options.job_id unless options.job_id.nil?
         end
       Factbase::Looged.new(fbe, loog)
     end

data/lib/fbe/repeatedly.rb

@@ -24,6 +24,7 @@
 
 require_relative '../fbe'
 require_relative 'fb'
+require_relative 'overwrite'
 
 # Run the block provided every X hours.
 #
@@ -46,5 +47,5 @@ def Fbe.repeatedly(area, p_every_hours, fb: Fbe.fb, judge: $judge, loog: $loog,
     f.what = judge
   end
   Fbe.overwrite(f, 'when', Time.now)
-  yield f
+  yield fb.query("(and (eq what '#{judge}'))").each.to_a.first
 end

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.46'
+  VERSION = '0.0.48'
 end

data/test/fbe/test_fb.rb

@@ -46,4 +46,31 @@ class TestFb < Minitest::Test
     stdout = $loog.to_s
     assert(stdout.include?('Inserted new fact #1'), stdout)
   end
+
+  def test_increment_id_in_transaction
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new
+    $loog = Loog::Buffer.new
+    Fbe.fb.txn do |fbt|
+      fbt.insert
+      fbt.insert
+    end
+    arr = Fbe.fb.query('(always)').each.to_a
+    assert_equal(1, arr[0]._id)
+    assert_equal(2, arr[1]._id)
+  end
+
+  def test_adds_meta_properties
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new('JOB_ID' => 42)
+    $loog = Loog::Buffer.new
+    Fbe.fb.insert
+    f = Fbe.fb.query('(always)').each.to_a.first
+    assert(!f._id.nil?)
+    assert(!f._time.nil?)
+    assert(!f._version.nil?)
+    assert(!f._job.nil?)
+  end
 end

data/test/fbe/test_repeatedly.rb

@@ -25,6 +25,7 @@
 require 'minitest/autorun'
 require 'loog'
 require 'factbase'
+require 'judges/options'
 require_relative '../test__helper'
 require_relative '../../lib/fbe/repeatedly'
 
@@ -35,14 +36,16 @@ require_relative '../../lib/fbe/repeatedly'
 class TestRepeatedly < Minitest::Test
   def test_simple
     $fb = Factbase.new
-    loog = Loog::NULL
+    $loog = Loog::NULL
+    $options = Judges::Options.new
     judge = 'test'
     $global = {}
     3.times do
-      Fbe.repeatedly('pmp', 'every_x_hours', loog:, judge:) do |f|
+      Fbe.repeatedly('pmp', 'every_x_hours', judge:) do |f|
         f.foo = 42
       end
     end
     assert_equal(1, $fb.size)
+    assert_equal(42, $fb.query('(always)').each.to_a.first.foo)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.48
 platform: ruby
 authors:
 - Yegor Bugayenko