factbase 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6bf5824dca2b686d94a18b4341e2fbcd08adf286e228043418c98e2633673a
-  data.tar.gz: e37dcd3ad0fc483ed24586e353bc48d9afc6ec42384ef39f0cab9d30a85ede93
+  metadata.gz: fd5f2d977ba317805b5306d1a7a04c6f26e8cd6be228c254fdcd6ae322c9ecfb
+  data.tar.gz: a0f30e312586a23952f0df00a2ddf16de2818cafca8043d03acce21a0fbfa29b
 SHA512:
-  metadata.gz: 00d59f7a614600ba776343545188b3ba4a0ea5f6f4470da577cd7506b6286a1f28f6232c03d47425d235132d9d1d694d5a212dcfd0ffcf3096269e1da900b6ab
-  data.tar.gz: 4572157aab7d5d5844905a1bee96e002233efdbf2667c245438c746f765c8c9aa41ede733c6c24ec9fa01728304a2e9b8d5e18d4d46ac0a04bd8d8666d70178c
+  metadata.gz: 056656b1a3034c5e5e7025de734767d5c42957ba02e2f276a55a4257f4adaf3e01bf15b28488a8fd7727718f9d36980872d80cb5f63c0cf0a85675c93d6e712c
+  data.tar.gz: 1639980c0f9de4db14857068f97f5b3931027aa1ec49b3bdbe402828c017dc4c8b0bcd0469f6d17f0329cd3008748e06d044a0448fef4f2af4f6dce6e930f4c6

data/factbase.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.3'
   s.name = 'factbase'
-  s.version = '0.0.19'
+  s.version = '0.0.20'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/looged.rb

@@ -109,19 +109,34 @@ class Factbase::Looged
     end
 
     def each(&)
-      r = @query.each(&)
-      raise 'Invalid return from query.each' unless r.is_a?(Integer)
-      if r.zero?
-        @loog.debug("Nothing found by '#{@expr}'")
+      if block_given?
+        r = @query.each(&)
+        raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
+        if r.zero?
+          @loog.debug("Nothing found by '#{@expr}'")
+        else
+          @loog.debug("Found #{r} fact(s) by '#{@expr}'")
+        end
+        r
       else
-        @loog.debug("Found #{r} fact(s) by '#{@expr}'")
+        array = []
+        # rubocop:disable Style/MapIntoArray
+        @query.each do |f|
+          array << f
+        end
+        # rubocop:enable Style/MapIntoArray
+        if array.empty?
+          @loog.debug("Nothing found by '#{@expr}'")
+        else
+          @loog.debug("Found #{array.size} fact(s) by '#{@expr}'")
+        end
+        array
       end
-      r
     end
 
     def delete!
       r = @query.delete!
-      raise 'Invalid return from query.delete!' unless r.is_a?(Integer)
+      raise ".delete! of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
       if r.zero?
         @loog.debug("Nothing deleted by '#{@expr}'")
       else

data/test/factbase/test_looged.rb

@@ -51,6 +51,18 @@ class TestLooged < Minitest::Test
     assert_equal(2, Factbase::Looged.new(fb, Loog::NULL).query('()').each(&:to_s))
   end
 
+  def test_returns_int_when_empty
+    fb = Factbase.new
+    assert_equal(0, Factbase::Looged.new(fb, Loog::NULL).query('()').each(&:to_s))
+  end
+
+  def test_logs_when_enumerator
+    fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
+    assert_equal(0, fb.query('()').each.to_a.size)
+    fb.insert
+    assert_equal(1, fb.query('()').each.to_a.size)
+  end
+
   def test_proper_logging
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)

metadata

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