factbase 0.0.42 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42066d9d82538ecb6f0ec8df6cc711f4328e1ba496f00366fe67719ca8a1185e
-  data.tar.gz: d40e21b7e426af5184b9b03f515da4508b1e1e9e52995f566b16c778eefefca3
+  metadata.gz: 7942029d876a9fee77f167bb9e9d7311445e16fa38c9654dfd6eae231fb9c366
+  data.tar.gz: 102f08927aafc6900d4563e90cbabb9311166307e1ca57a9bd4e484ff8be684a
 SHA512:
-  metadata.gz: ff04d1f7e3eb1b18b36544ea8fb61280cda250a5e9920ba7b858092ae7c13111efce537d39acd7119f2f70c8704a89d06c98bf54b5a4639b4f187599f61eecbc
-  data.tar.gz: '09ba7d04f933f758c1db716c9490d464a2202644560a594bfae0a77e8bee8d26dcc38605101417a062ccd5c9645b5187e7f069e8f31e6bc782e48dc79775a347'
+  metadata.gz: d6877f4b3dbe627819256cda88214fd170e89e37521c2936daa0fed5a02b1450fc98157c53e92d2f38e48522dd617d901609ec1b23b96875abb68a7c231d5a47
+  data.tar.gz: 482f13ec05d51bf726049ed44627ec2719ee17b1a5b387eb7ebb6ee98a760523702f9f81540e6e10ff2dc211a90321742c5796cb63ef9ee4aa64fa6777886b81

data/lib/factbase/rules.rb

@@ -53,11 +53,14 @@ class Factbase::Rules
   def txn(this = self, &)
     before = @check
     @check = Blind.new
-    @fb.txn(this, &)
+    modified = @fb.txn(this, &)
     @check = before
-    @fb.query('(always)').each do |f|
-      @check.it(f)
+    if modified
+      @fb.query('(always)').each do |f|
+        @check.it(f)
+      end
     end
+    modified
   end
 
   def export

data/lib/factbase/to_json.rb

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 require 'json'
-require 'time'
 require_relative '../factbase'
 
 # Factbase to JSON converter.
@@ -37,14 +36,15 @@ require_relative '../factbase'
 # License:: MIT
 class Factbase::ToJSON
   # Constructor.
-  def initialize(fb)
+  def initialize(fb, sorter = '_id')
     @fb = fb
+    @sorter = sorter
   end
 
   # Convert the entire factbase into JSON.
   # @return [String] The factbase in JSON format
   def json
     maps = Marshal.load(@fb.export)
-    maps.map { |m| m.sort.to_h }.to_json
+    maps.sort_by { |m| m[@sorter] }.map { |m| m.sort.to_h }.to_json
   end
 end

data/lib/factbase/to_xml.rb

@@ -37,8 +37,9 @@ require_relative '../factbase'
 # License:: MIT
 class Factbase::ToXML
   # Constructor.
-  def initialize(fb)
+  def initialize(fb, sorter = '_id')
     @fb = fb
+    @sorter = sorter
   end
 
   # Convert the entire factbase into XML.
@@ -48,12 +49,11 @@ class Factbase::ToXML
     maps = Marshal.load(bytes)
     meta = {
       version: Factbase::VERSION,
-      dob: Time.now.utc.iso8601,
       size: bytes.size
     }
     Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       xml.fb(meta) do
-        maps.each do |m|
+        maps.sort_by { |m| m[@sorter] }.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

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 require 'yaml'
-require 'time'
 require_relative '../factbase'
 
 # Factbase to YAML converter.
@@ -37,14 +36,15 @@ require_relative '../factbase'
 # License:: MIT
 class Factbase::ToYAML
   # Constructor.
-  def initialize(fb)
+  def initialize(fb, sorter = '_id')
     @fb = fb
+    @sorter = sorter
   end
 
   # Convert the entire factbase into YAML.
   # @return [String] The factbase in YAML format
   def yaml
     maps = Marshal.load(@fb.export)
