factbase 0.0.46 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a1f43a45551ecd6d7dc96d1fc2d64e72b535ad92869f28b6efd1c2aafa6619
-  data.tar.gz: 716e6a3a3e44f7f91249feec8e385463eba0a1cc9ec695f361367d2ed6e0a5eb
+  metadata.gz: 56a6a221e2344538c324a601f49ad655f4d5e3b6682b5e717e8f798a6eb46030
+  data.tar.gz: 94bb595173fbea968c4a8e8af2b8d6cf08689127e2dfd2c2c296420659da5304
 SHA512:
-  metadata.gz: 92de5dea89b80df3856a438d0d045ea7de3c5a607295cc7d11615bc1e4d730e4e8de4fbdd710da8d3d33046917d35ef44f6c2ef768ce8f7a2210b2e8524de224
-  data.tar.gz: 2ef47978b1ebbe1736cf6b7b4a8d231823cb8c958bf602a015a7b4ea703448b70ec1fcfcb2e1a212b162e1f0967c088eb302f5452c135b7021caae08333212ac
+  metadata.gz: fe4eb95604ae3ba22d24ef01a4c86b1dcdf4c9b3ff38969cbc459653a6a72a201d317bdf86f71c22206c771deebb5511ba1c64ce014c77fdf995e18926646fa2
+  data.tar.gz: b48c9c7243f74713bcf5b9fbad3f0ef901aa79d107d7be78e3d08d9970e898a21f9bb4938cfaac5057edc11c53150b0934a46b125019c132906114a702c90d89

data/README.md

