factbase 0.19.11 → 0.19.12

data/lib/factbase/terms/max.rb

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: MIT
 
 require_relative '../../factbase'
-require_relative 'best'
 require_relative 'base'
+require_relative 'best'
 
 # The 'max' term.
 # This term calculates the max value among the evaluated operands.

data/lib/factbase/terms/min.rb

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: MIT
 
 require_relative '../../factbase'
-require_relative 'best'
 require_relative 'base'
+require_relative 'best'
 
 # The 'min' term.
 # This term calculates the minimum value among the evaluated operands.

data/lib/factbase/terms/nth.rb

@@ -23,11 +23,11 @@ class Factbase::Nth < Factbase::TermBase
   def evaluate(_fact, maps, _fb)
     assert_args(2)
     pos = @operands[0]
-    raise "An integer is expected, but #{pos} provided" unless pos.is_a?(Integer)
+    raise(ArgumentError, "An integer is expected, but #{pos} provided") unless pos.is_a?(Integer)
     k = @operands[1]
-    raise "A symbol is expected, but #{k} provided" unless k.is_a?(Symbol)
+    raise(ArgumentError, "A symbol is expected, but #{k} provided") unless k.is_a?(Symbol)
     m = maps[pos]
-    return nil if m.nil?
+    return if m.nil?
     m[k.to_s]
   end
 end

data/lib/factbase/terms/plus.rb

@@ -3,8 +3,8 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require_relative 'base'
 require_relative 'arithmetic'
+require_relative 'base'
 
 # Represents a Plus term in the Factbase system.
 # This class is used to perform addition operations on operands.

data/lib/factbase/terms/prev.rb

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: MIT
 
 require_relative 'base'
-# The Factbase::Unique class provides functionality for evaluating the uniqueness
-# of terms based on provided operands and facts.
+# The Factbase::Prev class returns the previous value of a property
+# during iteration, enabling comparisons between consecutive facts.
 class Factbase::Prev < Factbase::TermBase
   # Constructor.
   # @param [Array] operands Operands
@@ -21,9 +21,6 @@ class Factbase::Prev < Factbase::TermBase
   # @return [Object] The previous value
   def evaluate(fact, maps, fb)
     assert_args(1)
-    before = @prev
-    v = _values(0, fact, maps, fb)
-    @prev = v
-    before
+    @prev.tap { @prev = _values(0, fact, maps, fb) }
   end
 end

data/lib/factbase/terms/sorted.rb

@@ -27,9 +27,9 @@ class Factbase::Sorted < Factbase::TermBase
   def 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)
