factbase 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62ac48c3d2c181b0064e519947fa2fed0ecb0b81660663c91319233eb2fc529
-  data.tar.gz: f3131120095c0ece6cb01313bad9f55d58145ee289dfc4a4f8bd7e949778521b
+  metadata.gz: a5185906fd48ccc7df8bfd07a8dd88ae4e7ce4636ec40b3cc3fc174cdeb347d1
+  data.tar.gz: a0bc08ef0001d876b9cd26c31fd4a59f094f9ad88dbbb002e345ca4c47cc1a7f
 SHA512:
-  metadata.gz: d7325ad6538622ef5e8764547314ac2970827b44eb70dd37acde333505bd630370bf4ccfe7d1b35916592b89b4dd346c82bcb0c2f2d7532994cfbef0d2a23467
-  data.tar.gz: eb8554fb580ec058551d6f4f43e47dac22ff13ee427195595a1d9f40caf7f51c59c0c697a849136618a625addf82f726b658752caf755b7eab84b3482a0a8b28
+  metadata.gz: ad553e4da47bb2a6af81a07a64d627dc03ebfe68f96000bc1862df8a25e5bd3cc1563d93ef3a184932af6af286e47912789ca232154cadef512cfc97a3341387
+  data.tar.gz: b85a0a97e043e3bc4fa03396a3073c63f18cc268bf296174df66045b7ce47ccd082eb2cbe92d1cd1b07c7a43225ebcd830f624abccdd7d71bfae78825c05dcc5

data/Gemfile

@@ -28,7 +28,7 @@ gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.64.1', require: false
 gem 'rubocop-performance', '1.21.0', require: false
-gem 'rubocop-rspec', '2.31.0', require: false
+gem 'rubocop-rspec', '3.0.1', 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

@@ -2,6 +2,7 @@ PATH
   remote: .
   specs:
     factbase (0.0.0)
+      backtrace (~> 0.3)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
@@ -38,6 +39,7 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    backtrace (0.4.0)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
@@ -47,11 +49,11 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
@@ -62,13 +64,13 @@ GEM
     loog (0.5.1)
     minitest (5.23.1)
     mutex_m (0.2.0)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x64-mingw-ucrt)
+    nokogiri (1.16.6-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     parallel (1.25.1)
     parser (3.3.3.0)
@@ -111,7 +113,7 @@ GEM
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -139,19 +141,10 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.1)
+    rubocop-rspec (3.0.1)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -163,7 +156,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     tago (0.0.2)
     thor (1.3.1)
@@ -173,7 +166,7 @@ GEM
     webrick (1.8.1)
     yaml (0.3.0)
     yard (0.9.36)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-22
@@ -188,7 +181,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.2)
   rubocop (= 1.64.1)
   rubocop-performance (= 1.21.0)
-  rubocop-rspec (= 2.31.0)
+  rubocop-rspec (= 3.0.1)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   yard (= 0.9.36)

data/README.md

