factbase 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5f2d977ba317805b5306d1a7a04c6f26e8cd6be228c254fdcd6ae322c9ecfb
-  data.tar.gz: a0f30e312586a23952f0df00a2ddf16de2818cafca8043d03acce21a0fbfa29b
+  metadata.gz: 1f66d5d5358e584ad5c4f73d551ceb03d8627c7a8ebfeea75c4bfbdcd08479b9
+  data.tar.gz: 047d233242c56b0788b66d7eef912d4aed78706b7afe321b60fcf3daf32e0026
 SHA512:
-  metadata.gz: 056656b1a3034c5e5e7025de734767d5c42957ba02e2f276a55a4257f4adaf3e01bf15b28488a8fd7727718f9d36980872d80cb5f63c0cf0a85675c93d6e712c
-  data.tar.gz: 1639980c0f9de4db14857068f97f5b3931027aa1ec49b3bdbe402828c017dc4c8b0bcd0469f6d17f0329cd3008748e06d044a0448fef4f2af4f6dce6e930f4c6
+  metadata.gz: b9749e3caf13ba363f5b76e598d007ccd731730579bc10851e29923f7304191eabf662ed0fd79864f02752f4ac5acd76537c7bbc352a97321e8aae13b1a94c0a
+  data.tar.gz: aa4a1cbe3bed556c478219fccdb3580925697cffa9dec838ed20f5f66b78006407a0ca3ff28e9dcc8adaa61f107b4566101401e99e3131bdbeb053f69505c910

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

data/lib/factbase/looged.rb

@@ -42,7 +42,7 @@ class Factbase::Looged
 
   def insert
     f = @fb.insert
-    @loog.debug("Inserted fact ##{f.id}")
+    @loog.debug('Inserted new fact')
     Fact.new(f, @loog)
   end
 
@@ -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
 

data/lib/factbase/pre.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'loog'
+
+# A decorator of a Factbase, that runs a provided block on every +insert+.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Factbase::Pre
+  def initialize(fb, &block)
+    @fb = fb
+    @block = block
+  end
+
+  def empty?
+    @fb.empty?
+  end
+
+  def size
+    @fb.size
+  end
+
+  def insert
+    f = @fb.insert
+    @block.call(f)
+    f
+  end
+
+  def query(query)
+    @fb.query(query)
+  end
+
+  def export
+    @fb.export
+  end
+
+  def import(bytes)
+    @fb.import(bytes)
+  end
+
+  def to_json(opt = nil)
+    @fb.to_json(opt)
+  end
+
+  def to_xml
+    @fb.to_xml
+  end
+
+  def to_yaml
+    @fb.to_yaml
+  end
+end

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/lib/factbase.rb

@@ -53,8 +53,6 @@ class Factbase
     require_relative 'factbase/fact'
     map = {}
     @mutex.synchronize do
-      f = Factbase::Fact.new(Mutex.new, map)
-      f.id = @maps.size + 1
       @maps << map
     end
     Factbase::Fact.new(@mutex, map)

data/test/factbase/test_looged.rb

@@ -34,13 +34,13 @@ class TestLooged < Minitest::Test
     fb.insert
     fb.insert.bar = 3
     found = 0
-    fb.query('(exists id)').each do |f|
-      assert(42, f.id.positive?)
+    fb.query('(exists bar)').each do |f|
+      assert(42, f.bar.positive?)
       f.foo = 42
       assert_equal(42, f.foo)
       found += 1
     end
-    assert_equal(2, found)
+    assert_equal(1, found)
     assert_equal(2, fb.size)
   end
 
@@ -72,9 +72,8 @@ class TestLooged < Minitest::Test
     fb.query('(exists bar)').each(&:to_s)
     fb.query('(not (exists bar))').delete!
     [
-      'Inserted fact #1',
-      'Inserted fact #2',
-      'Set \'bar\' to \'"3"\' (Integer)',
+      'Inserted new fact',
+      '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_pre.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'loog'
+require_relative '../../lib/factbase/pre'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestPre < Minitest::Test
+  def test_simple_setting
+    fb = Factbase::Pre.new(Factbase.new) { |f| f.foo = 42 }
+    f = fb.insert
+    assert_equal(42, f.foo)
+  end
+end

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])))

data/test/test_factbase.rb

@@ -34,15 +34,15 @@ class TestFactbase < Minitest::Test
   def test_simple_setting
     fb = Factbase.new
     fb.insert
-    fb.insert
+    fb.insert.bar = 88
     found = 0
-    fb.query('(exists id)').each do |f|
-      assert(42, f.id.positive?)
+    fb.query('(exists bar)').each do |f|
+      assert(42, f.bar.positive?)
       f.foo = 42
       assert_equal(42, f.foo)
       found += 1
     end
-    assert_equal(2, found)
+    assert_equal(1, found)
     assert_equal(2, fb.size)
   end
 
@@ -106,6 +106,5 @@ class TestFactbase < Minitest::Test
     assert_equal(2, yaml['facts'].size)
     assert_equal(42, yaml['facts'][0]['foo'][0])
     assert_equal(256, yaml['facts'][0]['foo'][1])
-    assert_equal(2, yaml['facts'][1]['id'])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -97,6 +97,7 @@ files:
 - lib/factbase.rb
 - lib/factbase/fact.rb
 - lib/factbase/looged.rb
+- lib/factbase/pre.rb
 - lib/factbase/query.rb
 - lib/factbase/spy.rb
 - lib/factbase/syntax.rb
@@ -105,6 +106,7 @@ files:
 - renovate.json
 - test/factbase/test_fact.rb
 - test/factbase/test_looged.rb
+- test/factbase/test_pre.rb
 - test/factbase/test_query.rb
 - test/factbase/test_spy.rb
 - test/factbase/test_syntax.rb