@@ -1,4 +1,4 @@
-# Single-Table NoSQL In-Memory Database
+# Single-Table NoSQL-ish In-Memory Database
 
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/factbase)](http://www.rultor.com/p/yegor256/factbase)
 [![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
@@ -18,7 +18,7 @@ It is possible to delete a fact, but impossible to delete a property
 from a fact.
 
 **ATTENTION**: The current implemention is naive and,
-because of that, very slow. I will be very happy
+because of that, **very slow**. I will be very happy
 if you suggest a better implementation without the change of the interface.
 The `Factbase::query()` method is what mostly needs performance optimization:
 currently it simply iterates through all facts in the factbase in order

data/lib/factbase/fact.rb

@@ -72,12 +72,11 @@ class Factbase::Fact
         before = @map[kk]
         return if before == v
         if before.nil?
-          @map[kk] = v
-          return
+          @map[kk] = [v]
+        else
+          @map[kk] << v
+          @map[kk].uniq!
         end
-        @map[kk] = [@map[kk]] unless @map[kk].is_a?(Array)
-        @map[kk] << v
-        @map[kk].uniq!
       end
       nil
     elsif k == '[]'

data/lib/factbase/flatten.rb

@@ -0,0 +1,45 @@
+# 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'
+
+# Make maps suitable for printing.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Factbase::Flatten
+  # Constructor.
+  def initialize(maps, sorter = '_id')
+    @maps = maps
+    @sorter = sorter
+  end
+
+  # Improve the maps.
+  # @return [Array<HashMap>] The hashmaps, but improved
+  def it
+    @maps
+      .sort_by { |m| m[@sorter] }
+      .map { |m| m.sort.to_h }
+      .map { |m| m.transform_values { |v| v.size == 1 ? v[0] : v } }
+  end
+end

data/lib/factbase/looged.rb

@@ -55,9 +55,9 @@ class Factbase::Looged
   def txn(this = self, &)
     before = @fb.size
     tail = nil
-    r = @fb.txn(this) do |x|
+    r = @fb.txn(this) do |fbt|
       tail = Factbase::Looged.elapsed do
-        yield x
+        yield fbt
       end
     end
     @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")

data/lib/factbase/term.rb

@@ -260,6 +260,7 @@ class Factbase::Term
     assert_args(1)
     v = by_symbol(0, fact)
     return 'nil' if v.nil?
+    v = v[0] if v.is_a?(Array) && v.size == 1
     v.class.to_s
   end
 

data/lib/factbase/to_json.rb

@@ -22,6 +22,7 @@
 
 require 'json'
 require_relative '../factbase'
+require_relative '../factbase/flatten'
 
 # Factbase to JSON converter.
 #
@@ -44,7 +45,6 @@ class Factbase::ToJSON
   # Convert the entire factbase into JSON.
   # @return [String] The factbase in JSON format
   def json
-    maps = Marshal.load(@fb.export)
-    maps.sort_by { |m| m[@sorter] }.map { |m| m.sort.to_h }.to_json
+    Factbase::Flatten.new(Marshal.load(@fb.export), @sorter).it.to_json
   end
 end

data/lib/factbase/to_xml.rb

@@ -23,6 +23,7 @@
 require 'nokogiri'
 require 'time'
 require_relative '../factbase'
+require_relative '../factbase/flatten'
 
 # Factbase to XML converter.
 #
@@ -46,14 +47,13 @@ class Factbase::ToXML
   # @return [String] The factbase in XML format
   def xml
     bytes = @fb.export
-    maps = Marshal.load(bytes)
     meta = {
       version: Factbase::VERSION,
       size: bytes.size
     }
     Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       xml.fb(meta) do
-        maps.sort_by { |m| m[@sorter] }.each do |m|
+        Factbase::Flatten.new(Marshal.load(bytes), @sorter).it.each do |m|
           xml.f_ do
             m.sort.to_h.each do |k, vv|
               if vv.is_a?(Array)

data/lib/factbase/to_yaml.rb

@@ -22,6 +22,7 @@
 
 require 'yaml'
 require_relative '../factbase'
+require_relative '../factbase/flatten'
 
 # Factbase to YAML converter.
 #
@@ -44,7 +45,6 @@ class Factbase::ToYAML
   # Convert the entire factbase into YAML.
   # @return [String] The factbase in YAML format
   def yaml
-    maps = Marshal.load(@fb.export)
-    YAML.dump({ 'facts' => maps.sort_by { |m| m[@sorter] }.map { |m| m.sort.to_h } })
+    YAML.dump(Factbase::Flatten.new(Marshal.load(@fb.export), @sorter).it)
   end
 end

data/lib/factbase.rb

@@ -79,7 +79,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.46'
+  VERSION = '0.0.48'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
@@ -91,10 +91,10 @@ class Factbase
     @mutex = Mutex.new
   end
 
-  # Make a duplicate of this factbase.
+  # Make a deep duplicate of this factbase.
   # @return [Factbase] A new factbase
   def dup
-    Factbase.new(@maps.dup)
+    Factbase.new(@maps.map { |m| m.transform_values(&:dup) })
   end
 
   # Size.
@@ -175,9 +175,9 @@ class Factbase
           @maps << {}
           modified = true
         end
-        m.each do |k, v|
-          next if @maps[i][k] == v
-          @maps[i][k] = v
+        m.each do |k, vv|
+          next if @maps[i][k] == vv
+          @maps[i][k] = vv
           modified = true
         end
       end

data/test/factbase/test_fact.rb

@@ -29,6 +29,17 @@ require_relative '../../lib/factbase/fact'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class TestFact < Minitest::Test
+  def test_injects_data_correctly
+    map = {}
+    f = Factbase::Fact.new(Mutex.new, map)
+    f.foo = 1
+    f.bar = 2
+    f.bar = 3
+    assert_equal(2, map.size)
+    assert_equal([1], map['foo'])
+    assert_equal([2, 3], map['bar'])
+  end
+
   def test_simple_resetting
     map = {}
     f = Factbase::Fact.new(Mutex.new, map)
@@ -89,7 +100,7 @@ class TestFact < Minitest::Test
     f = Factbase::Fact.new(Mutex.new, map)
     f.foo = 42
     f.foo = 42
-    assert_equal(42, map['foo'])
+    assert_equal([42], map['foo'])
   end
 
   def test_time_in_utc

data/test/factbase/test_flatten.rb

@@ -0,0 +1,39 @@
+# 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/flatten'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestFlatten < Minitest::Test
+  def test_mapping
+    maps = [{ 'b' => [42] }, { 'a' => 33 }, { 'c' => %w[hey you] }]
+    to = Factbase::Flatten.new(maps).it
+    assert(33, to[0]['a'])
+    assert(42, to[1]['b'])
+    assert(2, to[2]['c'].size)
+  end
+end

data/test/factbase/test_looged.rb

@@ -57,6 +57,15 @@ class TestLooged < Minitest::Test
     assert(log.to_s.include?('modified'), log)
   end
 
+  def test_with_modifying_txn
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
+    fb.insert.foo = 1
+    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a }, log)
+    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].foo = 42 }, log)
+    assert(log.to_s.include?('modified'), log)
+  end
+
   def test_with_empty_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)

data/test/factbase/test_query.rb

@@ -46,7 +46,7 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'num' => 42, 'name' => 'Jeff' }
     maps << { 'pi' => 3.14, 'num' => [42, 66, 0], 'name' => 'peter' }
