factbase 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a637de7c717d650eb0c6721794afd2c4a3bbb31a3eda1b1150f8a2f3e1c5322
-  data.tar.gz: a0a7698bba101d67c20fd390f1e745679110687643ec6849c445898b26a0d04e
+  metadata.gz: 9bbcc978a4adafeac2404f3ac22be354029d5c7a1f14152d75d1db61aeaaecbe
+  data.tar.gz: 8f19d5e20248f1ab7f6202bb43172e0b1916d430df8d136c9d78ae5cec8f12df
 SHA512:
-  metadata.gz: 99cbde1626587ef0d3552258089dcf9a25f956ee83766f4273d8928faa769995e7150925d0ae2d9506366eed80a4347d3302c7e0f00e854ff1671e6294e78452
-  data.tar.gz: 7aa47a8c5fd5dd2ff8a7e63fe7f203f9889a26bd7f20c94b3b126fe9cf8d52c78a5f5131d684e232b3ac37961c7c074f02531afe53c41e2904509b211441cf15
+  metadata.gz: 9efd7278de80bcf3599ca631cdb7dfa174bcf8ac3fa258313b01f2ba4e097d09f3eaa6f8362331e94d337696dce8643ce3fe14c88fbf0a31db5e12756c81eb63
+  data.tar.gz: 793f55f9df33b7489478d4029ec75e2ea831802893d88e71ea13ffe31e689ef0232a94fad5795ac1e0459ac1da585cc07e0341da04612a3d97f93b7c2832f044

data/lib/factbase/impatient.rb

@@ -20,7 +20,7 @@ class Factbase::Impatient
   def initialize(fb, timeout: 15)
     raise 'The "fb" is nil' if fb.nil?
     @origin = fb
-    @timeout = timeout
+    @timeout = timeout.to_f
   end
 
   decoor(:origin)
@@ -56,31 +56,37 @@ class Factbase::Impatient
     end
 
     def each(fb = @fb, params = {}, &)
-      return to_enum(__method__, fb, params) unless block_given?
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.each(fb, params, &)
+      a =
+        impatient('each') do
+          @fb.query(@term, @maps).each(fb, params).to_a
+        end
+      return a unless block_given?
+      yielded = 0
+      a.each do |f|
+        yield f
+        yielded += 1
       end
-    rescue Timeout::Error => e
-      raise "each() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
+      yielded
     end
 
     def one(fb = @fb, params = {})
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.one(fb, params)
+      impatient('one') do
+        @fb.query(@term, @maps).one(fb, params)
       end
-    rescue Timeout::Error => e
-      raise "one() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
     end
 
     def delete!(fb = @fb)
-      qry = @fb.query(@term, @maps)
-      Timeout.timeout(@timeout) do
-        qry.delete!(fb)
+      impatient('delete!') do
+        @fb.query(@term, @maps).delete!(fb)
       end
+    end
+
+    private
+
+    def impatient(name, &)
+      Timeout.timeout(@timeout, &)
     rescue Timeout::Error => e
-      raise "delete!() timed out after #{@timeout.seconds} (#{e.message}): #{@term}"
+      raise "#{name}() timed out after #{@timeout.seconds} (#{e.message}), fb size is #{@fb.size}: #{@term}"
     end
   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.14.2' unless const_defined?(:VERSION)
+  VERSION = '0.14.3' unless const_defined?(:VERSION)
 end

data/test/factbase/test_impatient.rb

@@ -81,20 +81,6 @@ class TestImpatient < Factbase::Test
     assert_equal([42], fb.query('(agg (exists bar) (first bar))').one)
   end
 
-  def test_query_timeout
-    fb = Factbase::Impatient.new(Factbase.new, timeout: 0.1)
-    1000.times do
-      fb.insert.value = rand(1000)
-    end
-    ex =
-      assert_raises(StandardError) do
-        fb.query('(always)').each do
-          sleep 0.2
-        end
-      end
-    assert_includes(ex.message, 'timed out after')
-  end
-
   def test_query_one_timeout
     slow = SlowFactbase.new
     10_000.times do
@@ -131,20 +117,6 @@ class TestImpatient < Factbase::Test
     assert_equal(1, fb.size)
   end
 
-  def test_with_txn_timeout
-    fb = Factbase::Impatient.new(Factbase.new, timeout: 0.1)
-    fb.txn do |fbt|
-      fbt.insert.slow = 42
-      ex =
-        assert_raises(StandardError) do
-          fbt.query('(always)').each do
-            sleep 0.2
-          end
-        end
-      assert_includes(ex.message, 'timed out after')
-    end
-  end
-
   def test_returns_int
     fb = Factbase.new
     fb.insert

metadata

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