factbase 0.15.7 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b838bd1c72935c372a1926b7d3b36014d0d24820fec78488f0a8e0cd576201f3
-  data.tar.gz: 486fd691abaed4a4f96008cf9cceff19794e98a4d520e70f3590abb2e66020e6
+  metadata.gz: 96133055dc92095960ab4b258f4a144105393d2a86e11f96c3199ff24d35653a
+  data.tar.gz: f93590d550bf7b54aaa235e43557173d57af37abdc9e0a37491cf68c654e2c1e
 SHA512:
-  metadata.gz: 99836756e81031997fd5f8defb0e1912b43c50efbe4d63caf8cd164eddba8af0c45d17be346ddfb37a879071b315047a4e4f99c40a7394b988cf008fa52fd8b8
-  data.tar.gz: fdae1ae2d2f4e0d6368b4b9997366f5b9f1fd55398b88d541cb6fc29ea5b2ddaae01c1ad77666d873d17703a927af8df8abc2e875d57195151d236699998fbe6
+  metadata.gz: 2a532d7b59b0fa32d5662c420fb1d0de409d1c9cdf52fd6cf42c3020fd20a2008679019cf853a49e7ac1b0c9207d87134ffe1f23693f652a99188c8c6bd518f2
+  data.tar.gz: 67df97f44bdfbbcdba5cb5b7cec6a2f62cf9b4049f0a3d643382d797d9ec2997160ac231e871a18642c8fbd903387412e6c741d367f4e4362019d3a45a4cf6e3

data/Gemfile.lock

@@ -72,7 +72,7 @@ GEM
       psych (>= 4.0.0)
     regexp_parser (2.11.2)
     rexml (3.4.2)
-    rubocop (1.80.1)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -86,7 +86,7 @@ GEM
     rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-minitest (0.38.1)
+    rubocop-minitest (0.38.2)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)

data/README.md

@@ -176,6 +176,12 @@ It's also possible to use a sub-query in a shorter form than with the `agg`:
 
 * `(empty q)` is true if the subquery `q` is empty
 
+It's possible to post-process a list of facts, for `agg` and `join`:
+
+* `(sorted p expr)` sorts them by the value of `p` property
+* `(inverted expr)` reverses them
+* `(head n expr)` takes only `n` facts from the head of the list
+
 There are some system-level terms:
 
 * `(env v1 v2)` returns the value of environment variable `v1` or the string

data/lib/factbase/cached/cached_term.rb

@@ -17,6 +17,7 @@ module Factbase::CachedTerm
   # @return [bool] TRUE if matches
   def evaluate(fact, maps, fb)
     return super unless static? && !abstract?
+    return super if %i[head unique].include?(@op)
     key = [maps.object_id, to_s]
     before = @cache[key]
     @cache[key] = super if before.nil?

data/lib/factbase/indexed/indexed_term.rb

@@ -19,7 +19,7 @@ module Factbase::IndexedTerm
   # @param [Array<Hash>] maps Array of facts
   # @param [Hash] params Key/value params to use
   # @return [Array<Hash>|nil] Returns a new array, or NIL if the original array must be used
-  def predict(maps, params)
+  def predict(maps, fb, params)
     key = [maps.object_id, @operands.first, @op]
     case @op
     when :one
@@ -144,7 +144,7 @@ module Factbase::IndexedTerm
         r = (maps & []) | j
       else
         @operands.each do |o|
-          n = o.predict(maps, params)
+          n = o.predict(maps, fb, params)
           break if n.nil?
           if r.nil?
             r = n
@@ -159,7 +159,7 @@ module Factbase::IndexedTerm
     when :or
       r = nil
       @operands.each do |o|
-        n = o.predict(maps, params)
+        n = o.predict(maps, fb, params)
         if n.nil?
           r = nil
           break
@@ -171,7 +171,7 @@ module Factbase::IndexedTerm
       r
     when :not
       if @idx[key].nil?
-        yes = @operands.first.predict(maps, params)
+        yes = @operands.first.predict(maps, fb, params)
         if yes.nil?
           @idx[key] = { r: nil }
         else

data/lib/factbase/logged.rb

@@ -146,10 +146,11 @@ class Factbase::Logged
         end
       raise ".query(#{@term.to_s.inspect}).each() of #{qry.class} returned #{r.class}" unless r.is_a?(Integer)
       q = Factbase::Syntax.new(@term).to_term.to_s
+      q = "#{q} with {#{params.map { |k, v| "#{k}=#{v}" }.join(', ')}}" if params.is_a?(Hash) && !params.empty?
       if r.zero?
-        @tube.say(start, "Zero/#{@fb.size} facts found by '#{q}' #{tail}")
+        @tube.say(start, "Zero/#{@fb.size} facts found by #{q} #{tail}")
       else
