factbase 0.0.47 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b16ed7e90c154dfde3992d7a812c124caf6492c4f3600da01e93069e82be50f
-  data.tar.gz: 8cc18bca8d1a1eb3b52fdb314b38f87818796faf93d05395764d5968aa615a93
+  metadata.gz: 19ec04ca7c6bf83d50a09c6325e396685e6eb0d2590a4ffca5ccee1fcafa45f1
+  data.tar.gz: 3550dd7bff7f9ad854689b5c78571211454bf34c09ec0b32fd4b240fc509939c
 SHA512:
-  metadata.gz: 9376cb5f9cecf2fc5fb47296512285b8105b08fbe9683f3722995aac7bab5440a417d443f378dfc62c300f3b79d136f6365835843aabb3559eaf09f203404880
-  data.tar.gz: 59f4f461487d02b604b0614d571bbc10405a15c4d86ec92dedd8633d5b12a01bd92d546622aad23bd3d4caf65ff4a27ce7a18a6b1a65c6e2d54cbc0874f41d91
+  metadata.gz: 5d2aa256c677f5d93fb9d41cfbe2548d83ebce3490da521d4a920f06ec774305c5850dc4dea71c76df2e2cda827db3c0292b21f0dae8dc9cee136e6e4cdfb3d3
+  data.tar.gz: 0e96d7968129d750e5e71940ff5f114bdd920b7ae417ad87cbcea1ef7746c66142c9f1e312980a08cdf2e4ec259747ea6da7f268b6f70c4292225a3b4e6d775d

data/Gemfile.lock

@@ -5,14 +5,15 @@ PATH
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
+      tago (~> 0.0)
       yaml (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -20,13 +21,13 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -39,8 +40,8 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
+    builder (3.3.0)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.1)
@@ -69,14 +70,14 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.0)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -91,9 +92,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -104,10 +105,10 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.8)
       io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.0)
@@ -138,9 +139,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-factory_bot (2.26.0)
       rubocop (~> 1.41)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
@@ -150,7 +151,7 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
+    rubocop-rspec_rails (2.29.0)
       rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -164,6 +165,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
     strscan (3.1.0)
+    tago (0.0.1)
     thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/factbase.gemspec

@@ -42,9 +42,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   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 '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.add_runtime_dependency 'nokogiri', '~>1.10'
+  s.add_runtime_dependency 'tago', '~>0.0'
+  s.add_runtime_dependency 'yaml', '~>0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/flatten.rb

@@ -29,8 +29,9 @@ require_relative '../factbase'
 # License:: MIT
 class Factbase::Flatten
   # Constructor.
-  def initialize(maps)
+  def initialize(maps, sorter = '_id')
     @maps = maps
+    @sorter = sorter
   end
 
   # Improve the maps.

data/lib/factbase/looged.rb

@@ -22,6 +22,7 @@
 
 require 'time'
 require 'loog'
+require 'tago'
 require_relative 'syntax'
 
 # A decorator of a Factbase, that logs all operations.
@@ -59,6 +60,9 @@ class Factbase::Looged
       tail = Factbase::Looged.elapsed do
         yield fbt
       end
+    rescue Factbase::Rollback => e
+      @loog.debug('Txn rolled back')
+      raise e
     end
     @loog.debug("Txn #{r ? 'modified' : 'didn\'t touch'} #{before} facts #{tail}")
     r
@@ -172,6 +176,6 @@ class Factbase::Looged
   def self.elapsed
     start = Time.now
     yield
-    "in #{format('%.2f', (Time.now - start) * 1000)}ms"
+    "in #{start.ago}"
   end
 end

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

@@ -45,6 +45,6 @@ class Factbase::ToJSON
   # Convert the entire factbase into JSON.
   # @return [String] The factbase in JSON format
   def json
-    Factbase::Flatten.new(Marshal.load(@fb.export)).it.to_json
+    Factbase::Flatten.new(Marshal.load(@fb.export), @sorter).it.to_json
   end
 end

data/lib/factbase/to_xml.rb

@@ -53,7 +53,7 @@ class Factbase::ToXML
     }
     Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       xml.fb(meta) do
-        Factbase::Flatten.new(Marshal.load(bytes)).it.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

@@ -45,6 +45,6 @@ class Factbase::ToYAML
   # Convert the entire factbase into YAML.
   # @return [String] The factbase in YAML format
   def yaml
-    YAML.dump(Factbase::Flatten.new(Marshal.load(@fb.export)).it)
+    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.47'
+  VERSION = '0.0.49'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/test_flatten.rb

@@ -30,8 +30,8 @@ require_relative '../../lib/factbase/flatten'
 # License:: MIT
 class TestFlatten < Minitest::Test
   def test_mapping
-    maps = [{ 'b' => [42] }, { 'a' => 33 }, { 'c' => %w[hey you] }]
-    to = Factbase::Flatten.new(maps).it
+    maps = [{ 'b' => [42], 'i' => 1 }, { 'a' => 33, 'i' => 0 }, { 'c' => %w[hey you], 'i' => 2 }]
+    to = Factbase::Flatten.new(maps, 'i').it
     assert(33, to[0]['a'])
     assert(42, to[1]['b'])
     assert(2, to[2]['c'].size)

data/test/factbase/test_looged.rb

@@ -57,6 +57,14 @@ class TestLooged < Minitest::Test
     assert(log.to_s.include?('modified'), log)
   end
 
+  def test_with_txn_rollback
+    log = Loog::Buffer.new
+    fb = Factbase::Looged.new(Factbase.new, log)
+    assert(!fb.txn { raise Factbase::Rollback })
+    assert_equal(0, fb.size)
+    assert(log.to_s.include?('rolled back'), log)
+  end
+
   def test_with_modifying_txn
     log = Loog::Buffer.new
     fb = Factbase::Looged.new(Factbase.new, log)

data/test/factbase/test_query.rb

@@ -46,16 +46,19 @@ 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], 'nome' => ['Walter'] }
     {
       '(eq num 444)' => 0,
+      '(eq hi 4)' => 1,
       '(eq time 0)' => 0,
       '(gt num 60)' => 1,
+      '(gt hi 3)' => 1,
       "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
       '(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,
@@ -69,6 +72,7 @@ class TestQuery < Minitest::Test
       '(and (one pi) (eq pi (div -6.28 -2)))' => 1,
       '(gt (size num) 2)' => 1,
       '(matches name "^[a-z]+$")' => 1,
+      '(matches nome "^Walter$")' => 1,
       '(lt (size num) 2)' => 2,
       '(eq (size _hello) 0)' => 3,
       '(eq num pi)' => 0,

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), []))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.49
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: tago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: yaml
   requirement: !ruby/object:Gem::Requirement