factbase 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc97bfbf967aa07fa189c2d3c696eb8d963f4647c06fb5d97ca4b0e2b4edb4db
-  data.tar.gz: b38987779b663f76cbf9876b4e117cd1fabb3e1c2ef07bd6ab433be0dede9a44
+  metadata.gz: c801d7ec256766a03b081de5949367aef74dc991b67207ae30c6e6229f11c425
+  data.tar.gz: 2cfc12996cc7e4d85fad86377ddc9b87916d5d2a1cbe5542ba8128488c1e0049
 SHA512:
-  metadata.gz: 97cdc3269d4fbfea8d7246f6cee197be5bdf8b1e463573940b9be2384cbc2718a454e7f1291c5efc11554fc59c84a97c9349def6413d0ee54192118820cdb252
-  data.tar.gz: '049a1b2ae928bae38e1079f4e67d4f29a3efe3201e27c28c92f58bf4a2eda519a62a9a18095d857792337b19775e319921f8494643718a406bf6c377e36eefa6'
+  metadata.gz: 6d2d1ec011eaf2d34f00068fa71809bf8bd3fe794b6097eeb1292ad25f1a6916e319490a137fa4c1908c00ce640f19c8efff27444ca277e72048daf5e688c3ef
+  data.tar.gz: 7f20423de58a836eb68261a8d7ad45ec00056a4f991b8f34c68dd4833a42bbb0009bca75a4a8092112cfb80599e2be04e5cca9a9bfe18b3ae18102622d98f9a6

data/README.md

