factbase 0.0.45 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f50658ed4f005f217ac62d0d7915a02bda424b81b27b8fd28c04d72a87720f42
-  data.tar.gz: 96593b68ec2ead36739708e150794a640786f76bb015476a90f80814f0f211fb
+  metadata.gz: 3b16ed7e90c154dfde3992d7a812c124caf6492c4f3600da01e93069e82be50f
+  data.tar.gz: 8cc18bca8d1a1eb3b52fdb314b38f87818796faf93d05395764d5968aa615a93
 SHA512:
-  metadata.gz: 5595f2de94f831ed456771bfbf52efb86b2c3e29be426923dadcdee51389983ef2bedd2e41cdccb5246b91682cc7bb47164f7bf8adefbd2cf08f76812e8412a7
-  data.tar.gz: ccbf0464b43eb277c497e27f3827c7cd3051fc94e34c727c4c258d3a999d717a600635eda52c62a874165eb3bf7804a0665edbe1bdaf7eca47aa1e568db9bc17
+  metadata.gz: 9376cb5f9cecf2fc5fb47296512285b8105b08fbe9683f3722995aac7bab5440a417d443f378dfc62c300f3b79d136f6365835843aabb3559eaf09f203404880
+  data.tar.gz: 59f4f461487d02b604b0614d571bbc10405a15c4d86ec92dedd8633d5b12a01bd92d546622aad23bd3d4caf65ff4a27ce7a18a6b1a65c6e2d54cbc0874f41d91

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,44 @@
+# 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)
+    @maps = maps
+  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

@@ -22,6 +22,7 @@
 
 require 'time'
 require 'loog'
+require_relative 'syntax'
 
 # A decorator of a Factbase, that logs all operations.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -48,17 +49,18 @@ class Factbase::Looged
   end
 
   def query(query)
-    Query.new(@fb.query(query), query, @loog)
+    Query.new(@fb, query, @loog)
   end
 
   def txn(this = self, &)
-    r = false
-    @fb.txn(this) do |x|
+    before = @fb.size
+    tail = nil
+    r = @fb.txn(this) do |fbt|
       tail = Factbase::Looged.elapsed do
-        r = yield x
+        yield fbt
       end
-      @loog.debug("Txn #{r ? 'modified' : 'did nothing'} #{tail}")
     end
+    @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
     r
   end
 
@@ -113,8 +115,8 @@ class Factbase::Looged
   # This is an internal class, it is not supposed to be instantiated directly.
   #
   class Query
-    def initialize(query, expr, loog)
-      @query = query
+    def initialize(fb, expr, loog)
+      @fb = fb
       @expr = expr
       @loog = loog
     end
@@ -124,7 +126,7 @@ class Factbase::Looged
       if block_given?
         r = nil
         tail = Factbase::Looged.elapsed do
-          r = @query.each(&)
+          r = @fb.query(@expr).each(&)
         end
         raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
@@ -136,7 +138,7 @@ class Factbase::Looged
       else
         array = []
         tail = Factbase::Looged.elapsed do
-          @query.each do |f|
+          @fb.query(@expr).each do |f|
             array << f
           end
         end
@@ -151,14 +153,17 @@ class Factbase::Looged
 
     def delete!
       r = nil
+      before = @fb.size
       tail = Factbase::Looged.elapsed do
-        r = @query.delete!
+        r = @fb.query(@expr).delete!
       end
       raise ".delete! of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
-      if r.zero?
-        @loog.debug("Nothing deleted by '#{@expr}' #{tail}")
+      if before.zero?
+        @loog.debug("There were no facts, nothing deleted by '#{@expr}' #{tail}")
+      elsif r.zero?
+        @loog.debug("No facts out of #{before} deleted by '#{@expr}' #{tail}")
       else
-        @loog.debug("Deleted #{r} fact(s) by '#{@expr}' #{tail}")
+        @loog.debug("Deleted #{r} fact(s) out of #{before} by '#{@expr}' #{tail}")
       end
       r
     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)).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)).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)).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.45'
+  VERSION = '0.0.47'
 
   # 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

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require 'loog'
+require_relative '../../lib/factbase'
 require_relative '../../lib/factbase/looged'
 
 # Test.
@@ -45,13 +46,31 @@ class TestLooged < Minitest::Test
   end
 
   def test_with_txn
-    fb = Factbase::Looged.new(Factbase.new, Loog::NULL)
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
     assert(
       fb.txn do |fbt|
         fbt.insert.foo = 42
       end
     )
     assert_equal(1, fb.size)
+    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)
+    assert(!fb.txn { |fbt| fbt.query('(always)').each.to_a })
+    assert(log.to_s.include?('didn\'t touch'), log)
   end
 
   def test_returns_int
@@ -102,7 +121,7 @@ class TestLooged < Minitest::Test
       'Set \'bar\' to 3 (Integer)',
       'Set \'str\' to "Он поскорей звонит. Вбегает\n   ... Отъехать в поле к двум дубкам." (String)',
       'Found 1 fact(s) by \'(exists bar)\'',
-      'Deleted 3 fact(s) by \'(not (exists bar))\''
+      'Deleted 3 fact(s) out of 4 by \'(not (exists bar))\''
     ].each do |s|
       assert(log.to_s.include?(s), "#{log}\n")
     end

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
@@ -72,6 +107,16 @@ class TestFactbase < Minitest::Test
     assert_equal(2, fb2.size)
   end
 
+  def test_txn_returns_boolean
+    fb = Factbase.new
+    assert(fb.txn { true }.is_a?(FalseClass))
+    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
     fb = Factbase.new
     fb.txn do |fbt|
@@ -90,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.45
+  version: 0.0.47
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-07 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