-    YAML.dump({ 'facts' => maps.map { |m| m.sort.to_h } })
+    YAML.dump({ 'facts' => maps.sort_by { |m| m[@sorter] }.map { |m| m.sort.to_h } })
   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.42'
+  VERSION = '0.0.44'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end
@@ -159,22 +159,30 @@ class Factbase
   # inserted and all changes that happened in the block will be rolled back.
   #
   # @param [Factbase] this The factbase to use (don't provide this param)
+  # @return [Boolean] TRUE if some changes have been made, FALSE otherwise
   def txn(this = self)
     copy = this.dup
     begin
       yield copy
     rescue Factbase::Rollback
-      return
+      return false
     end
+    modified = false
     @mutex.synchronize do
       after = Marshal.load(copy.export)
       after.each_with_index do |m, i|
-        @maps << {} if i >= @maps.size
+        if i >= @maps.size
+          @maps << {}
+          modified = true
+        end
         m.each do |k, v|
+          next if @maps[i][k] == v
           @maps[i][k] = v
+          modified = true
         end
       end
     end
+    modified
   end
 
   # Export it into a chain of bytes.

data/test/factbase/test_term.rb

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require_relative '../../lib/factbase/term'
+require_relative '../../lib/factbase/syntax'
 
 # Term test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -227,6 +228,27 @@ class TestTerm < Minitest::Test
     assert(msg.include?('at (at)'), msg)
   end
 
+  def test_aggregation
+    maps = [
+      { 'x' => 1, 'y' => 0, 'z' => 4 },
+      { 'x' => 2, 'y' => 42, 'z' => 3 },
+      { 'x' => 3, 'y' => 42, 'z' => 5 },
+      { 'x' => 4, 'y' => 42, 'z' => 2 },
+      { 'x' => 5, 'y' => 42, 'z' => 1 },
+      { 'x' => 8, 'y' => 0, 'z' => 6 }
+    ]
+    {
+      '(eq x (agg (eq y 42) (min x)))' => '(eq x 2)',
+      '(eq z (agg (eq y 0) (max z)))' => '(eq x 8)',
+      '(eq x (agg (and (eq y 42) (gt z 1)) (max x)))' => '(eq x 4)',
+      '(and (eq x (agg (eq y 42) (min x))) (eq z 3))' => '(eq x 2)'
+    }.each do |q, r|
+      t = Factbase::Syntax.new(q).to_term
+      f = maps.find { |m| t.evaluate(fact(m), maps) }
+      assert(Factbase::Syntax.new(r).to_term.evaluate(fact(f), []))
+    end
+  end
+
   private
 
   def fact(map = {})

data/test/factbase/test_to_xml.rb

@@ -56,7 +56,6 @@ class TestToXML < Minitest::Test
     fb.insert.x = 42
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
-    assert(!xml.xpath('/fb[@dob]').empty?)
     assert(!xml.xpath('/fb[@version]').empty?)
     assert(!xml.xpath('/fb[@size]').empty?)
   end

data/test/factbase/test_to_yaml.rb

@@ -33,9 +33,10 @@ class TestToYAML < Minitest::Test
   def test_simple_rendering
     fb = Factbase.new
     f = fb.insert
+    f._id = 1
     f.foo = 42
     f.foo = 256
-    fb.insert
+    fb.insert._id = 2
     to = Factbase::ToYAML.new(fb)
     yaml = YAML.load(to.yaml)
     assert_equal(2, yaml['facts'].size)

data/test/test_factbase.rb

@@ -143,10 +143,11 @@ class TestFactbase < Minitest::Test
 
   def test_txn_with_rollback
     fb = Factbase.new
-    fb.txn do |fbt|
+    modified = fb.txn do |fbt|
       fbt.insert.bar = 33
       raise Factbase::Rollback
     end
+    assert(!modified)
     assert_equal(0, fb.query('(always)').each.to_a.size)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.44
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json