factbase 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea11eaa2c72f162214fffedf64db4674ef27aef158f613ecea3304e35d528c3
-  data.tar.gz: b2c11cab690d59314a866a668b18913df9856ff8dcd8e0fd1ff906dc6601bd41
+  metadata.gz: d7ba6b0db6da2ae4a2075896ff5b8365716d881eab694e0c848063cfb0b19270
+  data.tar.gz: 53e1f409d20404d60827545927f1b88797708889d18fc0177d176a7ae93e9a68
 SHA512:
-  metadata.gz: d8a5a44265b0f9c6e32e669802831fec089e04049e2871167bbda0361ea99ad3b464f16cda94c5fd7b32b2cc539379b5e33acfc8e26c2488cfe605c61d3fe537
-  data.tar.gz: 010122d90a6564bc5d7041ed1d3107449062810e494504bc14bb6c64df71f0e7bbf077fc0300301e31d2078a3efc34ce8b5c0b722eefeb288befd465b139eb27
+  metadata.gz: 5f2db2983906007c6d4e12bb63b730e277d055c0f4768f41f6bc3ac68a6bccf6fa59226fa8ab417c41f0f53dfa163af59d7732e9082800494268e3d047de6f0c
+  data.tar.gz: 9c77ce233f61637e0bec39b72da43fdc5403d0e098b4f4505747bce634233810acaaa88e65aa59c6ded4f8aef870b25823f04f051999ec9e221a26b5520960f9

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.15'
+  s.version = '0.0.17'
   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/looged.rb

@@ -0,0 +1,122 @@
+# 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
+      @loog.debug("Set '#{k[0..-2]}' to '#{args[1]}'") 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(&)
+      @loog.debug("Found #{r} facts by '#{@expr}'")
+      r
+    end
+
+    def delete!
+      r = @query.delete!
+      @loog.debug("Deleted #{r} facts by '#{@expr}'")
+      r
+    end
+  end
+end

data/lib/factbase/syntax.rb

@@ -99,7 +99,7 @@ class Factbase::Syntax
         list << :open
       when ')'
         list << :close
-      when ' '
+      when ' ', "\n", "\t", "\r"
         # ignore it
       else
         acc += c

data/lib/factbase.rb

@@ -35,6 +35,12 @@ class Factbase
     @mutex = Mutex.new
   end
 
+  # Is it empty?
+  # @return [Boolean] TRUE if there are no facts inside
+  def empty?
+    @maps.empty?
+  end
+
   # Size.
   # @return [Integer] How many facts are in there
   def size

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_query.rb

@@ -50,12 +50,12 @@ class TestQuery < Minitest::Test
       '(eq num 444)' => 0,
       '(eq time 0)' => 0,
       '(gt num 60)' => 1,
-      '(and (lt pi 100) (gt num 1000))' => 0,
+      "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
       '(not (exists hello))' => 3,
       '(absent time)' => 2,
       '(and (absent time) (exists pi))' => 1,
-      '(and (exists time) (not (exists pi)))' => 1,
+      "(and (exists time) (not (\t\texists pi)))" => 1,
       "(or (eq num 66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1
     }.each do |q, r|
       assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)

data/test/factbase/test_syntax.rb

@@ -44,8 +44,8 @@ class TestSyntax < Minitest::Test
       '()',
       '(foo)',
       '(foo (bar) (zz 77)   )',
-      "(eq foo    'Hello, world!')",
-      "(or ( a 4) (b 5) () (and () (c 5) (r 7 8s 8is 'Foo')))"
+      "(eq foo   \n\n 'Hello, world!'\n)\n",
+      "(or ( a 4) (b 5) () (and () (c 5) \t\t(r 7 8s 8is 'Foo')))"
     ].each do |q|
       Factbase::Syntax.new(q).to_term
     end

data/test/test_factbase.rb

@@ -57,6 +57,13 @@ class TestFactbase < Minitest::Test
     assert_equal(1, f2.query('(eq foo 42)').each.to_a.count)
   end
 
+  def test_empty_or_not
+    fb = Factbase.new
+    assert(fb.empty?)
+    fb.insert
+    assert(!fb.empty?)
+  end
+
   def test_to_json
     fb = Factbase.new
     f = fb.insert

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 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