factbase 0.14.7 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64a0e23c152de8f55a3ca0b94a90a123d6d7cea7d1288d41cbb34ac8e11deae4
-  data.tar.gz: 67ce5f29a5a4d1e2fbb7436bade89907ae33d6f80926d32be2d999248fc642bb
+  metadata.gz: 0145cce5633262e8ec7e38d5d85e8500ab0bb1e1c7cb43936ef879449e9968d3
+  data.tar.gz: bc80e63b7f0b8729acec10d3d916576b045b3b1ce65e6972b4985c885eb3a09e
 SHA512:
-  metadata.gz: 3605722b88fd2ea98d242e16b6e9760bf24703b12c5169db318f68e80e5f0782b0434f1e8087d6ca751b361b24dc6f768c7b1b4ea6a71d07179d22460d54f325
-  data.tar.gz: 6f01d24ea249d7d951776c785439abba4dfb3ca81efe13c789d8222480b35033428dada4062ed2ffbf452257efb6a9cc1aaff45ce889d63002122fcbfa31a3fa
+  metadata.gz: ffcfcc48eaeb4184b7d14ed7858e47d792e0192aa4451c95b17712190eacbd017d7bb92c44b4f43a69730338bc683210cf33c4321c2d5c1dd977462924a13b3f
+  data.tar.gz: 2285fe9c3c071795716c294fb1d24d6f863cac5b61cc20a3bb6c05b2d80a558905dd9b0f84a17dc16a16a99a1183eab668e046b6b38d56e04463b098f2487f84

data/.github/workflows/actionlint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Download actionlint
         id: get_actionlint
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)

data/.github/workflows/benchmark.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3

data/.github/workflows/codecov.yml

@@ -12,14 +12,14 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3
           bundler-cache: true
       - run: bundle config set --global path "$(pwd)/vendor/bundle"
       - run: bundle install --no-color
-      - run: bundle exec rake
+      - run: bundle exec rake test
       - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

data/.github/workflows/copyrights.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: yegor256/copyrights-action@0.0.12

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

@@ -19,5 +19,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: DavidAnson/markdownlint-cli2-action@v20.0.0

data/.github/workflows/pdd.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -18,7 +18,7 @@ jobs:
         ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/reuse.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: fsfe/reuse-action@v5

data/.github/workflows/typos.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.35.3
+      - uses: actions/checkout@v5
+      - uses: crate-ci/typos@v1.35.4

data/.github/workflows/xcop.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: g4s8/xcop-action@master

data/.github/workflows/yamllint.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ibiqlik/action-yamllint@v3

data/README.md

@@ -13,19 +13,11 @@
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fyegor256%2Ffactbase.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fyegor256%2Ffactbase?ref=badge_shield&issueType=license)
 
 This Ruby gem manages an in-memory database of facts.
-A fact is simply a map of properties and values.
+A fact is simply an associative array of properties and their values.
 The values are either atomic literals or non-empty sets of literals.
 It is possible to delete a fact, but impossible to delete a property
 from a fact.
 