@@ -54,7 +54,7 @@ f2.import(File.read(file))
 assert(f2.query('(eq foo 42)').each.to_a.size == 1)
 ```
 
-All terms available in a query:
+There are some terms available in a query:
 
 * `(always)` and `(never)` are "true" and "false"
 * `(not t)` inverses the `t` if it's boolean (exception otherwise)
@@ -68,14 +68,39 @@ 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")
+* `(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
+* `(at i a)` returns the `i`-th value of the `a` property
+* `(nonil a b)` returns `b` if `a` is `nil`
 * `(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:
+Also, some simple arithmetic:
 
-* `(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
+* `(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`
+
+There are terms that are history of search aware:
+
+* `(prev a)` returns the value of `a` in the previously seen fact
+
+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
+
+The `agg` term enables sub-queries by evaluating the first argument (term)
+over all available facts, passing the entire subset to the second argument,
+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`
 
 ## How to contribute
 

data/lib/factbase/fact.rb

@@ -48,7 +48,7 @@ class Factbase::Fact
     k = args[0].to_s
     if k.end_with?('=')
       kk = k[0..-2]
-      raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z][_a-zA-Z0-9]*$/)
+      raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
       raise "Prohibited prop name '#{kk}'" if kk == 'to_s'
       v = args[1]
       raise "Prop value can't be nil" if v.nil?

data/lib/factbase/syntax.rb

@@ -129,9 +129,9 @@ class Factbase::Syntax
       elsif t.start_with?('\'', '"')
         raise 'String literal can\'t be empty' if t.length <= 2
         t[1..-2]
-      elsif t.match?(/^[0-9]+$/)
+      elsif t.match?(/^(\+|-)?[0-9]+$/)
         t.to_i
-      elsif t.match?(/^[0-9]+\.[0-9]+(e\+[0-9]+)?$/)
+      elsif t.match?(/^(\+|-)?[0-9]+\.[0-9]+(e\+[0-9]+)?$/)
         t.to_f
       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)

data/lib/factbase/term.rb

@@ -93,19 +93,19 @@ class Factbase::Term
 
   def not(fact, maps)
     assert_args(1)
-    !only_bool(the_value(0, fact, maps))
+    !only_bool(the_values(0, fact, maps))
   end
 
   def or(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return true if only_bool(the_value(i, fact, maps))
+      return true if only_bool(the_values(i, fact, maps))
     end
     false
   end
 
   def and(fact, maps)
     (0..@operands.size - 1).each do |i|
-      return false unless only_bool(the_value(i, fact, maps))
+      return false unless only_bool(the_values(i, fact, maps))
     end
     true
   end
@@ -149,16 +149,70 @@ class Factbase::Term
     by_symbol(0, fact).nil?
   end
 
+  def nonil(fact, maps)
+    assert_args(2)
+    v = the_values(0, fact, maps)
+    return v unless v.nil?
+    the_values(1, fact, maps)
+  end
+
+  def at(fact, maps)
+    assert_args(2)
+    i = the_values(0, fact, maps)
+    raise 'Too many values at first position, one expected' unless i.size == 1
+    i = i[0]
+    return nil if i.nil?
+    v = the_values(1, fact, maps)
+    return nil if v.nil?
+    v[i]
+  end
+
+  def prev(fact, maps)
+    assert_args(1)
+    before = @prev
+    v = the_values(0, fact, maps)
+    @prev = v
+    before
+  end
+
+  def many(fact, maps)
+    assert_args(1)
+    v = the_values(0, fact, maps)
+    !v.nil? && v.size > 1
+  end
+
+  def one(fact, maps)
+    assert_args(1)
+    v = the_values(0, fact, maps)
+    !v.nil? && v.size == 1
+  end
+
+  def plus(fact, maps)
+    arithmetic(:+, fact, maps)
+  end
+
+  def minus(fact, maps)
+    arithmetic(:-, fact, maps)
+  end
+
+  def times(fact, maps)
+    arithmetic(:*, fact, maps)
+  end
+
+  def div(fact, maps)
+    arithmetic(:/, fact, maps)
+  end
+
   def eq(fact, maps)
-    arithmetic(:==, fact, maps)
+    cmp(:==, fact, maps)
   end
 
   def lt(fact, maps)
-    arithmetic(:<, fact, maps)
+    cmp(:<, fact, maps)
   end
 
   def gt(fact, maps)
-    arithmetic(:>, fact, maps)
+    cmp(:>, fact, maps)
   end
 
   def size(fact, _maps)
@@ -178,20 +232,20 @@ class Factbase::Term
 
   def matches(fact, maps)
     assert_args(2)
-    str = the_value(0, fact, maps)
+    str = the_values(0, fact, maps)
     return false if str.nil?
     raise 'Exactly one string expected' unless str.size == 1
-    re = the_value(1, fact, maps)
+    re = the_values(1, fact, maps)
     raise 'Regexp is nil' if re.nil?
     raise 'Exactly one regexp expected' unless re.size == 1
     str[0].to_s.match?(re[0])
   end
 
-  def arithmetic(op, fact, maps)
+  def cmp(op, fact, maps)
     assert_args(2)
-    lefts = the_value(0, fact, maps)
+    lefts = the_values(0, fact, maps)
     return false if lefts.nil?
-    rights = the_value(1, fact, maps)
+    rights = the_values(1, fact, maps)
     return false if rights.nil?
     lefts.any? do |l|
       l = l.floor if l.is_a?(Time) && op == :==
@@ -202,6 +256,17 @@ class Factbase::Term
     end
   end
 
+  def arithmetic(op, fact, maps)
+    assert_args(2)
+    lefts = the_values(0, fact, maps)
+    raise 'The first argument is NIL, while literal expected' if lefts.nil?
+    raise 'Too many values at first position, one expected' unless lefts.size == 1
+    rights = the_values(1, fact, maps)
+    raise 'The second argument is NIL, while literal expected' if rights.nil?
+    raise 'Too many values at second position, one expected' unless rights.size == 1
+    lefts[0].send(op, rights[0])
+  end
+
   def defn(_fact, _maps)
     fn = @operands[0]
     raise 'A symbol expected as first argument of defn' unless fn.is_a?(Symbol)
@@ -269,7 +334,7 @@ class Factbase::Term
     fact[k]
   end
 
-  def the_value(pos, fact, maps)
+  def the_values(pos, fact, maps)
     v = @operands[pos]
     v = v.evaluate(fact, maps) if v.is_a?(Factbase::Term)
     v = fact[v.to_s] if v.is_a?(Symbol)

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.35'
+  VERSION = '0.0.36'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_fact.rb

@@ -80,8 +80,8 @@ class TestFact < Minitest::Test
 
   def test_set_by_name
     f = Factbase::Fact.new(Mutex.new, {})
-    f.send('foo_bar=', 42)
-    assert_equal(42, f.foo_bar, f.to_s)
+    f.send('_foo_bar=', 42)
+    assert_equal(42, f._foo_bar, f.to_s)
   end
 
   def test_set_twice_same_value

data/test/factbase/test_query.rb

@@ -53,9 +53,17 @@ class TestQuery < Minitest::Test
       '(gt num 60)' => 1,
       "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
+      '(eq pi +3.14)' => 1,
       '(not (exists hello))' => 3,
       '(eq "Integer" (type num))' => 2,
       '(when (eq num 0) (exists time))' => 2,
+      '(many num)' => 1,
+      '(one num)' => 2,
+      '(gt num (minus 1 (nonil (at 0 (prev num)) 0)))' => 3,
+      '(and (not (many num)) (eq num (plus 21 +21)))' => 1,
+      '(and (not (many num)) (eq num (minus -100 -142)))' => 1,
+      '(and (one num) (eq num (times 7 6)))' => 1,
+      '(and (one pi) (eq pi (div -6.28 -2)))' => 1,
       '(gt (size num) 2)' => 1,
       '(matches name "^[a-z]+$")' => 1,
       '(lt (size num) 2)' => 2,
@@ -68,7 +76,7 @@ class TestQuery < Minitest::Test
       '(eq time (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
+      "(or (eq num +66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1
     }.each do |q, r|
       assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)
     end

data/test/factbase/test_term.rb

@@ -166,6 +166,23 @@ class TestTerm < Minitest::Test
     assert_equal('(foo \'hello, world!\')', t1.evaluate(fact, []))
   end
 
+  def test_past
+    t = Factbase::Term.new(:prev, [:foo])
+    assert_nil(t.evaluate(fact('foo' => 4), []))
+    assert_equal([4], t.evaluate(fact('foo' => 5), []))
+  end
+
+  def test_at
+    t = Factbase::Term.new(:at, [1, :foo])
+    assert_nil(t.evaluate(fact('foo' => 4), []))
+    assert_equal(5, t.evaluate(fact('foo' => [4, 5]), []))
+  end
+
+  def test_nonil
+    t = Factbase::Term.new(:nonil, [Factbase::Term.new(:at, [5, :foo]), 42])
+    assert_equal([42], t.evaluate(fact('foo' => 4), []))
+  end
+
   private
 
   def fact(map = {})

metadata

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