factbase 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce648530bed16f5d251c8d84dae0a3c8726f1c688fbfdbf3723a39fe9f3e696
-  data.tar.gz: e0f31869dab8d231f63d2c075661e2e4ead17576d258bcc6bd19a643a659e35b
+  metadata.gz: 58a162c50ba7d2b9d21ca0ff2d62e34acd0c46d2666b596ceffcceb2dc4215c0
+  data.tar.gz: 61514fa0fa904ea71540c0f9d4776ea75d5405aa5a1b73d32e051c29606b5fdb
 SHA512:
-  metadata.gz: a2e76c6c010157ba7aff6098e44c9cde7958d288b0bb7ea41a69201ab1783763da31f657c52156a2991ac02fe56e48d31acdb3fb71749827eb126b5a363416e5
-  data.tar.gz: 908fa035b142fea947303b3306b38f3443e782d4a182f158d6674cc8396a704fb45cc68b4533ce61ded2e98a7fe57c2fd23716706df56b0a7254aa8f5dd35539
+  metadata.gz: 7b3841073dba72e3fcc6e1fd089235d93829264504447557b3b23f6eb3fa74a4ebccad0d27062af84dc00ab115ca06d9dcc9621bf245d54e09b121bb21983737
+  data.tar.gz: aed653f93b7505db410e81d9fefd8fe9d38fc6b89947f89c952992bcdd76dab1d5f9e4a8cd941df426cb7b200855f26fb2981a9698ac35e8e6ea682c693787e7

data/README.md

@@ -16,6 +16,14 @@ A fact is simply a map of properties and 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 implemention 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
@@ -60,9 +68,14 @@ All terms available in a query:
 * `(gt a b)` returns true if `a` is greater than `b`
 * `(size k)` returns cardinality of `k` property (zero if property is absent)
 * `(type a)` returns type of `a` ("String", "Integer", "Float", or "Time")
-* `(matches a re)` returns type when `a` matches regular expression `re`
+* `(matches a re)` returns true when `a` matches regular expression `re`
 * `(defn foo "self.to_s")` defines a new term using Ruby syntax and returns true
 
+There are also terms that match the entire factbase:
+
+* `(max k)` returns true if the value of `k` property is the largest in the entire factbase
+* `(min k)` returns true if the value of `k` is the smallest
+
 ## How to contribute
 
 Read [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).

data/lib/factbase/looged.rb

@@ -42,7 +42,7 @@ class Factbase::Looged
 
   def insert
     f = @fb.insert
-    @loog.debug('Inserted new fact')
+    @loog.debug("Inserted new fact ##{@fb.size}")
     Fact.new(f, @loog)
   end
 
@@ -79,6 +79,7 @@ class Factbase::Looged
       v = args[1]
       s = v.is_a?(Time) ? v.utc.iso8601 : v.to_s
       s = v.to_s.inspect if v.is_a?(String)
+      s = "#{s[0..40]}...#{s[-40..]}" if s.length > 80
       @loog.debug("Set '#{k[0..-2]}' to #{s} (#{v.class})") if k.end_with?('=')
       r
     end
@@ -103,13 +104,14 @@ class Factbase::Looged
     end
 
     def each(&)
+      q = Factbase::Syntax.new(@expr).to_term.to_s
       if block_given?
         r = @query.each(&)
         raise ".each of #{@query.class} returned #{r.class}" unless r.is_a?(Integer)
         if r.zero?
-          @loog.debug("Nothing found by '#{@expr}'")
+          @loog.debug("Nothing found by '#{q}'")
         else
-          @loog.debug("Found #{r} fact(s) by '#{@expr}'")
+          @loog.debug("Found #{r} fact(s) by '#{q}'")
         end
         r
       else
@@ -120,9 +122,9 @@ class Factbase::Looged
         end
         # rubocop:enable Style/MapIntoArray
         if array.empty?
-          @loog.debug("Nothing found by '#{@expr}'")
+          @loog.debug("Nothing found by '#{q}'")
         else
-          @loog.debug("Found #{array.size} fact(s) by '#{@expr}'")
+          @loog.debug("Found #{array.size} fact(s) by '#{q}'")
         end
         array
       end

data/lib/factbase/query.rb

@@ -40,7 +40,7 @@ class Factbase::Query
   # @return [Integer] Total number of facts yielded
   def each
     return to_enum(__method__) unless block_given?
-    term = Factbase::Syntax.new(@query).to_term
+    term = Factbase::Syntax.new(@query).to_term.on(@maps)
     yielded = 0
     @maps.each do |m|
       f = Factbase::Fact.new(@mutex, m)

data/lib/factbase/term.rb

@@ -45,6 +45,18 @@ class Factbase::Term
     send(@op, fact)
   end
 
+  # Put it into the context: let it see the entire array of maps.
+  # @param [Array] maps The maps
+  # @return [Factbase::Term] Itself
+  def on(maps)
+    m = "#{@op}_on"
+    send(m, maps) if respond_to?(m, true)
+    @operands.each do |o|
+      o.on(maps) if o.is_a?(Factbase::Term)
+    end
+    self
+  end
+
   # Turns it into a string.
   # @return [String] The string of it
   def to_s