+    raise(ArgumentError, "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)
+    raise(ArgumentError, "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 }

data/lib/factbase/terms/sprintf.rb

@@ -22,9 +22,10 @@ class Factbase::Sprintf < Factbase::TermBase
   # @param [Factbase] fb Factbase to use for sub-queries
   # @return [String] The formatted string
   def evaluate(fact, maps, fb)
-    fmt = _values(0, fact, maps, fb)[0]
-    ops = (1..(@operands.length - 1)).map { |i| _values(i, fact, maps, fb)&.first }
-    formatted(fmt, ops)
+    formatted(
+      _values(0, fact, maps, fb)[0],
+      (1..(@operands.length - 1)).map { |i| _values(i, fact, maps, fb)&.first }
+    )
   end
 
   private
@@ -32,6 +33,6 @@ class Factbase::Sprintf < Factbase::TermBase
   def formatted(fmt, ops)
     format(*([fmt] + ops))
   rescue ArgumentError => e
-    raise "Cannot format #{ops.inspect} with '#{fmt}' in (sprintf ...): #{e.message}"
+    raise(RuntimeError, "Cannot format #{ops.inspect} with '#{fmt}' in (sprintf ...): #{e.message}")
   end
 end

data/lib/factbase/terms/sum.rb

@@ -23,7 +23,7 @@ class Factbase::Sum < Factbase::TermBase
   # @return [Integer] The sum of values for the specified key across all maps
   def evaluate(_fact, maps, _fb)
     k = @operands[0]
-    raise "A symbol is expected, but '#{k}' provided" unless k.is_a?(Symbol)
+    raise(ArgumentError, "A symbol is expected, but '#{k}' provided") unless k.is_a?(Symbol)
     sum = 0
     maps.each do |m|
       vv = m[k.to_s]

data/lib/factbase/terms/to_float.rb

@@ -22,7 +22,7 @@ class Factbase::ToFloat < Factbase::TermBase
   def evaluate(fact, maps, fb)
     assert_args(1)
     vv = _values(0, fact, maps, fb)
-    return nil if vv.nil?
-    vv[0].to_f
+    return if vv.nil?
+    Float(vv[0])
   end
 end

data/lib/factbase/terms/to_integer.rb

@@ -22,7 +22,7 @@ class Factbase::ToInteger < Factbase::TermBase
   def evaluate(fact, maps, fb)
     assert_args(1)
     vv = _values(0, fact, maps, fb)
-    return nil if vv.nil?
-    vv[0].to_i
+    return if vv.nil?
+    Integer(vv[0])
   end
 end

data/lib/factbase/terms/to_string.rb

@@ -22,7 +22,7 @@ class Factbase::ToString < Factbase::TermBase
   def evaluate(fact, maps, fb)
     assert_args(1)
     vv = _values(0, fact, maps, fb)
-    return nil if vv.nil?
+    return if vv.nil?
     vv[0].to_s
   end
 end

data/lib/factbase/terms/to_time.rb

@@ -22,7 +22,7 @@ class Factbase::ToTime < Factbase::TermBase
   def evaluate(fact, maps, fb)
     assert_args(1)
     vv = _values(0, fact, maps, fb)
-    return nil if vv.nil?
+    return if vv.nil?
     parse(vv[0])
   end
 
@@ -31,6 +31,6 @@ class Factbase::ToTime < Factbase::TermBase
   def parse(value)
     Time.parse(value.to_s)
   rescue ArgumentError => e
-    raise "Cannot parse '#{value}' as Time in (to_time ...): #{e.message}"
+    raise(RuntimeError, "Cannot parse '#{value}' as Time in (to_time ...): #{e.message}")
   end
 end

data/lib/factbase/terms/traced.rb

@@ -25,9 +25,9 @@ class Factbase::Traced < Factbase::TermBase
   def evaluate(fact, maps, fb)
     assert_args(1)
     t = @operands[0]
-    raise "A term is expected, but '#{t}' provided" unless t.is_a?(Factbase::Term)
+    raise(ArgumentError, "A term is expected, but '#{t}' provided") unless t.is_a?(Factbase::Term)
     r = t.evaluate(fact, maps, fb)
-    puts "#{self} -> #{r}" # rubocop:disable Lint/Debugger
+    puts("#{self} -> #{r}") # rubocop:disable Lint/Debugger
     r
   end
 end

data/lib/factbase/terms/undef.rb

@@ -24,9 +24,9 @@ class Factbase::Undef < Factbase::TermBase
   def evaluate(_fact, _maps, _fb)
     assert_args(1)
     fn = @operands[0]
-    raise "A symbol expected as first argument of 'undef'" unless fn.is_a?(Symbol)
+    raise(ArgumentError, "A symbol expected as first argument of 'undef'") unless fn.is_a?(Symbol)
     if Factbase::Term.private_method_defined?(fn, false)
-      Factbase::Term.class_eval("undef :#{fn}", __FILE__, __LINE__ - 1) # undef :foo
+      Factbase::Term.class_eval("undef :#{fn}", __FILE__, __LINE__ - 1)
     end
     true
   end

data/lib/factbase/terms/unique.rb

@@ -21,14 +21,10 @@ class Factbase::Unique < Factbase::TermBase
   # @return [Boolean] True if the value is unique, false otherwise
   def evaluate(fact, maps, fb)
     @seen = Set.new if @seen.nil?
-    raise "Too few operands for 'unique' (at least 1 expected)" if @operands.empty?
+    raise(ArgumentError, "Too few operands for 'unique' (at least 1 expected)") if @operands.empty?
     vv = (0..(@operands.size - 1)).map { |i| _values(i, fact, maps, fb) }
     return false if vv.any?(nil)
-    pass = true
-    Enumerator.product(*vv).to_a.each do |t|
-      pass = false if @seen.include?(t)
-      @seen << t
-    end
-    pass
+    tuples = Enumerator.product(*vv).to_a
+    tuples.none? { |t| @seen.include?(t) }.tap { tuples.each { |t| @seen << t } }
   end
 end

data/lib/factbase/to_json.rb

@@ -28,6 +28,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), @sorter).it.to_json
+    Factbase::Flatten.new(@fb.each.to_a, @sorter).it.to_json
   end
 end

data/lib/factbase/to_xml.rb

@@ -29,24 +29,20 @@ class Factbase::ToXML
   # Convert the entire factbase into XML.
   # @return [String] The factbase in XML format
   def xml
-    bytes = @fb.export
-    meta = {
-      version: Factbase::VERSION,
-      size: bytes.size
-    }
+    meta = { version: Factbase::VERSION, size: @fb.export.size }
     Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       xml.fb(meta) do
-        Factbase::Flatten.new(Marshal.load(bytes), @sorter).it.each do |m|
+        Factbase::Flatten.new(@fb.each.to_a, @sorter).it.each do |m|
           xml.f_ do
             m.sort.to_h.each do |k, vv|
               if vv.is_a?(Array)
-                xml.send(:"#{k}_") do
+                xml.__send__(:"#{k}_") do
                   vv.each do |v|
-                    xml.send(:v, to_str(v), t: type_of(v))
+                    xml.__send__(:v, to_str(v), t: type_of(v))
                   end
                 end
               else
-                xml.send(:"#{k}_", to_str(vv), t: type_of(vv))
+                xml.__send__(:"#{k}_", to_str(vv), t: type_of(vv))
               end
             end
           end

data/lib/factbase/to_yaml.rb

@@ -28,6 +28,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), @sorter).it)
+    YAML.dump(Factbase::Flatten.new(@fb.each.to_a, @sorter).it)
   end
 end

