factbase 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8038d22144d137a5f6681fc6d87305b6266613317109c8303477a0ef5deffa8
-  data.tar.gz: d22085de542559b452f7a368418a821e83643658ff940fdfecbe698ffe16aa65
+  metadata.gz: e0ff9bc1f66c58988b0a6758b11694dc5cbcc0b7c004f862ec00fd075b599ec1
+  data.tar.gz: 9c75cc130b0b641cbcf67bab0f11cc0b794a68e6449fb0c3e1fac38b337194e7
 SHA512:
-  metadata.gz: aa35c8dd802f4622842cc2c486cc26f3032dfc3ff525f6d97d8185ec6297b8fb5ad45a7dcf010bd7ce5b12b6aae2eb5721f1352f16666513818c2b30470ade17
-  data.tar.gz: f4cfcaa303d1c74485760b56b93112003230f955f0b589921beb43d3a8ff83e7b9cfab07d6e4d42cd514b3d1100393611a40f37c287357b99408696e6caa7b6b
+  metadata.gz: eaa74d8e6c7f30a4f743aa69b51186803bfeb6959b1e9e2f8a929e7ad8813aeff3bc2beb4431157440bd8af5991bf163390fceb3ba2cb200b5167901aa2521f9
+  data.tar.gz: cb79dff273324c4292187f048ed1f7ec8e9559ad391242c071e5e097141e6b7bb42f501fc684e01f4c5adb4fc30ade033115719acbeb4393cd9465765ff246d9

data/.github/workflows/rake.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12]
-        ruby: [2.7, 3.2]
+        ruby: [3.2]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

data/README.md

@@ -32,11 +32,12 @@ end
 You can save the factbase to disc and load it back:
 
 ```ruby
+file = '/tmp/simple.fb'
 f1 = Factbase.new
 f1.insert
-File.save('/tmp/db.txt', f1.export)
+File.save(file, f1.export)
 f2 = Factbase.new
-f2.import(File.read('/tmp/db.txt'))
+f2.import(File.read(file))
 ```
 
 ## How to contribute
