factbase 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2bcf895fa6934620163134f67815a20126515fcc163bdf7a232752a474bfcd
-  data.tar.gz: 2b96185e57e1ffa3176d34839940cff0a025b4cef8c7cd49b99bf9bdc79ab05c
+  metadata.gz: e7d1b649fb808d571609f3231f90dbd57ba57683993d52ee2eaddd674e2aeb65
+  data.tar.gz: 717ea095ae2e1092d71509b39f1581cfc4b65d47ca9f39cb704d694eabbd91d9
 SHA512:
-  metadata.gz: ac68811b7e3fd879a0a19079c537d5718095e0f8786de51b9fa949a1541f518dbd0f93ea9aedd749b41e90c965a9f81ec1fdd75b24e1959c0adc818d899f8017
-  data.tar.gz: dd39f0a82dc183b2c324660f1a9bb3ba6bf95cb2fa37c528d2684197aa96167dc62d6ee4797efd20c705a8c530c6e8ae09f332954023b1791c4dcb806f7b9a54
+  metadata.gz: 9f6955bdf61ad153a2cf956935310fbd1d59782a34e479ae94e48c70ab8a1002dfdf61f2384e968bbdedb0be58d19ea556841d7b7300aa110927f78f1fdabaf9
+  data.tar.gz: 2364a4421fcf35c42b6e316e33f11afaf4abc69b33502b475fa08fc28e2e45b8dbe138cf72d26b8938212d2807dfd8c3b50aa40b166e481e15f363d2cf5629c8

data/Rakefile

@@ -33,7 +33,7 @@ end
 desc 'Run them via Ruby, one by one'
 task :picks do
   next if OS.windows?
-  %w[text lib].each do |d|
+  %w[test lib].each do |d|
     Dir["#{d}/**/*.rb"].each do |f|
       qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout)
     end

data/lib/factbase/cached/cached_query.rb

@@ -36,9 +36,12 @@ class Factbase::CachedQuery
     key = "each #{@origin}" # params are ignored!
     before = @cache[key]
     @cache[key] = @origin.each(fb, params).to_a if before.nil?
+    c = 0
     @cache[key].each do |f|
+      c += 1
       yield Factbase::CachedFact.new(f, @cache)
     end
+    c
   end
 
   # Read a single value.

data/lib/factbase/indexed/indexed_query.rb

@@ -33,9 +33,11 @@ class Factbase::IndexedQuery
   # @return [Integer] Total number of facts yielded
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
-    @origin.each(fb, params).to_a.each do |f|
+    a = @origin.each(fb, params).to_a
+    a.each do |f|
       yield Factbase::IndexedFact.new(f, @idx)
     end
+    a.size
   end
 
   # Read a single value.

data/lib/factbase/logged.rb

@@ -138,13 +138,14 @@ class Factbase::Logged
     def each(fb = @fb, params = {}, &)
       return to_enum(__method__, fb, params) unless block_given?
       start = Time.now
-      q = Factbase::Syntax.new(@term).to_term.to_s
       r = nil
+      qry = @fb.query(@term, @maps)
       tail =
         Factbase::Logged.elapsed do
-          r = @fb.query(@term, @maps).each(fb, params, &)
+          r = qry.each(fb, params, &)
         end
-      raise ".each of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
+      raise ".query(#{@term.to_s.inspect}).each() of #{qry.class} returned #{r.class}" unless r.is_a?(Integer)
+      q = Factbase::Syntax.new(@term).to_term.to_s
       if r.zero?
         @tube.say(start, "Zero/#{@fb.size} facts found by '#{q}' #{tail}")
       else

data/lib/factbase/query.rb

@@ -39,7 +39,7 @@ class Factbase::Query
   # @param [Factbase] fb The factbase
   # @param [Hash] params Optional params accessible in the query via the "$" symbol
   # @yield [Fact] Facts one-by-one
-  # @return [Integer] Total number of facts yielded
+  # @return [Integer] Total number of facts yielded (if block given), otherwise enumerator
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
     yielded = 0

data/lib/factbase.rb

@@ -82,7 +82,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.9.6' unless const_defined?(:VERSION)
+  VERSION = '0.9.7' unless const_defined?(:VERSION)
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/test_logged.rb

@@ -7,6 +7,7 @@ require_relative '../test__helper'
 require 'loog'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/logged'
+require_relative '../../lib/factbase/cached/cached_factbase'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,6 +37,18 @@ class TestLogged < Factbase::Test
     assert_equal([42], fb.query('(agg (exists bar) (first bar))').one)
   end
 
+  def test_avoid_inner_logging
+    buf = Loog::Buffer.new
+    fb = Factbase.new
+    fb.insert
+    fb.insert.bar = 42
+    fb = Factbase::Logged.new(Factbase::CachedFactbase.new(fb), buf)
+    fb.query('(agg (exists bar) (count))').one
+    fb.query('(join "foo<=bar" (exists bar))').each.to_a
+    refute_includes(buf.to_s, '\'(count)\'')
+    refute_includes(buf.to_s, '\'(exists bar)\'')
+  end
+
   def test_with_txn
     log = Loog::Buffer.new
     fb = Factbase::Logged.new(Factbase.new, log)

metadata

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