factbase 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4659be0304d67fcd6639ae27a0ca2ebc065a9dc7499d45454447ca18812e0698
-  data.tar.gz: 40df86a0bd3a24b11f4124cb234683a7fc8e58fa05835bbfb7e761323c2746a7
+  metadata.gz: da15ba272d70a23c1f7138efd317a27e19f37846c7305b005e75fb23d9222004
+  data.tar.gz: 37588b7eb0b03659b5e6373a4f42bda9e89cd652cc954bc6a7988faf705d35ad
 SHA512:
-  metadata.gz: 03deff34f5739536073ec7c6fc0869a1d2a213528ebef2b7832a794ca3a086fb19642dcb497e2a8cc37305e2ed818e84765c37a7ea9b5390f6dc30b8271479bf
-  data.tar.gz: 48e1693cdea380fd71408521f6e7ec4783427f2316445361ce549c597bb9b836a75e3227b9c370e0afe4b780cd8f1ded9f38d28d17622b3cb993923ee62bdaea
+  metadata.gz: ba914de891e44ee3580e42be96710c3a2deecd75c2ba7fae07d78bb84920af2ffbf602b587e0aa81c1b138b9603f0c58903c21a933177e04e3fdcf1124d367b6
+  data.tar.gz: 3c681187d0df5285eb0922f7ae718c12009c26adb84c9a9ba7ad2676c095e5dcd68e01dce538a87c52f02e3475d62e4833349995c6d69cd444f3a9730fd4ba52

data/.github/workflows/actionlint.yml

@@ -28,7 +28,7 @@ name: actionlint
       - master
 jobs:
   actionlint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Download actionlint

data/.github/workflows/codecov.yml

@@ -25,12 +25,12 @@ name: codecov
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
           bundler-cache: true
       - run: bundle install
       - run: bundle exec rake

data/.github/workflows/copyrights.yml

@@ -21,10 +21,14 @@
 name: copyrights
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   copyrights:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: yegor256/copyrights-action@0.0.5

data/.github/workflows/markdown-lint.yml

@@ -32,7 +32,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   markdown-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: articulate/actions-markdownlint@v1

data/.github/workflows/pdd.yml

@@ -28,7 +28,7 @@ name: pdd
       - master
 jobs:
   pdd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -31,8 +31,8 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2022]
-        ruby: [3.2]
+        os: [ubuntu-24.04, macos-12, windows-2022]
+        ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

data/.github/workflows/xcop.yml

@@ -21,10 +21,14 @@
 name: xcop
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   xcop:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.github/workflows/yamllint.yml

@@ -28,7 +28,7 @@ name: yamllint
       - master
 jobs:
   yamllint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ibiqlik/action-yamllint@v3

data/.rubocop.yml

@@ -54,3 +54,5 @@ Layout/EndOfLine:
   EnforcedStyle: lf
 Security/MarshalLoad:
   Enabled: false
+Layout/MultilineAssignmentLayout:
+  Enabled: true

data/Gemfile

@@ -27,9 +27,9 @@ gem 'minitest', '5.24.1', require: false
 gem 'minitest-reporters', '1.7.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false
-gem 'rubocop', '1.65.0', require: false
+gem 'rubocop', '1.65.1', require: false
 gem 'rubocop-performance', '1.21.1', require: false
-gem 'rubocop-rspec', '3.0.3', require: false
+gem 'rubocop-rspec', '3.0.4', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -51,7 +51,7 @@ GEM
     crass (1.0.6)
     decoor (0.0.1)
     diff-lcs (1.5.1)
-    docile (1.4.0)
+    docile (1.4.1)
     drb (2.2.1)
     erubi (1.13.0)
     i18n (1.14.5)
@@ -65,7 +65,7 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    loog (0.5.2)
+    loog (0.5.3)
     minitest (5.24.1)
     minitest-reporters (1.7.1)
       ansi
