factbase 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4434f46130fcb63e9fa798f3c6bacf8441e91a680f789015faf03ba5cb2296b3
-  data.tar.gz: 2d461a92eb2121ca9394e9c07128afa48e3f62a06290678eb68a869fb6fdd501
+  metadata.gz: 20c84ac9e67311e6333da8c6da3d69ae445aad64686017a69bc702f50d703223
+  data.tar.gz: c275ca48a224b42f09e71551b563585036b866f99acf8dd58e13311bdaa0beec
 SHA512:
-  metadata.gz: 4a8683f418df4a0bd0de1d1f8be145a2eb4b1ea2e3bb7993355df88b591b6195dbac3654da7222ff3d66c1f3255c4dfb98520ff68f45721527138e258726d454
-  data.tar.gz: 027e1d0262aeca3ef34ea2a9ab3bdca0e6f6975c0f5478bee62e707f15668281bf2950be04f6cfca636d55a0b79ba9cd38e9a5679d8f63b7d800f69943b9b40c
+  metadata.gz: 1ef21c5e33b3cf5f67e7f5edb56110e9f4d62c970cbc52158ca3922661d9a3d3ed411c26b95b2be97c1d6b6a4a5ebb5c521c87401325da42e585bd61f31b403f
+  data.tar.gz: 9f02e0addedcff827c76f7c5a58cae70c84b73c02522ab429ba0607bf967f0412c8a82ba1b8caa49c0c0329498f0f440dc95e861fed563362bd1f7295bea52ba

data/lib/factbase/looged.rb

@@ -64,6 +64,8 @@ class Factbase::Looged
 
   # Fact decorator.
   class Fact
+    MAX_LENGTH = 64
+
     def initialize(fact, loog)
       @fact = fact
       @loog = loog
@@ -79,7 +81,7 @@ class Factbase::Looged
       v = args[1]
       s = v.is_a?(Time) ? v.utc.iso8601 : v.to_s
       s = v.to_s.inspect if v.is_a?(String)
-      s = "#{s[0..40]}...#{s[-40..]}" if s.length > 80
+      s = "#{s[0..MAX_LENGTH / 2]}...#{s[-MAX_LENGTH / 2..]}" if s.length > MAX_LENGTH
       @loog.debug("Set '#{k[0..-2]}' to #{s} (#{v.class})") if k.end_with?('=')
       r
     end

data/{test/factbase/test_white_list.rb → lib/factbase/tuples.rb}

@@ -20,20 +20,42 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'minitest/autorun'
-require_relative '../../lib/factbase'
-require_relative '../../lib/factbase/white_list'
+require_relative '../factbase'
 
-# WhiteList test.
+# Tuples.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
-class TestWhiteList < Minitest::Test
-  def test_simple_white_listing
-    fb = Factbase::WhiteList.new(Factbase.new, 'foo', ['hello'])
-    fb.insert.foo = 'hello'
-    assert_raises do
-      fb.insert.foo = 42
+class Factbase::Tuples
+  def initialize(fb, queries)
+    @fb = fb
+    @queries = queries
+  end
+
+  # Iterate them one by one.
+  # @yield [Array<Fact>] Arrays of facts one-by-one
+  # @return [Integer] Total number of arrays yielded
+  def each(&)
+    return to_enum(__method__) unless block_given?
+    each_rec([], @queries, &)
+  end
+
+  private
+
+  def each_rec(facts, tail, &)
+    qq = tail.dup
+    q = qq.shift
+    return if q.nil?
+    qt = q.gsub(/\{f([0-9]+).([a-z0-9_]+)\}/) do
+      facts[Regexp.last_match[1].to_i].send(Regexp.last_match[2])
+    end
+    @fb.query(qt).each do |f|
+      fs = facts + [f]
+      if qq.empty?
+        yield fs
+      else
+        each_rec(fs, qq, &)
+      end
     end
   end
 end

data/lib/factbase.rb

@@ -29,7 +29,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.33'
+  VERSION = '0.0.34'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_looged.rb

@@ -90,7 +90,7 @@ class TestLooged < Minitest::Test
       'Inserted new fact #1',
       'Inserted new fact #2',
       'Set \'bar\' to 3 (Integer)',
-      'Set \'str\' to "Он поскорей звонит. Вбегает\n      К нем...м\n      Отъехать в поле к двум дубкам." (String)',
+      'Set \'str\' to "Он поскорей звонит. Вбегает\n   ... Отъехать в поле к двум дубкам." (String)',
       'Found 1 fact(s) by \'(exists bar)\'',
       'Deleted 3 fact(s) by \'(not (exists bar))\''
     ].each do |s|

data/test/factbase/test_tuples.rb

@@ -0,0 +1,85 @@
+# 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_relative '../../lib/factbase'
+require_relative '../../lib/factbase/tuples'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestTuples < Minitest::Test
+  def test_passes_facts
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    f2 = fb.insert
+    f2.bar = 55
+    Factbase::Tuples.new(fb, ['(exists foo)', '(exists bar)']).each do |a, b|
+      assert_equal(42, a.foo)
+      assert_equal(55, b.bar)
+    end
+  end
+
+  def test_with_empty_list_of_queries
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    tuples = Factbase::Tuples.new(fb, [])
+    assert(tuples.each.to_a.empty?)
+  end
+
+  def test_is_reusable
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    tuples = Factbase::Tuples.new(fb, ['(exists foo)'])
+    assert_equal(1, tuples.each.to_a.size)
+    assert_equal(1, tuples.each.to_a.size)
+  end
+
+  def test_with_modifications
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    Factbase::Tuples.new(fb, ['(exists foo)']).each do |fs|
+      fs[0].bar = 1
+    end
+    assert_equal(1, fb.query('(exists bar)').each.to_a.size)
+  end
+
+  def test_with_txn
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.foo = 42
+    Factbase::Tuples.new(fb, ['(exists foo)']).each do |fs|
+      fb.txn do |fbt|
+        f = fbt.insert
+        f.bar = 1
+      end
+      fs[0].xyz = 'hey'
+    end
+    assert_equal(1, fb.query('(exists bar)').each.to_a.size)
+    assert_equal(1, fb.query('(exists xyz)').each.to_a.size)
+  end
+end