-    maps << { 'time' => Time.now - 100, 'num' => 0 }
+    maps << { 'time' => Time.now - 100, 'num' => 0, 'hi' => [4] }
     {
       '(eq num 444)' => 0,
       '(eq time 0)' => 0,
@@ -56,6 +56,7 @@ class TestQuery < Minitest::Test
       '(eq pi +3.14)' => 1,
       '(not (exists hello))' => 3,
       '(eq "Integer" (type num))' => 2,
+      '(eq "Integer" (type hi))' => 1,
       '(when (eq num 0) (exists time))' => 2,
       '(unique num)' => 2,
       '(unique name)' => 2,

data/test/factbase/test_term.rb

@@ -120,6 +120,7 @@ class TestTerm < Minitest::Test
   def test_type_matching
     t = Factbase::Term.new(:type, [:foo])
     assert_equal('Integer', t.evaluate(fact('foo' => 42), []))
+    assert_equal('Integer', t.evaluate(fact('foo' => [42]), []))
     assert_equal('Array', t.evaluate(fact('foo' => [1, 2, 3]), []))
     assert_equal('String', t.evaluate(fact('foo' => 'Hello, world!'), []))
     assert_equal('Float', t.evaluate(fact('foo' => 3.14), []))

data/test/factbase/test_to_yaml.rb

@@ -39,9 +39,9 @@ class TestToYAML < Minitest::Test
     fb.insert._id = 2
     to = Factbase::ToYAML.new(fb)
     yaml = YAML.load(to.yaml)
-    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.size)
+    assert_equal(42, yaml[0]['foo'][0])
+    assert_equal(256, yaml[0]['foo'][1])
   end
 
   def test_sorts_keys

data/test/test_factbase.rb

@@ -23,12 +23,31 @@
 require 'minitest/autorun'
 require 'loog'
 require_relative '../lib/factbase'
+require_relative '../lib/factbase/rules'
+require_relative '../lib/factbase/inv'
+require_relative '../lib/factbase/pre'
+require_relative '../lib/factbase/looged'
 
 # Factbase main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class TestFactbase < Minitest::Test
+  def test_injects_data_correctly
+    maps = []
+    fb = Factbase.new(maps)
+    fb.insert
+    f = fb.insert
+    f.foo = 1
+    f.bar = 2
+    f.bar = 3
+    assert_equal(2, maps.size)
+    assert_equal(0, maps[0].size)
+    assert_equal(2, maps[1].size)
+    assert_equal([1], maps[1]['foo'])
+    assert_equal([2, 3], maps[1]['bar'])
+  end
+
   def test_simple_setting
     fb = Factbase.new
     fb.insert
@@ -44,6 +63,22 @@ class TestFactbase < Minitest::Test
     assert_equal(2, fb.size)
   end
 
+  def test_modify_via_query
+    fb = Factbase.new
+    fb.insert.bar = 1
+    fb.query('(exists bar)').each do |f|
+      f.bar = 42
+      assert_equal([1, 42], f['bar'])
+    end
+    found = 0
+    fb.query('(always)').each do |f|
+      assert_equal([1, 42], f['bar'])
+      found += 1
+    end
+    assert_equal(1, found)
+    assert_equal([1, 42], fb.query('(always)').each.to_a[0]['bar'])
+  end
+
   def test_serialize_and_deserialize
     f1 = Factbase.new
     f2 = Factbase.new
@@ -78,6 +113,8 @@ class TestFactbase < Minitest::Test
     assert(fb.txn(&:insert).is_a?(TrueClass))
     assert(fb.txn { |fbt| fbt.insert.bar = 42 })
     assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert(fb.txn { |fbt| fbt.query('(always)').each { |f| f.hello = 33 } })
+    assert(fb.txn { |fbt| fbt.query('(always)').each.to_a[0].zzz = 33 })
   end
 
   def test_run_txn
@@ -98,6 +135,17 @@ class TestFactbase < Minitest::Test
     assert_equal(2, fb.size)
   end
 
+  def test_run_txn_via_query
+    fb = Factbase.new
+    fb.insert.foo = 1
+    assert(
+      fb.txn do |fbt|
+        fbt.query('(always)').each { |f| f.foo = 42 }
+      end
+    )
+    assert_equal([1, 42], fb.query('(always)').each.to_a[0]['foo'])
+  end
+
   def test_run_txn_with_inv
     fb = Factbase::Inv.new(Factbase.new) { |_p, v| throw 'oops' if v == 42 }
     fb.insert.bar = 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.48
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -102,6 +102,7 @@ files:
 - factbase.gemspec
 - lib/factbase.rb
 - lib/factbase/fact.rb
+- lib/factbase/flatten.rb
 - lib/factbase/inv.rb
 - lib/factbase/looged.rb
 - lib/factbase/pre.rb
@@ -115,6 +116,7 @@ files:
 - lib/factbase/tuples.rb
 - renovate.json
 - test/factbase/test_fact.rb
+- test/factbase/test_flatten.rb
 - test/factbase/test_inv.rb
 - test/factbase/test_looged.rb
 - test/factbase/test_pre.rb