-**ATTENTION**: The current implementation is naive and,
-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
-to find those that match the provided terms. Obviously,
-even a simple indexing may significantly increase performance.
-
 Here is how you use it (it's thread-safe, by the way):
 
 ```ruby
@@ -42,7 +34,7 @@ fb.query('(not (exists seen))').each do |f|
 end
 ```
 
-You can save the factbase to the disc and then load it back:
+You can save the factbase to the disk and then load it back:
 
 ```ruby
 file = '/tmp/simple.fb'
@@ -133,7 +125,7 @@ properties in the facts that match `(gt x 5)`
 Also, some simple arithmetic:
 
 * `(plus v1 v2)` is a sum of `∑v1` and `∑v2`
-* `(minus v1 v2)` is a deducation of `∑v2` from `∑v1`
+* `(minus v1 v2)` is a deduction of `∑v2` from `∑v1`
 * `(times v1 v2)` is a multiplication of `∏v1` and `∏v2`
 * `(div v1 v2)` is a division of `∏v1` by `∏v2`
 
@@ -155,7 +147,9 @@ returns `true`
 There are terms that are history of search aware:
 
 * `(prev p)` returns the value of `p` property in the previously seen fact
-* `(unique p)` returns true if the value of `p` property hasn't been seen yet
+* `(unique p1 p2 ...)` returns true if at least one property value
+hasn't been seen yet; returns false when all specified properties
+have duplicate values in this particular combination
 
 The `agg` term enables sub-queries by evaluating the first argument (term)
 over all available facts, passing the entire subset to the second argument,

data/fixtures/stories/unique.yml

@@ -11,6 +11,20 @@ facts:
     price: 4300
   - name: BMW
     price: 4400
+  - name: Mercedes
+    color: red
+    year: 2020
+  - name: Mercedes
+    color: blue
+    year: 2020
+  - name: Mercedes
+    color: red
+    year: 2021
+  - name: Mercedes
+    color: red
+    year: 2020
 queries:
   - query: (and (exists price) (unique name))
     size: 2
+  - query: (and (eq name "Mercedes") (unique color year))
+    size: 3

data/lib/factbase/terms/ordering.rb

@@ -20,15 +20,24 @@ module Factbase::Ordering
   end
 
   def unique(fact, maps, fb)
-    @uniques = [] if @uniques.nil?
-    assert_args(1)
-    vv = _values(0, fact, maps, fb)
-    return false if vv.nil?
-    vv = [vv] unless vv.respond_to?(:to_a)
-    vv.each do |v|
-      return false if @uniques.include?(v)
-      @uniques << v
+    @uniques = {} if @uniques.nil?
+    raise "Too few operands for 'unique' (at least 1 expected)" if @operands.empty?
+    results = []
+    @operands.each_with_index do |_, i|
+      @uniques[i] = [] if @uniques[i].nil?
+      vv = _values(i, fact, maps, fb)
+      return false if vv.nil?
+      vv = [vv] unless vv.respond_to?(:to_a)
+      vv.each do |v|
+        if @uniques[i].include?(v)
+          results << false
+        else
+          @uniques[i] << v
+          results << true
+        end
+      end
     end
+    return false if results.all?(false)
     true
   end
 end

data/lib/factbase/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.14.7' unless const_defined?(:VERSION)
+  VERSION = '0.15.0' unless const_defined?(:VERSION)
 end

data/test/factbase/terms/test_ordering.rb

@@ -25,4 +25,20 @@ class TestOrdering < Factbase::Test
     refute(t.evaluate(fact('foo' => 41), [], Factbase.new))
     assert(t.evaluate(fact('foo' => 1), [], Factbase.new))
   end
+
+  def test_unique_with_multiple_arguments
+    t = Factbase::Term.new(:unique, %i[foo bar])
+    assert(t.evaluate(fact('foo' => 1, 'bar' => 'a'), [], Factbase.new))
+    assert(t.evaluate(fact('foo' => 1, 'bar' => 'b'), [], Factbase.new))
+    assert(t.evaluate(fact('foo' => 2, 'bar' => 'a'), [], Factbase.new))
+    refute(t.evaluate(fact('foo' => 1, 'bar' => 'a'), [], Factbase.new))
+  end
+
+  def test_unique_stops_when_all_arguments_are_duplicates
+    t = Factbase::Term.new(:unique, %i[foo bar baz])
+    assert(t.evaluate(fact('foo' => 1, 'bar' => 'x', 'baz' => true), [], Factbase.new))
+    assert(t.evaluate(fact('foo' => 2, 'bar' => 'x', 'baz' => false), [], Factbase.new))
+    assert(t.evaluate(fact('foo' => 1, 'bar' => 'y', 'baz' => true), [], Factbase.new))
+    refute(t.evaluate(fact('foo' => 1, 'bar' => 'x', 'baz' => true), [], Factbase.new))
+  end
 end

data/test/factbase/test_rules.rb

@@ -92,6 +92,21 @@ class TestRules < Factbase::Test
     end
   end
 
+  def test_fails_if_id_duplicates_are_there_already
+    fb = Factbase::Rules.new(Factbase.new, '(always)', uid: 'id')
+    fb.insert.then do |f|
+      f.id = 1
+      f.id = 2
+    end
+    assert_raises(StandardError) do
+      fb.txn do |fbt|
+        fbt.insert.then do |f|
+          f.foo = 42
+        end
+      end
+    end
+  end
+
   def test_in_combination_with_pre
     fb = Factbase::Rules.new(Factbase.new, '(when (exists a) (exists b))')
     fb =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.15.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Factbase
 test_files: []