factbase 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973358a29608045c0279b7c0840607a325d90f3d5dc77c90c733d1f3936723d4
-  data.tar.gz: 49e0510527f0cb13bb8b5ea11528392897173ee665343c71bc6e368c32a75d35
+  metadata.gz: 8ea11eaa2c72f162214fffedf64db4674ef27aef158f613ecea3304e35d528c3
+  data.tar.gz: b2c11cab690d59314a866a668b18913df9856ff8dcd8e0fd1ff906dc6601bd41
 SHA512:
-  metadata.gz: 47b1925a557068e94a59f6f7638a5196a5802a8df1ecfb99fb8fe87b40e2efda43c88c6939acf0851efde6c1f491e55d63175c7680cd96853f9390e52b1a90ee
-  data.tar.gz: 61d88a0052bdd2c8ecdc7bad27a1161b481433cae0e7ad1cf32813a7842dc9e6db5ff8f6b7553a55e9abd93b9a9ac124c275bd639451a34c8a4491ca98b753c8
+  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.13'
+  s.version = '0.0.15'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/fact.rb

@@ -43,7 +43,9 @@ class Factbase::Fact
       kk = k[0..-2]
       raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z][_a-zA-Z0-9]*$/)
       v = args[1]
+      raise "Prop value can't be nil" if v.nil?
       raise "Prop value can't be empty" if v == ''
+      raise "Prop type '#{v.class}' is not allowed" unless [String, Integer, Float, Time].include?(v.class)
       @mutex.synchronize do
         before = @map[kk]
         return if before == v

data/lib/factbase/query.rb

@@ -37,12 +37,36 @@ class Factbase::Query
 
   # Iterate them one by one.
   # @yield [Fact] Facts one-by-one
+  # @return [Integer] Total number of facts yielded
   def each
+    return to_enum(__method__) unless block_given?
     term = Factbase::Syntax.new(@query).to_term
+    yielded = 0
     @maps.each do |m|
       f = Factbase::Fact.new(@mutex, m)
       next unless term.matches?(f)
       yield f
+      yielded += 1
     end
+    yielded
+  end
+
+  # Delete all facts that match the query.
+  # @return [Integer] Total number of facts deleted
+  def delete!
+    term = Factbase::Syntax.new(@query).to_term
+    deleted = 0
+    @mutex.synchronize do
+      @maps.delete_if do |m|
+        f = Factbase::Fact.new(@mutex, m)
+        if term.matches?(f)
+          deleted += 1
+          true
+        else
+          false
+        end
+      end
+    end
+    deleted
   end
 end

data/lib/factbase/syntax.rb

@@ -114,6 +114,10 @@ class Factbase::Syntax
         t[1..-2]
       elsif t.match?(/^[0-9]+$/)
         t.to_i
+      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)
       else
         t.to_sym
       end

data/lib/factbase/term.rb

@@ -48,6 +48,8 @@ class Factbase::Term
     items += @operands.map do |o|
       if o.is_a?(String)
         "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
+      elsif o.is_a?(Time)
+        o.utc.iso8601
       else
         o.to_s
       end
@@ -90,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_fact.rb

@@ -46,6 +46,20 @@ class TestFact < Minitest::Test
     end
   end
 
+  def test_fails_when_setting_nil
+    f = Factbase::Fact.new(Mutex.new, {})
+    assert_raises do
+      f.foo = nil
+    end
+  end
+
+  def test_fails_when_setting_empty
+    f = Factbase::Fact.new(Mutex.new, {})
+    assert_raises do
+      f.foo = ''
+    end
+  end
+
   def test_fails_when_not_found
     f = Factbase::Fact.new(Mutex.new, {})
     f.first = 42

data/test/factbase/test_query.rb

@@ -33,8 +33,48 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'foo' => [42] }
     q = Factbase::Query.new(maps, Mutex.new, '(eq foo 42)')
-    q.each do |f|
-      assert_equal(42, f.foo)
+    assert_equal(
+      1,
+      q.each do |f|
+        assert_equal(42, f.foo)
+      end
+    )
+  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 }
+    q = Factbase::Query.new(maps, Mutex.new, '(eq bar 5)')
+    assert_equal(2, q.delete!)
+    assert_equal(1, maps.size)
+  end
+
+  def test_to_array
+    maps = []
+    maps << { 'foo' => [42] }
+    assert_equal(1, Factbase::Query.new(maps, Mutex.new, '(eq foo 42)').each.to_a.size)
+  end
 end

data/test/factbase/test_syntax.rb

@@ -61,6 +61,9 @@ class TestSyntax < Minitest::Test
       '(foo x y z)',
       "(foo x y z t f 42 'Hi!' 33)",
       '(foo (x) y z)',
+      '(eq t 2024-05-25T19:43:48Z)',
+      '(eq t 3.1415926)',
+      '(eq t 3.0e+21)',
       "(foo (x (f (t (y 42 'Hey you'))) (f) (r 3)) y z)"
     ].each do |q|
       assert_equal(q, Factbase::Syntax.new(q).to_term.to_s)

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,

data/test/test_factbase.rb

@@ -54,7 +54,7 @@ class TestFactbase < Minitest::Test
       File.write(f.path, f1.export)
       f2.import(File.read(f.path))
     end
-    assert_equal(1, f2.query('(eq foo 42)').extend(Enumerable).to_a.count)
+    assert_equal(1, f2.query('(eq foo 42)').each.to_a.count)
   end
 
   def test_to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json