factbase 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6bf5824dca2b686d94a18b4341e2fbcd08adf286e228043418c98e2633673a
-  data.tar.gz: e37dcd3ad0fc483ed24586e353bc48d9afc6ec42384ef39f0cab9d30a85ede93
+  metadata.gz: dd8e28cf7e8e84fc0364bb8780775592aa86c415a05a49d4edd88bbc9a717a80
+  data.tar.gz: ba7c821a3d229cb5f8b0e9fd1e632cd6d2e69c33eacb6b49751a5dd92902a23a
 SHA512:
-  metadata.gz: 00d59f7a614600ba776343545188b3ba4a0ea5f6f4470da577cd7506b6286a1f28f6232c03d47425d235132d9d1d694d5a212dcfd0ffcf3096269e1da900b6ab
-  data.tar.gz: 4572157aab7d5d5844905a1bee96e002233efdbf2667c245438c746f765c8c9aa41ede733c6c24ec9fa01728304a2e9b8d5e18d4d46ac0a04bd8d8666d70178c
+  metadata.gz: 897308019e1fb3e05bad6e47ac06c39ec91250981e1b0206600a9a5620cb03b29c9dac866640994ac077e6bc3c418b5ea8aec7878e1e2b4587bab6d77b2cffb7
+  data.tar.gz: 50172f65e3b8e40a30ec37155264c464b6a2849152ff9752270a38e8610c022506cd4b69cc1ed6869b2b8ecaa6056e3976d48a73642b067ffaedfc28ad887959

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.21'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/looged.rb

@@ -85,7 +85,7 @@ class Factbase::Looged
       r = @fact.method_missing(*args)
       k = args[0].to_s
       v = args[1]
-      @loog.debug("Set '#{k[0..-2]}' to '#{v.to_s.inspect}' (#{v.class})") if k.end_with?('=')
+      @loog.debug("Set '#{k[0..-2]}' to #{v.to_s.inspect} (#{v.class})") if k.end_with?('=')
       r
     end
 
@@ -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/lib/factbase/term.rb

@@ -124,7 +124,10 @@ class Factbase::Term
     v = fact[k]
     return false if v.nil?
     v = [v] unless v.is_a?(Array)
-    v.any? { |vv| vv.send(op, @operands[1]) }
+    v.any? do |vv|
+      vv = vv.floor if vv.is_a?(Time) && op == :==
+      vv.send(op, @operands[1])
+    end
   end
 
   def assert_args(num)

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)
@@ -62,7 +74,7 @@ class TestLooged < Minitest::Test
     [
       'Inserted fact #1',
       'Inserted fact #2',
-      'Set \'bar\' to \'"3"\' (Integer)',
+      'Set \'bar\' to "3" (Integer)',
       'Found 1 fact(s) by \'(exists bar)\'',
       'Deleted 2 fact(s) by \'(not (exists bar))\''
     ].each do |s|

data/test/factbase/test_query.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'time'
 require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/query'
 
@@ -62,6 +63,14 @@ class TestQuery < Minitest::Test
     end
   end
 
+  def test_simple_parsing_with_time
+    maps = []
+    now = Time.now.utc
+    maps << { 'foo' => now }
+    q = Factbase::Query.new(maps, Mutex.new, "(eq foo #{now.iso8601})")
+    assert_equal(1, q.each.to_a.size)
+  end
+
   def test_simple_deleting
     maps = []
     maps << { 'foo' => [42] }

data/test/factbase/test_term.rb

@@ -44,6 +44,13 @@ class TestTerm < Minitest::Test
     assert(!t.matches?(fact('bar' => [])))
   end
 
+  def test_eq_matching_time
+    now = Time.now
+    t = Factbase::Term.new(:eq, [:foo, Time.parse(now.iso8601)])
+    assert(t.matches?(fact('foo' => now)))
+    assert(t.matches?(fact('foo' => [now, Time.now])))
+  end
+
   def test_lt_matching
     t = Factbase::Term.new(:lt, [:foo, 42])
     assert(t.matches?(fact('foo' => [10])))

metadata

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