@@ -55,53 +55,57 @@ assert(f2.query('(eq foo 42)').each.to_a.size == 1)
 ```
 
 There are some boolean terms available in a query
-(they return either TRUE or FALSE):
-
-* `(always)` and `(never)` are "true" and "false"
-* `(not t)` inverses the `t` if it's boolean (exception otherwise)
-* `(or t1 t2 ...)` returns true if at least one argument is true
-* `(and t1 t2 ...)` returns true if all arguments are true
-* `(when t1 t2)` returns true if `t1` is true and `t2` is true or `t1` is false
-* `(exists k)` returns true if `k` property exists in the fact
-* `(absent k)` returns true if `k` property is absent
-* `(eq a b)` returns true if `a` equals to `b`
-* `(lt a b)` returns true if `a` is less than `b`
-* `(gt a b)` returns true if `a` is greater than `b`
-* `(many a)` return true if there are many values in the `a` property
-* `(one a)` returns true if there is only one value in the `a` property
-* `(matches a re)` returns true when `a` matches regular expression `re`
+(they return either `true` or `false`):
+
+* `(always)` and `(never)` are `true` and `false`
+* `(nil v)` is `true` if `v` is `nil`
+* `(not b)` is the inverse of `b`
+* `(or b1 b2 ...)` is `true` if at least one argument is `true`
+* `(and b1 b2 ...)` — if all arguments are `true`
+* `(when b1 b2)` — if `b1` is `true` and `b2` is `true`
+or `b1` is `false`
+* `(exists p)` — if `p` property exists
+* `(absent p)` — if `p` property is absent
+* `(zero v)` — if any `v` equals to zero
+* `(eq v1 v2)` — if any `v1` equals to any `v2`
+* `(lt v1 v2)` — if any `v1` is less than any `v2`
+* `(gt v1 v2)` — if any `v1` is greater than any `v2`
+* `(many v)` — if `v` has many values
+* `(one v)` — if `v` has one value
+* `(matches v s)` — if any `v` matches the `s` regular expression
 
 There are a few terms that return non-boolean values:
 
-* `(at i a)` returns the `i`-th value of the `a` property
-* `(size k)` returns cardinality of `k` property (zero if property is absent)
-* `(type a)` returns type of `a` ("String", "Integer", "Float", or "Time")
-* `(either a b)` returns `b` if `a` is `nil`
+* `(at i v)` is the `i`-th value of `v`
+* `(size v)` is the cardinality of `v` (zero if `v` is `nil`)
+* `(type v)` is the type of `v`
+(`"String"`, `"Integer"`, `"Float"`, `"Time"`, or `"Array"`)
+* `(either v1 v1)` is `v2` if `v1` is `nil`
+
+It's possible to modify the facts retrieved, on fly:
+
+* `(as p v)` adds property `p` with the value `v`
+* `(join s t)` adds properties named by the `s` mask with the values retrieved
+by the `t` term, for example, `(join "foo_*" (gt x 5))` will add `foo_x` and
+all other properties found in the facts that match `(gt x 5)`
 
 Also, some simple arithmetic:
 
-* `(plus a b)` is a sum of `a` and `b`
-* `(minus a b)` is a deducation of `b` from `a`
-* `(times a b)` is a multiplication of `a` and `b`
-* `(div a b)` is a division of `a` by `b`
+* `(plus v1 v2)` is a sum of `∑v1` and `∑v2`
+* `(minus v1 v2)` is a deducation of `∑v2` from `∑v1`
+* `(times v1 v2)` is a multiplication of `∏v1` and `∏v2`
+* `(div v1 v2)` is a division of `∏v1` by `∏v2`
 
 One term is for meta-programming:
 
-* `(defn foo "self.to_s")` defines a new term using Ruby syntax and returns true
-* `(undef foo)` undefines a term (nothing happens if it's not defined yet)
+* `(defn f "self.to_s")` defines a new term using Ruby syntax and returns `true`
+* `(undef f)` undefines a term (nothing happens if it's not defined yet),
+returns `true`
 
 There are terms that are history of search aware:
 
-* `(prev a)` returns the value of `a` in the previously seen fact
-* `(unique k)` returns true if the value of `k` property hasn't been seen yet
-
-There are also terms that match the entire factbase
-and must be used inside the `(agg ..)` term:
-
-* `(count)` returns the tally of facts
-* `(max k)` returns the maximum value of the `k` property in all facts
-* `(min k)` returns the minimum
-* `(sum k)` returns the arithmetic sum of all values of the `k` property
+* `(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
 
 The `agg` term enables sub-queries by evaluating the first argument (term)
 over all available facts, passing the entire subset to the second argument,
@@ -110,6 +114,19 @@ and then returning the result as an atomic value:
 * `(lt age (agg (eq gender 'F') (max age)))` selects all facts where
 the `age` is smaller than the maximum `age` of all women
 * `(eq id (agg (always) (max id)))` selects the fact with the largest `id`
+* `(eq salary (agg (eq dept $dept) (avg salary)))` selects the facts
+with the salary average in their departments
+
+There are also terms that match the entire factbase
+and must be used primarily inside the `(agg ..)` term:
+
+* `(nth v p)` returns the `p` property of the _v_-th fact (must be
+a positive integer)
+* `(first p)` returns the `p` property of the first fact
+* `(count)` returns the tally of facts
+* `(max p)` returns the maximum value of the `p` property in all facts
+* `(min p)` returns the minimum
+* `(sum p)` returns the arithmetic sum of all values of the `p` property
 
 ## How to contribute
 

data/factbase.gemspec

@@ -42,6 +42,7 @@ 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 'backtrace', '~>0.3'
   s.add_runtime_dependency 'json', '~>2.7'
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~>1.10'

data/lib/factbase/{tuples.rb → accum.rb}

@@ -22,55 +22,54 @@
 
 require_relative '../factbase'
 
-# With the help of this class, it's possible to select a few facts
-# from a factbase at a time, which depend on each other. For example,
-# it's necessary to find a fact where the +name+ is set and then find
-# another fact, where the salary is the +salary+ is the same as in the
-# first found fact. Here is how:
-#
-#  Factbase::Tuples.new(qt, ['(exists name)', '(eq salary, {f0.salary})']).each do |a, b|
-#    puts a.name
-#    puts b.salary
-#  end
-#
-# Here, the +{f0.salary}+ is a special substitution place, which is replaced
-# by the +salary+ of the fact that is found by the previous query.
-#
-# The indexing of queries starts from zero.
+# Accumulator of props.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
-class Factbase::Tuples
-  def initialize(fb, queries)
-    @fb = fb
-    @queries = queries
+class Factbase::Accum
+  # Ctor.
+  # @param [Factbase::Fact] fact The fact to decorate
+  # @param [Hash] props Hash of props that were set
+  # @param [Boolean] pass TRUE if all "set" operations must go through, to the +fact+
+  def initialize(fact, props, pass)
+    @fact = fact
+    @props = props
+    @pass = pass
   end
 
-  # Iterate them one by one.
-  # @yield [Array<Fact>] Arrays of facts one-by-one
-  # @return [Integer] Total number of arrays yielded
-  def each(&)
-    return to_enum(__method__) unless block_given?
-    each_rec([], @queries, &)
+  def to_s
+    @fact.to_s
   end
 
-  private
-
-  def each_rec(facts, tail, &)
-    qq = tail.dup
-    q = qq.shift
-    return if q.nil?
-    qt = q.gsub(/\{f([0-9]+).([a-z0-9_]+)\}/) do
-      facts[Regexp.last_match[1].to_i].send(Regexp.last_match[2])
+  def method_missing(*args)
+    k = args[0].to_s
+    if k.end_with?('=')
+      kk = k[0..-2]
+      @props[kk] = [] if @props[kk].nil?
+      @props[kk] << args[1]
+      @fact.method_missing(*args) if @pass
+      return
     end
-    @fb.query(qt).each do |f|
-      fs = facts + [f]
-      if qq.empty?
-        yield fs
-      else
-        each_rec(fs, qq, &)
-      end
+    if k == '[]'
+      kk = args[1].to_s
+      vv = @props[kk].nil? ? [] : @props[kk]
+      vvv = @fact.method_missing(*args)
+      vv += vvv unless vvv.nil?
+      vv.uniq!
+      return vv.empty? ? nil : vv
     end
+    return @props[k][0] unless @props[k].nil?
+    @fact.method_missing(*args)
+  end
+
+  # rubocop:disable Style/OptionalBooleanParameter
+  def respond_to?(_method, _include_private = false)
+    # rubocop:enable Style/OptionalBooleanParameter
+    true
+  end
+
+  def respond_to_missing?(_method, _include_private = false)
+    true
   end
 end

data/lib/factbase/fact.rb

@@ -69,14 +69,9 @@ class Factbase::Fact
       raise "Prop type '#{v.class}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
       v = v.utc if v.is_a?(Time)
       @mutex.synchronize do
-        before = @map[kk]
-        return if before == v
-        if before.nil?
-          @map[kk] = [v]
-        else
-          @map[kk] << v
-          @map[kk].uniq!
-        end
+        @map[kk] = [] if @map[kk].nil?
+        @map[kk] << v
+        @map[kk].uniq!
       end
       nil
     elsif k == '[]'
@@ -87,7 +82,7 @@ class Factbase::Fact
         raise "Can't get '#{k}', the fact is empty" if @map.empty?
         raise "Can't find '#{k}' attribute out of [#{@map.keys.join(', ')}]"
       end
-      v.is_a?(Array) ? v[0] : v
+      v[0]
     end
   end
 

data/lib/factbase/looged.rb

@@ -55,7 +55,6 @@ class Factbase::Looged
 
   def txn(this = self, &)
     start = Time.now
-    before = @fb.size
     id = nil
     rollback = false
     r = @fb.txn(this) do |fbt|
@@ -68,7 +67,7 @@ class Factbase::Looged
     if rollback
       @loog.debug("Txn ##{id} rolled back in #{start.ago}")
     else
-      @loog.debug("Txn ##{id} #{r ? 'modified' : 'didn\'t touch'} #{before} facts in #{start.ago}")
+      @loog.debug("Txn ##{id} #{r ? 'modified' : 'didn\'t touch'} the factbase in #{start.ago}")
     end
     r
   end

data/lib/factbase/query.rb

@@ -23,12 +23,15 @@
 require_relative '../factbase'
 require_relative 'syntax'
 require_relative 'fact'
+require_relative 'accum'
 
 # Query.
 #
 # This is an internal class, it is not supposed to be instantiated directly. It
 # is created by the +query()+ method of the +Factbase+ class.
 #
+# It is NOT thread-safe!
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -51,13 +54,15 @@ class Factbase::Query
     term = Factbase::Syntax.new(@query).to_term
     yielded = 0
     @maps.each do |m|
+      extras = {}
       f = Factbase::Fact.new(@mutex, m)
-      r = term.evaluate(f, @maps)
+      a = Factbase::Accum.new(f, extras, false)
+      r = term.evaluate(a, @maps)
       unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
         raise "Unexpected evaluation result (#{r.class}), must be Boolean at #{@query}"
       end
       next unless r
-      yield f
+      yield Factbase::Accum.new(f, extras, true)
       yielded += 1
     end
     yielded

data/lib/factbase/syntax.rb

@@ -44,7 +44,7 @@ class Factbase::Syntax
   def to_term
     build.simplify
   rescue StandardError => e
-    err = "#{e.message} in #{@query}"
+    err = "#{e.message} in \"#{@query}\""
     err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
     raise err
   end
@@ -142,7 +142,7 @@ class Factbase::Syntax
       elsif t.match?(/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/)
         Time.parse(t)
       else
-        raise "Wrong symbol format (#{t})" unless t.match?(/^[_a-z][a-zA-Z0-9_]*$/)
+        raise "Wrong symbol format (#{t})" unless t.match?(/^[_a-z\$][a-zA-Z0-9_]*$/)
         t.to_sym
       end
     end

data/lib/factbase/tee.rb

@@ -0,0 +1,57 @@
+# 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'
+
+# Tee of two facts.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Factbase::Tee
+  # Ctor.
+  # @param [Factbase::Fact] fact Primary fact to use for reading
+  # @param [Factbase::Fact] upper Fact to access with a "$" prefix
+  def initialize(fact, upper)
+    @fact = fact
+    @upper = upper
+  end
+
+  def to_s
+    @fact.to_s
+  end
+
+  def method_missing(*args)
+    return @upper[args[1].to_s[1..]] if args[0].to_s == '[]' && args[1].to_s.start_with?('$')
+    @fact.method_missing(*args)
+  end
+
+  # rubocop:disable Style/OptionalBooleanParameter
+  def respond_to?(_method, _include_private = false)
+    # rubocop:enable Style/OptionalBooleanParameter
+    true
+  end
+
+  def respond_to_missing?(_method, _include_private = false)
+    true
+  end
+end