data/lib/factbase/version.rb

@@ -8,6 +8,5 @@
 # Copyright:: Copyright (c) 2024-2026 Yegor Bugayenko
 # License:: MIT
 class Factbase
-  # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.19.11' unless const_defined?(:VERSION)
+  VERSION = '0.19.12' unless const_defined?(:VERSION)
 end

data/lib/factbase.rb

@@ -98,6 +98,13 @@ class Factbase
     @maps.size
   end
 
+  # Iterate over all facts yielding plain hashes.
+  # @yieldparam [Hash] fact Each fact as a plain Hash
+  # @return [Integer, Enumerator] Total number of facts or Enumerator
+  def each(&)
+    @maps.each(&)
+  end
+
   # Insert a new fact and return it.
   #
   # A fact, when inserted, is empty. It doesn't contain any properties.
@@ -106,7 +113,7 @@ class Factbase
   def insert
     map = {}
     @maps << map
-    require_relative 'factbase/fact'
+    require_relative('factbase/fact')
     Factbase::Fact.new(map)
   end
 
@@ -132,7 +139,7 @@ class Factbase
   def query(term, maps = nil)
     maps ||= @maps
     term = to_term(term) if term.is_a?(String)
-    require_relative 'factbase/query'
+    require_relative('factbase/query')
     Factbase::Query.new(maps, term, self)
   end
 
@@ -140,7 +147,7 @@ class Factbase
   # @param [String] query The query to convert
   # @return [Factbase::Term] The term
   def to_term(query)
-    require_relative 'factbase/syntax'
+    require_relative('factbase/syntax')
     Factbase::Syntax.new(query).to_term
   end
 
@@ -161,15 +168,15 @@ class Factbase
   #
   # @return [Factbase::Churn] How many facts have been changed (zero if rolled back)
   def txn
-    require_relative 'factbase/lazy_taped'
+    require_relative('factbase/lazy_taped')
     taped = Factbase::LazyTaped.new(@maps)
-    require_relative 'factbase/churn'
+    require_relative('factbase/churn')
     churn = Factbase::Churn.new
-    catch :commit do
-      require_relative 'factbase/light'
+    catch(:commit) do
+      require_relative('factbase/light')
       commit = false
-      catch :rollback do
-        yield Factbase::Light.new(Factbase.new(taped))
+      catch(:rollback) do
+        yield(Factbase::Light.new(Factbase.new(taped)))
         commit = true
       end
       return churn unless commit
@@ -233,9 +240,19 @@ class Factbase
   # This method supports both the original format (Array of maps) and
   # the IndexedFactbase format (Hash with :maps and :idx keys).
   #
+  # SECURITY: the input must come from a source you trust, because it is
+  # deserialized with +Marshal.load+. Loading a +Marshal+ stream crafted
+  # by an attacker can execute arbitrary code in the calling process,
+  # so never call +import+ on bytes received over the network, read from
+  # a user-supplied path, or pulled from any other untrusted channel
+  # without an out-of-band integrity check. See the official Ruby
+  # security notes for +Marshal.load+ at
+  # https://docs.ruby-lang.org/en/3.3/security_rdoc.html#label-Marshal.load
+  # for details.
+  #
   # @param [String] bytes Binary string to import
   def import(bytes)
-    raise 'Empty input, cannot load a factbase' if bytes.empty?
+    raise(StandardError, 'Empty input, cannot load a factbase') if bytes.empty?
     data = Marshal.load(bytes)
     @maps +=
       if data.is_a?(Hash) && data.key?(:maps)

data/lib/fuzz.rb

@@ -36,18 +36,18 @@ class Factbase::Fuzz
   def initialize
     @next_num = 0
     @max_comments = 10
-    raise 'Not enough messages for fuzzing' if MESSAGES.size < @max_comments
+    raise(StandardError, 'Not enough messages for fuzzing') if MESSAGES.size < @max_comments
   end
 
   def self.make(count = 1000)
-    raise "Count must be positive: #{count}" if count.negative?
+    raise(ArgumentError, "Count must be positive: #{count}") if count.negative?
     fb = Factbase.new
     Factbase::Fuzz.new.feed(fb, count)
     fb
   end
 
   def feed(fb, count = 1)
-    raise "Count must be positive: #{count}" if count.negative?
+    raise(ArgumentError, "Count must be positive: #{count}") if count.negative?
     count.times do
       pull_request(fb, @next_num += 1)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.19.11
+  version: 0.19.12
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -187,7 +187,9 @@ files:
 - lib/factbase/indexed/indexed_fact.rb
 - lib/factbase/indexed/indexed_factbase.rb
 - lib/factbase/indexed/indexed_gt.rb
+- lib/factbase/indexed/indexed_gte.rb
 - lib/factbase/indexed/indexed_lt.rb
+- lib/factbase/indexed/indexed_lte.rb
 - lib/factbase/indexed/indexed_not.rb
 - lib/factbase/indexed/indexed_one.rb
 - lib/factbase/indexed/indexed_or.rb