factbase 0.0.14 → 0.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/factbase.gemspec +1 -1
- data/lib/factbase/term.rb +12 -15
- data/test/factbase/test_query.rb +22 -1
- data/test/factbase/test_term.rb +33 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8ea11eaa2c72f162214fffedf64db4674ef27aef158f613ecea3304e35d528c3
|
4
|
+
data.tar.gz: b2c11cab690d59314a866a668b18913df9856ff8dcd8e0fd1ff906dc6601bd41
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d8a5a44265b0f9c6e32e669802831fec089e04049e2871167bbda0361ea99ad3b464f16cda94c5fd7b32b2cc539379b5e33acfc8e26c2488cfe605c61d3fe537
|
7
|
+
data.tar.gz: 010122d90a6564bc5d7041ed1d3107449062810e494504bc14bb6c64df71f0e7bbf077fc0300301e31d2078a3efc34ce8b5c0b722eefeb288befd465b139eb27
|
data/factbase.gemspec
CHANGED
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
26
26
|
s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
|
27
27
|
s.required_ruby_version = '>=2.3'
|
28
28
|
s.name = 'factbase'
|
29
|
-
s.version = '0.0.
|
29
|
+
s.version = '0.0.15'
|
30
30
|
s.license = 'MIT'
|
31
31
|
s.summary = 'Factbase'
|
32
32
|
s.description = 'Fact base in memory and on disc'
|
data/lib/factbase/term.rb
CHANGED
@@ -92,36 +92,33 @@ class Factbase::Term
|
|
92
92
|
def absent(fact)
|
93
93
|
assert_args(1)
|
94
94
|
k = @operands[0].to_s
|
95
|
-
fact[k].
|
95
|
+
fact[k].nil?
|
96
96
|
end
|
97
97
|
|
98
98
|
def eq(fact)
|
99
|
-
|
100
|
-
k = @operands[0].to_s
|
101
|
-
v = fact[k]
|
102
|
-
return true if v == @operands[1]
|
103
|
-
return v.include?(@operands[1]) if v.is_a?(Array)
|
104
|
-
false
|
99
|
+
arithmetic(:==, fact)
|
105
100
|
end
|
106
101
|
|
107
102
|
def lt(fact)
|
108
|
-
|
109
|
-
k = @operands[0].to_s
|
110
|
-
v = fact[k]
|
111
|
-
return false if v.empty?
|
112
|
-
v[0] < @operands[1]
|
103
|
+
arithmetic(:<, fact)
|
113
104
|
end
|
114
105
|
|
115
106
|
def gt(fact)
|
107
|
+
arithmetic(:>, fact)
|
108
|
+
end
|
109
|
+
|
110
|
+
def arithmetic(op, fact)
|
116
111
|
assert_args(2)
|
117
112
|
k = @operands[0].to_s
|
118
113
|
v = fact[k]
|
119
114
|
return false if v.nil?
|
120
|
-
v[
|
115
|
+
v = [v] unless v.is_a?(Array)
|
116
|
+
v.any? { |vv| vv.send(op, @operands[1]) }
|
121
117
|
end
|
122
118
|
|
123
119
|
def assert_args(num)
|
124
|
-
|
125
|
-
raise "Too
|
120
|
+
c = @operands.size
|
121
|
+
raise "Too many (#{c}) operands for '#{@op}' (#{num} expected)" if c > num
|
122
|
+
raise "Too few (#{c}) operands for '#{@op}' (#{num} expected)" if c < num
|
126
123
|
end
|
127
124
|
end
|
data/test/factbase/test_query.rb
CHANGED
@@ -41,11 +41,32 @@ class TestQuery < Minitest::Test
|
|
41
41
|
)
|
42
42
|
end
|
43
43
|
|
44
|
+
def test_complex_parsing
|
45
|
+
maps = []
|
46
|
+
maps << { 'num' => 42 }
|
47
|
+
maps << { 'pi' => 3.14, 'num' => [42, 66, 0] }
|
48
|
+
maps << { 'time' => Time.now - 100, 'num' => 0 }
|
49
|
+
{
|
50
|
+
'(eq num 444)' => 0,
|
51
|
+
'(eq time 0)' => 0,
|
52
|
+
'(gt num 60)' => 1,
|
53
|
+
'(and (lt pi 100) (gt num 1000))' => 0,
|
54
|
+
'(exists pi)' => 1,
|
55
|
+
'(not (exists hello))' => 3,
|
56
|
+
'(absent time)' => 2,
|
57
|
+
'(and (absent time) (exists pi))' => 1,
|
58
|
+
'(and (exists time) (not (exists pi)))' => 1,
|
59
|
+
"(or (eq num 66) (lt time #{(Time.now - 200).utc.iso8601}))" => 1
|
60
|
+
}.each do |q, r|
|
61
|
+
assert_equal(r, Factbase::Query.new(maps, Mutex.new, q).each.to_a.size, q)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
44
65
|
def test_simple_deleting
|
45
66
|
maps = []
|
46
67
|
maps << { 'foo' => [42] }
|
47
68
|
maps << { 'bar' => [4, 5] }
|
48
|
-
maps << { 'bar' =>
|
69
|
+
maps << { 'bar' => 5 }
|
49
70
|
q = Factbase::Query.new(maps, Mutex.new, '(eq bar 5)')
|
50
71
|
assert_equal(2, q.delete!)
|
51
72
|
assert_equal(1, maps.size)
|
data/test/factbase/test_term.rb
CHANGED
@@ -41,18 +41,38 @@ class TestTerm < Minitest::Test
|
|
41
41
|
assert(t.matches?(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'])))
|
42
42
|
assert(!t.matches?(fact('foo' => [100])))
|
43
43
|
assert(!t.matches?(fact('foo' => [])))
|
44
|
+
assert(!t.matches?(fact('bar' => [])))
|
44
45
|
end
|
45
46
|
|
46
47
|
def test_lt_matching
|
47
48
|
t = Factbase::Term.new(:lt, ['foo', 42])
|
48
49
|
assert(t.matches?(fact('foo' => [10])))
|
49
50
|
assert(!t.matches?(fact('foo' => [100])))
|
51
|
+
assert(!t.matches?(fact('foo' => 100)))
|
52
|
+
assert(!t.matches?(fact('bar' => 100)))
|
50
53
|
end
|
51
54
|
|
52
55
|
def test_gt_matching
|
53
56
|
t = Factbase::Term.new(:gt, ['foo', 42])
|
54
57
|
assert(t.matches?(fact('foo' => [100])))
|
58
|
+
assert(t.matches?(fact('foo' => 100)))
|
55
59
|
assert(!t.matches?(fact('foo' => [10])))
|
60
|
+
assert(!t.matches?(fact('foo' => 10)))
|
61
|
+
assert(!t.matches?(fact('bar' => 10)))
|
62
|
+
end
|
63
|
+
|
64
|
+
def test_lt_matching_time
|
65
|
+
t = Factbase::Term.new(:lt, ['foo', Time.now])
|
66
|
+
assert(t.matches?(fact('foo' => [Time.now - 100])))
|
67
|
+
assert(!t.matches?(fact('foo' => [Time.now + 100])))
|
68
|
+
assert(!t.matches?(fact('bar' => [100])))
|
69
|
+
end
|
70
|
+
|
71
|
+
def test_gt_matching_time
|
72
|
+
t = Factbase::Term.new(:gt, ['foo', Time.now])
|
73
|
+
assert(t.matches?(fact('foo' => [Time.now + 100])))
|
74
|
+
assert(!t.matches?(fact('foo' => [Time.now - 100])))
|
75
|
+
assert(!t.matches?(fact('bar' => [100])))
|
56
76
|
end
|
57
77
|
|
58
78
|
def test_not_matching
|
@@ -60,12 +80,24 @@ class TestTerm < Minitest::Test
|
|
60
80
|
assert(!t.matches?(fact('foo' => [100])))
|
61
81
|
end
|
62
82
|
|
63
|
-
def
|
83
|
+
def test_not_eq_matching
|
64
84
|
t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
|
65
85
|
assert(t.matches?(fact('foo' => [42, 12, -90])))
|
66
86
|
assert(!t.matches?(fact('foo' => 100)))
|
67
87
|
end
|
68
88
|
|
89
|
+
def test_exists_matching
|
90
|
+
t = Factbase::Term.new(:exists, ['foo'])
|
91
|
+
assert(t.matches?(fact('foo' => [42, 12, -90])))
|
92
|
+
assert(!t.matches?(fact('bar' => 100)))
|
93
|
+
end
|
94
|
+
|
95
|
+
def test_absent_matching
|
96
|
+
t = Factbase::Term.new(:absent, ['foo'])
|
97
|
+
assert(t.matches?(fact('z' => [42, 12, -90])))
|
98
|
+
assert(!t.matches?(fact('foo' => 100)))
|
99
|
+
end
|
100
|
+
|
69
101
|
def test_or_matching
|
70
102
|
t = Factbase::Term.new(
|
71
103
|
:or,
|