data/test/test_factbase.rb

@@ -110,8 +110,7 @@ class TestFactbase < Minitest::Test
       Factbase::Rules.new(Factbase.new, '(always)'),
       Factbase::Inv.new(Factbase.new) { |_, _| true },
       Factbase::Pre.new(Factbase.new) { |_| true },
-      Factbase::Looged.new(Factbase.new, Loog::NULL),
-      Factbase::Spy.new(Factbase.new, 'ff')
+      Factbase::Looged.new(Factbase.new, Loog::NULL)
     ].each do |d|
       f = d.insert
       f.foo = 42

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -103,13 +103,12 @@ files:
 - lib/factbase/pre.rb
 - lib/factbase/query.rb
 - lib/factbase/rules.rb
-- lib/factbase/spy.rb
 - lib/factbase/syntax.rb
 - lib/factbase/term.rb
 - lib/factbase/to_json.rb
 - lib/factbase/to_xml.rb
 - lib/factbase/to_yaml.rb
-- lib/factbase/white_list.rb
+- lib/factbase/tuples.rb
 - renovate.json
 - test/factbase/test_fact.rb
 - test/factbase/test_inv.rb
@@ -117,13 +116,12 @@ files:
 - test/factbase/test_pre.rb
 - test/factbase/test_query.rb
 - test/factbase/test_rules.rb
-- test/factbase/test_spy.rb
 - test/factbase/test_syntax.rb
 - test/factbase/test_term.rb
 - test/factbase/test_to_json.rb
 - test/factbase/test_to_xml.rb
 - test/factbase/test_to_yaml.rb
-- test/factbase/test_white_list.rb
+- test/factbase/test_tuples.rb
 - test/test__helper.rb
 - test/test_factbase.rb
 homepage: http://github.com/yegor256/factbase.rb

data/lib/factbase/spy.rb

@@ -1,101 +0,0 @@
-# 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_relative '../factbase'
-
-# Spy.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class Factbase::Spy
-  def initialize(fb, key)
-    @fb = fb
-    @key = key
-    @caught = []
-  end
-
-  def caught_keys
-    @caught
-  end
-
-  def dup
-    Factbase::Spy.new(@fb.dup, @key)
-  end
-
-  def size
-    @fb.size
-  end
-
-  def query(expr)
-    scan(Factbase::Syntax.new(expr).to_term)
-    @fb.query(expr)
-  end
-
-  def insert
-    SpyFact.new(@fb.insert, @key, @caught)
-  end
-
-  def export
-    @fb.export
-  end
-
-  def txn(this = self, &)
-    @fb.txn(this, &)
-  end
-
-  def import(data)
-    @fb.import(data)
-  end
-
-  # A fact that is spying.
-  class SpyFact
-    def initialize(fact, key, caught)
-      @fact = fact
-      @key = key
-      @caught = caught
-    end
-
-    def method_missing(*args)
-      @caught << args[1] if args[0].to_s == "#{@key}="
-      @fact.method_missing(*args)
-    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
-
-  private
-
-  def scan(term)
-    @caught << term.operands[1] if term.op == :eq && term.operands[0].to_s == @key
-    term.operands.each do |o|
-      scan(o) if o.is_a?(Factbase::Term)
-    end
-  end
-end

data/lib/factbase/white_list.rb

@@ -1,79 +0,0 @@
-# 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_relative '../factbase'
-
-# White list.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class Factbase::WhiteList
-  def initialize(fb, key, list)
-    @fb = fb
-    @key = key
-    @allowed = list
-  end
-
-  def query(expr)
-    @fb.query(expr)
-  end
-
-  def insert
-    WhiteFact.new(@fb.insert, @key, @allowed)
-  end
-
-  def export
-    @fb.export
-  end
-
-  def import(data)
-    @fb.import(data)
-  end
-
-  def to_json(opt = nil)
-    @fb.to_json(opt)
-  end
-
-  # A fact that is allows only values from the list.
-  class WhiteFact
-    def initialize(fact, key, list)
-      @fact = fact
-      @key = key
-      @allowed = list
-    end
-
-    def method_missing(*args)
-      raise "#{args[0]} '#{args[1]}' not allowed" if args[0].to_s == "#{@key}=" && !@allowed.include?(args[1])
-      @fact.method_missing(*args)
-    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
-end

data/test/factbase/test_spy.rb

@@ -1,43 +0,0 @@
-# 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_relative '../../lib/factbase'
-require_relative '../../lib/factbase/spy'
-
-# Spy test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2024 Yegor Bugayenko
-# License:: MIT
-class TestSpy < Minitest::Test
-  def test_simple_spying
-    fb = Factbase::Spy.new(Factbase.new, 'foo')
-    fb.insert.foo = 42
-    fb.insert.foo = 'hello'
-    fb.query('(eq foo "hello")').each do |f|
-      assert_equal('hello', f.foo)
-    end
-    assert_equal(3, fb.caught_keys.size)
-    assert(fb.caught_keys.include?('hello'))
-    assert(fb.caught_keys.include?(42))
-  end
-end