@@ -71,25 +83,19 @@ class Factbase::Term
 
   def not(fact)
     assert_args(1)
-    r = @operands[0].evaluate(fact)
-    raise 'Boolean expected' unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
-    !r
+    !only_bool(the_value(0, fact))
   end
 
   def or(fact)
-    @operands.each do |o|
-      r = o.evaluate(fact)
-      raise 'Boolean expected' unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
-      return true if r
+    (0..@operands.size - 1).each do |i|
+      return true if only_bool(the_value(i, fact))
     end
     false
   end
 
   def and(fact)
-    @operands.each do |o|
-      r = o.evaluate(fact)
-      raise 'Boolean expected' unless r.is_a?(TrueClass) || r.is_a?(FalseClass)
-      return false unless r
+    (0..@operands.size - 1).each do |i|
+      return false unless only_bool(the_value(i, fact))
     end
     true
   end
@@ -174,6 +180,26 @@ class Factbase::Term
     true
   end
 
+  def min(fact)
+    vv = the_value(0, fact)
+    return nil if vv.nil?
+    vv.any? { |v| v == @min }
+  end
+
+  def max(fact)
+    vv = the_value(0, fact)
+    return nil if vv.nil?
+    vv.any? { |v| v == @max }
+  end
+
+  def max_on(maps)
+    @max = best(maps) { |v, b| v > b }
+  end
+
+  def min_on(maps)
+    @min = best(maps) { |v, b| v < b }
+  end
+
   def assert_args(num)
     c = @operands.size
     raise "Too many (#{c}) operands for '#{@op}' (#{num} expected)" if c > num
@@ -195,4 +221,26 @@ class Factbase::Term
     v = [v] unless v.is_a?(Array)
     v
   end
+
+  def only_bool(val)
+    val = val[0] if val.is_a?(Array)
+    return false if val.nil?
+    raise "Boolean expected, while #{val.class} received" unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
+    val
+  end
+
+  def best(maps)
+    k = @operands[0]
+    raise "A symbol expected, but provided: #{k}" unless k.is_a?(Symbol)
+    best = nil
+    maps.each do |m|
+      vv = m[k.to_s]
+      next if vv.nil?
+      vv = [vv] unless vv.is_a?(Array)
+      vv.each do |v|
+        best = v if best.nil? || yield(v, best)
+      end
+    end
+    best
+  end
 end

data/lib/factbase.rb

@@ -29,7 +29,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.29'
+  VERSION = '0.0.30'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_fact.rb

@@ -84,6 +84,14 @@ class TestFact < Minitest::Test
     assert_equal(42, f.foo_bar, f.to_s)
   end
 
+  def test_set_twice_same_value
+    map = {}
+    f = Factbase::Fact.new(Mutex.new, map)
+    f.foo = 42
+    f.foo = 42
+    assert_equal(42, map['foo'])
+  end
+
   def test_time_in_utc
     f = Factbase::Fact.new(Mutex.new, {})
     t = Time.now

data/test/factbase/test_looged.rb

@@ -69,13 +69,30 @@ class TestLooged < Minitest::Test
     fb.insert
     fb.insert.bar = 3
     fb.insert
+    fb.insert.str =
+      "Он поскорей звонит. Вбегает
+      К нему слуга француз Гильо,
+      Халат и туфли предлагает
+      И подает ему белье.
+      Спешит Онегин одеваться,
+      Слуге велит приготовляться
+      С ним вместе ехать и с собой
+      Взять также ящик боевой.
+      Готовы санки беговые.
+      Он сел, на мельницу летит.
+      Примчались. Он слуге велит
+      Лепажа стволы роковые
+      Нести за ним, а лошадям
+      Отъехать в поле к двум дубкам."
     fb.query('(exists bar)').each(&:to_s)
     fb.query('(not (exists bar))').delete!
     [
-      'Inserted new fact',
+      'Inserted new fact #1',
+      'Inserted new fact #2',
       'Set \'bar\' to 3 (Integer)',
+      'Set \'str\' to "Он поскорей звонит. Вбегает\n      К нем...м\n      Отъехать в поле к двум дубкам." (String)',
       'Found 1 fact(s) by \'(exists bar)\'',
-      'Deleted 2 fact(s) by \'(not (exists bar))\''
+      'Deleted 3 fact(s) by \'(not (exists bar))\''
     ].each do |s|
       assert(log.to_s.include?("#{s}\n"), "#{log}\n")
     end

data/test/factbase/test_query.rb

@@ -60,6 +60,10 @@ class TestQuery < Minitest::Test
       '(eq (size hello) 0)' => 3,
       '(eq num pi)' => 0,
       '(absent time)' => 2,
+      '(max num)' => 1,
+      '(and (exists time) (max num))' => 0,
+      '(and (exists pi) (max num))' => 1,
+      '(min time)' => 1,
       '(and (absent time) (exists pi))' => 1,
       "(and (exists time) (not (\t\texists pi)))" => 1,
       "(or (eq num 66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Yegor Bugayenko