@@ -44,7 +45,7 @@ f2.import(File.read('/tmp/db.txt'))
 Read [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
 Make sure you build is green before you contribute
 your pull request. You will need to have
-[Ruby](https://www.ruby-lang.org/en/) 2.3+ and
+[Ruby](https://www.ruby-lang.org/en/) 3.2+ and
 [Bundler](https://bundler.io/) installed. Then:
 
 ```bash

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.16'
+  s.version = '0.0.18'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'json', '~> 2.7'
+  s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~> 1.10'
   s.add_runtime_dependency 'yaml', '~> 0.3'
   s.metadata['rubygems_mfa_required'] = 'true'

data/lib/factbase/fact.rb

@@ -46,6 +46,7 @@ class Factbase::Fact
       raise "Prop value can't be nil" if v.nil?
       raise "Prop value can't be empty" if v == ''
       raise "Prop type '#{v.class}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
+      v = v.utc if v.is_a?(Time)
       @mutex.synchronize do
         before = @map[kk]
         return if before == v

data/lib/factbase/looged.rb

@@ -0,0 +1,133 @@
+# 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 logs all operations.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Factbase::Looged
+  def initialize(fb, loog)
+    @fb = fb
+    @loog = loog
+  end
+
+  def empty?
+    @fb.empty?
+  end
+
+  def size
+    @fb.size
+  end
+
+  def insert
+    f = @fb.insert
+    @loog.debug("Inserted fact ##{f.id}")
+    Fact.new(f, @loog)
+  end
+
+  def query(query)
+    Query.new(@fb.query(query), query, @loog)
+  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
+
+  # Fact decorator.
+  class Fact
+    def initialize(fact, loog)
+      @fact = fact
+      @loog = loog
+    end
+
+    def to_s
+      @fact.to_s
+    end
+
+    def method_missing(*args)
+      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?('=')
+      r
+    end
+
+    # rubocop:disable Style/OptionalBooleanParameter
+    def respond_to?(method, include_private = false)
+      # rubocop:enable Style/OptionalBooleanParameter
+      @fact.respond_to?(method, include_private)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      @fact.respond_to_missing?(method, include_private)
+    end
+  end
+
+  # Query decorator.
+  class Query
+    def initialize(query, expr, loog)
+      @query = query
+      @expr = expr
+      @loog = loog
+    end
+
+    def each(&)
+      r = @query.each(&)
+      c = r.size
+      if c.zero?
+        @loog.debug("Nothing found by '#{@expr}'")
+      else
+        @loog.debug("Found #{c} facts by '#{@expr}'")
+      end
+      r
+    end
+
+    def delete!
+      r = @query.delete!
+      c = r.size
+      if c.zero?
+        @loog.debug("Nothing deleted by '#{@expr}'")
+      else
+        @loog.debug("Deleted #{r.size} facts by '#{@expr}'")
+      end
+      r
+    end
+  end
+end

data/lib/factbase/term.rb

@@ -85,13 +85,17 @@ class Factbase::Term
 
   def exists(fact)
     assert_args(1)
-    k = @operands[0].to_s
+    o = @operands[0]
+    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
+    k = o.to_s
     !fact[k].nil?
   end
 
   def absent(fact)
     assert_args(1)
-    k = @operands[0].to_s
+    o = @operands[0]
+    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
+    k = o.to_s
     fact[k].nil?
   end
 
@@ -109,7 +113,9 @@ class Factbase::Term
 
   def arithmetic(op, fact)
     assert_args(2)
-    k = @operands[0].to_s
+    o = @operands[0]
+    raise "A symbol expected by #{op}: #{o}" unless o.is_a?(Symbol)
+    k = o.to_s
     v = fact[k]
     return false if v.nil?
     v = [v] unless v.is_a?(Array)

data/test/factbase/test_fact.rb

@@ -73,4 +73,12 @@ class TestFact < Minitest::Test
     f.send('foo_bar=', 42)
     assert_equal(42, f.foo_bar, f.to_s)
   end
+
+  def test_time_in_utc
+    f = Factbase::Fact.new(Mutex.new, {})
+    t = Time.now
+    f.foo = t
+    assert_equal(t.utc, f.foo)
+    assert_equal(t.utc.to_s, f.foo.to_s)
+  end
 end

data/test/factbase/test_looged.rb

@@ -0,0 +1,46 @@
+# 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/looged'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestLooged < Minitest::Test
+  def test_simple_setting
+    fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
+    fb.insert
+    fb.insert.bar = 3
+    found = 0
+    fb.query('(exists id)').each do |f|
+      assert(42, f.id.positive?)
+      f.foo = 42
+      assert_equal(42, f.foo)
+      found += 1
+    end
+    assert_equal(2, found)
+    assert_equal(2, fb.size)
+  end
+end

data/test/factbase/test_term.rb

@@ -29,14 +29,14 @@ require_relative '../../lib/factbase/term'
 # License:: MIT
 class TestTerm < Minitest::Test
   def test_simple_matching
-    t = Factbase::Term.new(:eq, ['foo', 42])
+    t = Factbase::Term.new(:eq, [:foo, 42])
     assert(t.matches?(fact('foo' => [42])))
     assert(!t.matches?(fact('foo' => 'Hello!')))
     assert(!t.matches?(fact('bar' => ['Hello!'])))
   end
 
   def test_eq_matching
-    t = Factbase::Term.new(:eq, ['foo', 42])
+    t = Factbase::Term.new(:eq, [:foo, 42])
     assert(t.matches?(fact('foo' => 42)))
     assert(t.matches?(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'])))
     assert(!t.matches?(fact('foo' => [100])))
@@ -45,7 +45,7 @@ class TestTerm < Minitest::Test
   end
 
   def test_lt_matching
-    t = Factbase::Term.new(:lt, ['foo', 42])
+    t = Factbase::Term.new(:lt, [:foo, 42])
     assert(t.matches?(fact('foo' => [10])))
     assert(!t.matches?(fact('foo' => [100])))
     assert(!t.matches?(fact('foo' => 100)))
@@ -53,7 +53,7 @@ class TestTerm < Minitest::Test
   end
 
   def test_gt_matching
-    t = Factbase::Term.new(:gt, ['foo', 42])
+    t = Factbase::Term.new(:gt, [:foo, 42])
     assert(t.matches?(fact('foo' => [100])))
     assert(t.matches?(fact('foo' => 100)))
     assert(!t.matches?(fact('foo' => [10])))
@@ -62,14 +62,14 @@ class TestTerm < Minitest::Test
   end
 
   def test_lt_matching_time
-    t = Factbase::Term.new(:lt, ['foo', Time.now])
+    t = Factbase::Term.new(:lt, [:foo, Time.now])
     assert(t.matches?(fact('foo' => [Time.now - 100])))
     assert(!t.matches?(fact('foo' => [Time.now + 100])))
     assert(!t.matches?(fact('bar' => [100])))
   end
 
   def test_gt_matching_time
-    t = Factbase::Term.new(:gt, ['foo', Time.now])
+    t = Factbase::Term.new(:gt, [:foo, Time.now])
     assert(t.matches?(fact('foo' => [Time.now + 100])))
     assert(!t.matches?(fact('foo' => [Time.now - 100])))
     assert(!t.matches?(fact('bar' => [100])))
@@ -81,19 +81,19 @@ class TestTerm < Minitest::Test
   end
 
   def test_not_eq_matching
-    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, [:foo, 100])])
     assert(t.matches?(fact('foo' => [42, 12, -90])))
     assert(!t.matches?(fact('foo' => 100)))
   end
 
   def test_exists_matching
-    t = Factbase::Term.new(:exists, ['foo'])
+    t = Factbase::Term.new(:exists, [:foo])
     assert(t.matches?(fact('foo' => [42, 12, -90])))
     assert(!t.matches?(fact('bar' => 100)))
   end
 
   def test_absent_matching
-    t = Factbase::Term.new(:absent, ['foo'])
+    t = Factbase::Term.new(:absent, [:foo])
     assert(t.matches?(fact('z' => [42, 12, -90])))
     assert(!t.matches?(fact('foo' => 100)))
   end
@@ -102,8 +102,8 @@ class TestTerm < Minitest::Test
     t = Factbase::Term.new(
       :or,
       [
-        Factbase::Term.new(:eq, ['foo', 4]),
-        Factbase::Term.new(:eq, ['bar', 5])
+        Factbase::Term.new(:eq, [:foo, 4]),
+        Factbase::Term.new(:eq, [:bar, 5])
       ]
     )
     assert(t.matches?(fact('foo' => [4])))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: loog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +96,7 @@ files:
 - factbase.gemspec
 - lib/factbase.rb
 - lib/factbase/fact.rb
+- lib/factbase/looged.rb
 - lib/factbase/query.rb
 - lib/factbase/spy.rb
 - lib/factbase/syntax.rb
@@ -89,6 +104,7 @@ files:
 - lib/factbase/white_list.rb
 - renovate.json
 - test/factbase/test_fact.rb
+- test/factbase/test_looged.rb
 - test/factbase/test_query.rb
 - test/factbase/test_spy.rb
 - test/factbase/test_syntax.rb