-        @tube.say(start, "Found #{r}/#{@fb.size} fact(s) by '#{q}' #{tail}")
+        @tube.say(start, "Found #{r}/#{@fb.size} fact(s) by #{q} #{tail}")
       end
       r
     end
@@ -180,11 +181,11 @@ class Factbase::Logged
         end
       raise ".delete! of #{@term.class} returned #{r.class}" unless r.is_a?(Integer)
       if before.zero?
-        @tube.say(start, "There were no facts, nothing deleted by '#{@term}' #{tail}")
+        @tube.say(start, "There were no facts, nothing deleted by #{@term} #{tail}")
       elsif r.zero?
-        @tube.say(start, "No facts out of #{before} deleted by '#{@term}' #{tail}")
+        @tube.say(start, "No facts out of #{before} deleted by #{@term} #{tail}")
       else
-        @tube.say(start, "Deleted #{r} fact(s) out of #{before} by '#{@term}' #{tail}")
+        @tube.say(start, "Deleted #{r} fact(s) out of #{before} by #{@term} #{tail}")
       end
       r
     end

data/lib/factbase/query.rb

@@ -44,7 +44,7 @@ class Factbase::Query
     return to_enum(__method__, fb, params) unless block_given?
     yielded = 0
     params = params.transform_keys(&:to_s) if params.is_a?(Hash)
-    maybe = @term.predict(@maps, Factbase::Tee.new({}, params))
+    maybe = @term.predict(@maps, fb, Factbase::Tee.new({}, params))
     maybe ||= @maps unless maybe.equal?(@maps)
     maybe.each do |m|
       extras = {}

data/lib/factbase/tee.rb

@@ -27,7 +27,8 @@ class Factbase::Tee
   end
 
   def all_properties
-    @fact.all_properties + (@upper.is_a?(Hash) ? @upper.keys : @upper.all_properties)
+    (@fact.is_a?(Hash) ? @fact.keys : @fact.all_properties) +
+      (@upper.is_a?(Hash) ? @upper.keys : @upper.all_properties)
   end
 
   others do |*args|

data/lib/factbase/term.rb

@@ -53,6 +53,9 @@ class Factbase::Term
   require_relative 'terms/aggregates'
   include Factbase::Aggregates
 
+  require_relative 'terms/lists'
+  include Factbase::Lists
+
   require_relative 'terms/strings'
   include Factbase::Strings
 
@@ -107,8 +110,13 @@ class Factbase::Term
   # @param [Array<Hash>] maps Records to iterate, maybe
   # @param [Hash] _params Params to use (keys must be strings, not symbols, with values as arrays)
   # @return [Array<Hash>] Records to iterate
-  def predict(maps, _params)
-    maps
+  def predict(maps, fb, params)
+    m = :"#{@op}_predict"
+    if respond_to?(m)
+      send(m, maps, fb, params)
+    else
+      maps
+    end
   end
 
   # Does it match the fact?

data/lib/factbase/terms/lists.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../factbase'
+
+# Lists management.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
+# License:: MIT
+module Factbase::Lists
+  def sorted(_fact, _maps, _fb)
+    true
+  end
+
+  def sorted_predict(maps, fb, params)
+    assert_args(2)
+    prop = @operands[0]
+    raise "A symbol is expected as first argument of 'sorted'" unless prop.is_a?(Symbol)
+    term = @operands[1]
+    raise "A term is expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
+    fb.query(term, maps).each(fb, params).to_a
+      .reject { |m| m[prop].nil? }
+      .sort_by { |m| m[prop].first }
+      .map { |m| m.all_properties.to_h { |k| [k, m[k]] } }
+  end
+
+  def inverted(_fact, _maps, _fb)
+    true
+  end
+
+  def inverted_predict(maps, fb, params)
+    assert_args(1)
+    term = @operands[0]
+    raise "A term is expected, but '#{term}' provided" unless term.is_a?(Factbase::Term)
+    fb.query(term, maps).each(fb, params).to_a
+      .reverse
+      .map { |m| m.all_properties.to_h { |k| [k, m[k]] } }
+  end
+end

data/lib/factbase/terms/ordering.rb

@@ -31,4 +31,12 @@ module Factbase::Ordering
     end
     pass
   end
+
+  def head(*)
+    max = @operands[0]
+    raise "An integer is expected as first argument of 'head'" unless max.is_a?(Integer)
+    @passed = 0 if @passed.nil?
+    @passed += 1
+    @passed <= max
+  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.15.7' unless const_defined?(:VERSION)
+  VERSION = '0.16.0' unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.16.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -202,6 +202,7 @@ files:
 - lib/factbase/terms/casting.rb
 - lib/factbase/terms/debug.rb
 - lib/factbase/terms/defn.rb
+- lib/factbase/terms/lists.rb
 - lib/factbase/terms/logical.rb
 - lib/factbase/terms/math.rb
 - lib/factbase/terms/meta.rb