factbase 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1ded0d5a1d5775620d8515eee9ad93ca71c97b70d68bd8624ca5bd55b112b0
-  data.tar.gz: fe93a4e058eb22a5e4db9c4c70a24461a8c790794df7f9a787989eb07b48837d
+  metadata.gz: 8ea11eaa2c72f162214fffedf64db4674ef27aef158f613ecea3304e35d528c3
+  data.tar.gz: b2c11cab690d59314a866a668b18913df9856ff8dcd8e0fd1ff906dc6601bd41
 SHA512:
-  metadata.gz: 8849f7c00995c3e202c648f4435821825ad5dc79074d2312885b2aa56ceb9a90bffffc3fb4ca7c7292fbeefb34da75a99baf59d32f3a0e421ea461d745fcc8db
-  data.tar.gz: 0d0cd7b0234b6de46e2a32d9e6c6c45f579e4bb5a09dbb99407d5844a4f206fa0b92977ae921daa6a691a5a4c7dde25f0f90300f4e99c09e7d4107570eb0e7c6
+  metadata.gz: d8a5a44265b0f9c6e32e669802831fec089e04049e2871167bbda0361ea99ad3b464f16cda94c5fd7b32b2cc539379b5e33acfc8e26c2488cfe605c61d3fe537
+  data.tar.gz: 010122d90a6564bc5d7041ed1d3107449062810e494504bc14bb6c64df71f0e7bbf077fc0300301e31d2078a3efc34ce8b5c0b722eefeb288befd465b139eb27

data/factbase.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.3'
   s.name = 'factbase'
-  s.version = '0.0.14'
+  s.version = '0.0.15'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/term.rb

@@ -92,36 +92,33 @@ class Factbase::Term
   def absent(fact)
     assert_args(1)
     k = @operands[0].to_s
-    fact[k].empty?
+    fact[k].nil?
   end
 
   def eq(fact)
-    assert_args(2)
-    k = @operands[0].to_s
-    v = fact[k]
-    return true if v == @operands[1]
-    return v.include?(@operands[1]) if v.is_a?(Array)
-    false
+    arithmetic(:==, fact)
   end
 
   def lt(fact)
-    assert_args(2)
-    k = @operands[0].to_s
-    v = fact[k]
-    return false if v.empty?
-    v[0] < @operands[1]
+    arithmetic(:<, fact)
   end
 
   def gt(fact)
+    arithmetic(:>, fact)
+  end
+
+  def arithmetic(op, fact)
     assert_args(2)
     k = @operands[0].to_s
     v = fact[k]
     return false if v.nil?
-    v[0] > @operands[1]
+    v = [v] unless v.is_a?(Array)
+    v.any? { |vv| vv.send(op, @operands[1]) }
   end
 
   def assert_args(num)
-    raise "Too many operands for '#{@op}'" if @operands.size > num
-    raise "Too few operands for '#{@op}'" if @operands.size < num
+    c = @operands.size
+    raise "Too many (#{c}) operands for '#{@op}' (#{num} expected)" if c > num
+    raise "Too few (#{c}) operands for '#{@op}' (#{num} expected)" if c < num
   end
 end

data/test/factbase/test_query.rb

@@ -41,11 +41,32 @@ class TestQuery < Minitest::Test
     )
   end
 
+  def test_complex_parsing
+    maps = []
+    maps << { 'num' => 42 }
+    maps << { 'pi' => 3.14, 'num' => [42, 66, 0] }
+    maps << { 'time' => Time.now - 100, 'num' => 0 }
+    {
+      '(eq num 444)' => 0,
+      '(eq time 0)' => 0,
+      '(gt num 60)' => 1,
+      '(and (lt pi 100) (gt num 1000))' => 0,
+      '(exists pi)' => 1,
+      '(not (exists hello))' => 3,
+      '(absent time)' => 2,
+      '(and (absent time) (exists pi))' => 1,
+      '(and (exists time) (not (exists pi)))' => 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
+  end
+
   def test_simple_deleting
     maps = []
     maps << { 'foo' => [42] }
     maps << { 'bar' => [4, 5] }
-    maps << { 'bar' => [5] }
+    maps << { 'bar' => 5 }
     q = Factbase::Query.new(maps, Mutex.new, '(eq bar 5)')
     assert_equal(2, q.delete!)
     assert_equal(1, maps.size)

data/test/factbase/test_term.rb

@@ -41,18 +41,38 @@ class TestTerm < Minitest::Test
     assert(t.matches?(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'])))
     assert(!t.matches?(fact('foo' => [100])))
     assert(!t.matches?(fact('foo' => [])))
+    assert(!t.matches?(fact('bar' => [])))
   end
 
   def test_lt_matching
     t = Factbase::Term.new(:lt, ['foo', 42])
     assert(t.matches?(fact('foo' => [10])))
     assert(!t.matches?(fact('foo' => [100])))
+    assert(!t.matches?(fact('foo' => 100)))
+    assert(!t.matches?(fact('bar' => 100)))
   end
 
   def test_gt_matching
     t = Factbase::Term.new(:gt, ['foo', 42])
     assert(t.matches?(fact('foo' => [100])))
+    assert(t.matches?(fact('foo' => 100)))
     assert(!t.matches?(fact('foo' => [10])))
+    assert(!t.matches?(fact('foo' => 10)))
+    assert(!t.matches?(fact('bar' => 10)))
+  end
+
+  def test_lt_matching_time
+    t = Factbase::Term.new(:lt, ['foo', Time.now])
+    assert(t.matches?(fact('foo' => [Time.now - 100])))
+    assert(!t.matches?(fact('foo' => [Time.now + 100])))
+    assert(!t.matches?(fact('bar' => [100])))
+  end
+
+  def test_gt_matching_time
+    t = Factbase::Term.new(:gt, ['foo', Time.now])
+    assert(t.matches?(fact('foo' => [Time.now + 100])))
+    assert(!t.matches?(fact('foo' => [Time.now - 100])))
+    assert(!t.matches?(fact('bar' => [100])))
   end
 
   def test_not_matching
@@ -60,12 +80,24 @@ class TestTerm < Minitest::Test
     assert(!t.matches?(fact('foo' => [100])))
   end
 
-  def test_not_exists_matching
+  def test_not_eq_matching
     t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
     assert(t.matches?(fact('foo' => [42, 12, -90])))
     assert(!t.matches?(fact('foo' => 100)))
   end
 
+  def test_exists_matching
+    t = Factbase::Term.new(:exists, ['foo'])
+    assert(t.matches?(fact('foo' => [42, 12, -90])))
+    assert(!t.matches?(fact('bar' => 100)))
+  end
+
+  def test_absent_matching
+    t = Factbase::Term.new(:absent, ['foo'])
+    assert(t.matches?(fact('z' => [42, 12, -90])))
+    assert(!t.matches?(fact('foo' => 100)))
+  end
+
   def test_or_matching
     t = Factbase::Term.new(
       :or,

metadata

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