@@ -73,13 +73,13 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     mutex_m (0.2.0)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x64-mingw-ucrt)
+    nokogiri (1.16.7-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     others (0.0.3)
     parallel (1.25.1)
@@ -88,7 +88,7 @@ GEM
       racc
     psych (5.1.2)
       stringio
-    racc (1.8.0)
+    racc (1.8.1)
     rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -119,7 +119,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -138,7 +138,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -154,7 +154,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -176,12 +176,13 @@ GEM
     webrick (1.8.1)
     yaml (0.3.0)
     yard (0.9.36)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   arm64-darwin-22
   x64-mingw-ucrt
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -190,9 +191,9 @@ DEPENDENCIES
   minitest-reporters (= 1.7.1)
   rake (= 13.2.1)
   rspec-rails (= 6.1.3)
-  rubocop (= 1.65.0)
+  rubocop (= 1.65.1)
   rubocop-performance (= 1.21.1)
-  rubocop-rspec (= 3.0.3)
+  rubocop-rspec (= 3.0.4)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   yard (= 0.9.36)

data/lib/factbase/fact.rb

@@ -71,9 +71,9 @@ class Factbase::Fact
       raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
       raise "Prohibited prop name '#{kk}'" if methods.include?(kk.to_sym)
       v = args[1]
-      raise "Prop value can't be nil" if v.nil?
-      raise "Prop value can't be empty" if v == ''
-      raise "Prop type '#{v.class}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
+      raise "The value of '#{kk}' can't be nil" if v.nil?
+      raise "The value of '#{kk}' can't be empty" if v == ''
+      raise "The type '#{v.class}' of '#{kk}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
       v = v.utc if v.is_a?(Time)
       @mutex.synchronize do
         @map[kk] = [] if @map[kk].nil?

data/lib/factbase/looged.rb

@@ -59,13 +59,14 @@ class Factbase::Looged
     start = Time.now
     id = nil
     rollback = false
-    r = @fb.txn(this) do |fbt|
-      id = fbt.object_id
-      yield fbt
-    rescue Factbase::Rollback => e
-      rollback = true
-      raise e
-    end
+    r =
+      @fb.txn(this) do |fbt|
+        id = fbt.object_id
+        yield fbt
+      rescue Factbase::Rollback => e
+        rollback = true
+        raise e
+      end
     if rollback
       @loog.debug("Txn ##{id} rolled back in #{start.ago}")
     else
@@ -120,9 +121,10 @@ class Factbase::Looged
     def one(params = {})
       q = Factbase::Syntax.new(@expr).to_term.to_s
       r = nil
-      tail = Factbase::Looged.elapsed do
-        r = @fb.query(@expr).one(params)
-      end
+      tail =
+        Factbase::Looged.elapsed do
+          r = @fb.query(@expr).one(params)
+        end
       if r.nil?
         @loog.debug("Nothing found by '#{q}' #{tail}")
       else
@@ -135,9 +137,10 @@ class Factbase::Looged
       q = Factbase::Syntax.new(@expr).to_term.to_s
       if block_given?
         r = nil
-        tail = Factbase::Looged.elapsed do
-          r = @fb.query(@expr).each(params, &)
-        end
+        tail =
+          Factbase::Looged.elapsed do
+            r = @fb.query(@expr).each(params, &)
+          end
         raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
           @loog.debug("Nothing found by '#{q}' #{tail}")
@@ -147,11 +150,12 @@ class Factbase::Looged
         r
       else
         array = []
-        tail = Factbase::Looged.elapsed do
-          @fb.query(@expr).each(params) do |f|
-            array << f
+        tail =
+          Factbase::Looged.elapsed do
+            @fb.query(@expr).each(params) do |f|
+              array << f
+            end
           end
-        end
         if array.empty?
           @loog.debug("Nothing found by '#{q}' #{tail}")
         else
@@ -164,9 +168,10 @@ class Factbase::Looged
     def delete!
       r = nil
       before = @fb.size
-      tail = Factbase::Looged.elapsed do
-        r = @fb.query(@expr).delete!
-      end
+      tail =
+        Factbase::Looged.elapsed do
+          r = @fb.query(@expr).delete!
+        end
       raise ".delete! of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
       if before.zero?
         @loog.debug("There were no facts, nothing deleted by '#{@expr}' #{tail}")

data/lib/factbase/term.rb

@@ -122,15 +122,16 @@ class Factbase::Term
   def to_s
     items = []
     items << @op
-    items += @operands.map do |o|
-      if o.is_a?(String)
-        "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
-      elsif o.is_a?(Time)
-        o.utc.iso8601
-      else
-        o.to_s
+    items +=
+      @operands.map do |o|
+        if o.is_a?(String)
+          "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
+        elsif o.is_a?(Time)
+          o.utc.iso8601
+        else
+          o.to_s
+        end
       end
-    end
     "(#{items.join(' ')})"
   end
 

data/lib/factbase/terms/math.rb

@@ -63,6 +63,14 @@ module Factbase::Term::Math
     cmp(:>, fact, maps)
   end
 
+  def lte(fact, maps)
+    cmp(:<=, fact, maps)
+  end
+
+  def gte(fact, maps)
+    cmp(:>=, fact, maps)
+  end
+
   def cmp(op, fact, maps)
     assert_args(2)
     lefts = the_values(0, fact, maps)
@@ -93,15 +101,15 @@ module Factbase::Term::Math
       num = num.to_i
       r =
         case units
-        when 'seconds'
+        when 'seconds', 'second'
           num
-        when 'minutes'
+        when 'minutes', 'minute'
           num * 60
-        when 'hours'
+        when 'hours', 'hour'
           num * 60 * 60
-        when 'days'
+        when 'days', 'day'
           num * 60 * 60 * 24
-        when 'weeks'
+        when 'weeks', 'week'
           num * 60 * 60 * 24 * 7
         else
           raise "Unknown time unit '#{units}' in '#{r}"

data/lib/factbase/terms/system.rb

@@ -31,6 +31,6 @@ module Factbase::Term::System
   def env(fact, maps)
     assert_args(2)
     n = the_values(0, fact, maps)[0]
-    ENV.fetch(n.upcase) { the_values(1, fact, maps)[1] }
+    ENV.fetch(n.upcase) { the_values(1, fact, maps)[0] }
   end
 end

data/lib/factbase.rb

@@ -81,7 +81,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/terms/test_math.rb

@@ -69,6 +69,20 @@ class TestMath < Minitest::Test
     assert(!t.evaluate(fact('bar' => 100), []))
   end
 
+  def test_gte
+    t = Factbase::Term.new(:gte, [:foo, 42])
+    assert(t.evaluate(fact('foo' => 100), []))
+    assert(t.evaluate(fact('foo' => 42), []))
+    assert(!t.evaluate(fact('foo' => 41), []))
+  end
+
+  def test_lte
+    t = Factbase::Term.new(:lte, [:foo, 42])
+    assert(t.evaluate(fact('foo' => 41), []))
+    assert(t.evaluate(fact('foo' => 42), []))
+    assert(!t.evaluate(fact('foo' => 100), []))
+  end
+
   def test_gt
     t = Factbase::Term.new(:gt, [:foo, 42])
     assert(t.evaluate(fact('foo' => [100]), []))
@@ -115,4 +129,10 @@ class TestMath < Minitest::Test
     assert_equal(Time.parse('2024-01-01T06:04'), t.evaluate(fact('foo' => Time.parse('2024-01-01T10:04')), []))
     assert(t.evaluate(fact, []).nil?)
   end
+
+  def test_minus_time_singular
+    t = Factbase::Term.new(:minus, [:foo, '1 hour'])
+    assert_equal(Time.parse('2024-01-01T09:04'), t.evaluate(fact('foo' => Time.parse('2024-01-01T10:04')), []))
+    assert(t.evaluate(fact, []).nil?)
+  end
 end

data/test/factbase/terms/test_system.rb

@@ -34,4 +34,16 @@ class TestSystem < Minitest::Test
     t = Factbase::Term.new(:env, ['FOO', ''])
     assert_equal('bar', t.evaluate(fact, []))
   end
+
+  def test_default
+    ENV.delete('FOO')
+    t = Factbase::Term.new(:env, ['FOO', 'мой друг'])
+    assert_equal('мой друг', t.evaluate(fact, []))
+  end
+
+  def test_when_default_is_absent
+    ENV.delete('FOO')
+    t = Factbase::Term.new(:env, ['FOO'])
+    assert_raises { t.evaluate(fact, []) }
+  end
 end

data/test/factbase/test_inv.rb

@@ -32,9 +32,10 @@ require_relative '../../lib/factbase/pre'
 # License:: MIT
 class TestInv < Minitest::Test
   def test_simple_checking
-    fb = Factbase::Inv.new(Factbase.new) do |p, v|
-      raise 'oops' if v.is_a?(String) && p == 'b'
-    end
+    fb =
+      Factbase::Inv.new(Factbase.new) do |p, v|
+        raise 'oops' if v.is_a?(String) && p == 'b'
+      end
     f = fb.insert
     f.a = 42
     assert_raises do
@@ -46,12 +47,14 @@ class TestInv < Minitest::Test
   end
 
   def test_pre_and_inv
-    fb = Factbase::Inv.new(Factbase.new) do |p, v|
-      raise 'oops' if v.is_a?(String) && p == 'b'
-    end
-    fb = Factbase::Pre.new(fb) do |f|
-      f.id = 42
-    end
+    fb =
+      Factbase::Inv.new(Factbase.new) do |p, v|
+        raise 'oops' if v.is_a?(String) && p == 'b'
+      end
+    fb =
+      Factbase::Pre.new(fb) do |f|
+        f.id = 42
+      end
     f = fb.insert
     assert_equal(42, f.id)
   end

data/test/factbase/test_rules.rb

@@ -96,9 +96,10 @@ class TestRules < Minitest::Test
 
   def test_in_combination_with_pre
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
-    fb = Factbase::Pre.new(fb) do |f|
-      f.hello = 42
-    end
+    fb =
+      Factbase::Pre.new(fb) do |f|
+        f.hello = 42
+      end
     ok = false
     assert_raises do
       fb.txn do |fbt|

data/test/test_factbase.rb

@@ -211,10 +211,11 @@ class TestFactbase < Minitest::Test
 
   def test_txn_with_rollback
     fb = Factbase.new
-    modified = fb.txn do |fbt|
-      fbt.insert.bar = 33
-      raise Factbase::Rollback
-    end
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace