factbase 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ff9bc1f66c58988b0a6758b11694dc5cbcc0b7c004f862ec00fd075b599ec1
-  data.tar.gz: 9c75cc130b0b641cbcf67bab0f11cc0b794a68e6449fb0c3e1fac38b337194e7
+  metadata.gz: fd5f2d977ba317805b5306d1a7a04c6f26e8cd6be228c254fdcd6ae322c9ecfb
+  data.tar.gz: a0f30e312586a23952f0df00a2ddf16de2818cafca8043d03acce21a0fbfa29b
 SHA512:
-  metadata.gz: eaa74d8e6c7f30a4f743aa69b51186803bfeb6959b1e9e2f8a929e7ad8813aeff3bc2beb4431157440bd8af5991bf163390fceb3ba2cb200b5167901aa2521f9
-  data.tar.gz: cb79dff273324c4292187f048ed1f7ec8e9559ad391242c071e5e097141e6b7bb42f501fc684e01f4c5adb4fc30ade033115719acbeb4393cd9465765ff246d9
+  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.18'
+  s.version = '0.0.20'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/fact.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'json'
+require 'time'
 require_relative '../factbase'
 
 # Fact.
@@ -33,10 +34,13 @@ class Factbase::Fact
     @map = map
   end
 
+  # Convert it to a string.
+  # @return [String] String representation of it (in JSON)
   def to_s
     @map.to_json
   end
 
+  # When a method is missing, this method is called.
   def method_missing(*args)
     k = args[0].to_s
     if k.end_with?('=')

data/lib/factbase/looged.rb

@@ -109,23 +109,38 @@ class Factbase::Looged
     end
 
     def each(&)
-      r = @query.each(&)
-      c = r.size
-      if c.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 #{c} facts 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!
-      c = r.size
-      if c.zero?
+      raise ".delete! of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
+      if r.zero?
         @loog.debug("Nothing deleted by '#{@expr}'")
       else
-        @loog.debug("Deleted #{r.size} facts by '#{@expr}'")
+        @loog.debug("Deleted #{r} fact(s) by '#{@expr}'")
       end
       r
     end

data/lib/factbase/syntax.rb

@@ -29,6 +29,8 @@ require_relative 'term'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Factbase::Syntax
+  # Ctor.
+  # @param [String] query The query, for example "(eq id 42)"
   def initialize(query)
     @query = query
   end

data/lib/factbase/term.rb

@@ -30,18 +30,23 @@ require_relative 'fact'
 class Factbase::Term
   attr_reader :op, :operands
 
+  # Ctor.
+  # @param [Symbol] operator Operator
+  # @param [Array] operands Operands
   def initialize(operator, operands)
     @op = operator
     @operands = operands
   end
 
   # Does it match the fact?
-  # @param [Factbase::Fact] The fact
+  # @param [Factbase::Fact] fact The fact
   # @return [bool] TRUE if matches
   def matches?(fact)
     send(@op, fact)
   end
 
+  # Turns it into a string.
+  # @return [String] The string of it
   def to_s
     items = []
     items << @op

data/test/factbase/test_looged.rb

@@ -43,4 +43,42 @@ class TestLooged < Minitest::Test
     assert_equal(2, found)
     assert_equal(2, fb.size)
   end
+
+  def test_returns_int
+    fb = Factbase.new
+    fb.insert
+    fb.insert
+    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)
+    fb.insert
+    fb.insert.bar = 3
+    fb.insert
+    fb.query('(exists bar)').each(&:to_s)
+    fb.query('(not (exists bar))').delete!
+    [
+      'Inserted fact #1',
+      'Inserted fact #2',
+      'Set \'bar\' to \'"3"\' (Integer)',
+      'Found 1 fact(s) by \'(exists bar)\'',
+      'Deleted 2 fact(s) by \'(not (exists bar))\''
+    ].each do |s|
+      assert(log.to_s.include?("#{s}\n"), "#{log}\n")
+    end
+  end
 end

data/test/factbase/test_query.rb

@@ -77,4 +77,11 @@ class TestQuery < Minitest::Test
     maps << { 'foo' => [42] }
     assert_equal(1, Factbase::Query.new(maps, Mutex.new, '(eq foo 42)').each.to_a.size)
   end
+
+  def test_returns_int
+    maps = []
+    maps << { 'foo' => 1 }
+    q = Factbase::Query.new(maps, Mutex.new, '(eq foo 1)')
+    assert_equal(1, q.each(&:to_s))
+  end
 end

metadata

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