factbase 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293bbd84f64af3f20536142ba6de6e76fc7846e7950b25ad2dc78e908a14b6dc
-  data.tar.gz: d4371da72e71042ade69da947ca0cf4e8e79deda4bf4327b507a553f364dd386
+  metadata.gz: 270354d428517846946f93bec8e2e5b4c134306ca2c2136d5d99eae6add60b65
+  data.tar.gz: 170078b593a186785869f33fdb41e5152d8d34d5b7a47eb65a9b5756939592a0
 SHA512:
-  metadata.gz: 5e3c488b073a69319dcdd493eb25fdc8da65891da43c7f43e496c5c84f8c9faa110651917b7b4e7b8c29f7c40d0726b438f18dff4a94f5cdfdd6bc08ac79e286
-  data.tar.gz: 8b693e2d32899eb6c3f1e3c98b6378b32f5f979d6c879c4107f5e092333a51859479c954f0e4e5d1dc0958ac3569571ad7da8cf8f5df92c4f926e0f7ba699516
+  metadata.gz: afecc5884796f2e67c8f95bab613c6b82f92291c424adbea1c883a19c7c3816475ea14897ea4079434da71e1a382ee40aa4e7e62347702116f999ea40de6d24a
+  data.tar.gz: d14d86d5ea751d540dd3ed5d52b3aba747f70b6db9ec295717abdcb30af2d57793b2d2b0cc2607eb4e90d509a53f0a6d336865afddcbce658ed2fd7e9a3f07b0

data/.github/workflows/codecov.yml

@@ -36,5 +36,3 @@ jobs:
       - uses: codecov/codecov-action@v4.0.0-beta.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage/.resultset.json
-          fail_ci_if_error: true

data/Gemfile

@@ -29,4 +29,5 @@ gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.63.5', require: false
 gem 'rubocop-rspec', '2.29.2', require: false
 gem 'simplecov', '0.22.0', require: false
+gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/lib/factbase/syntax.rb

@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'cgi'
 require_relative 'fact'
 require_relative 'term'
 
@@ -70,7 +69,13 @@ class Factbase::Syntax
   def to_tokens
     list = []
     acc = ''
+    string = false
     @query.to_s.chars.each do |c|
+      string = !string if ['\'', '"'].include?(c)
+      if string
+        acc += c
+        next
+      end
       if !acc.empty? && [' ', ')'].include?(c)
         list << acc
         acc = ''
@@ -89,8 +94,8 @@ class Factbase::Syntax
     list.map do |t|
       if t.is_a?(Symbol)
         t
-      elsif t.start_with?('\'')
-        CGI.unescapeHTML(t[1..-2])
+      elsif t.start_with?('\'', '"')
+        t[1..-2]
       elsif t.match?(/^[0-9]+$/)
         t.to_i
       else

data/lib/factbase/term.rb

@@ -55,10 +55,12 @@ class Factbase::Term
   private
 
   def nil(_map)
+    assert_args(0)
     true
   end
 
   def not(map)
+    assert_args(1)
     !@operands[0].matches?(map)
   end
 
@@ -77,23 +79,27 @@ class Factbase::Term
   end
 
   def exists(map)
+    assert_args(1)
     k = @operands[0].to_s
     !map[k].nil?
   end
 
   def absent(map)
+    assert_args(1)
     k = @operands[0].to_s
     map[k].nil?
   end
 
   def eq(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
-    v[0] == @operands[1]
+    v.include?(@operands[1])
   end
 
   def lt(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
@@ -101,9 +107,15 @@ class Factbase::Term
   end
 
   def gt(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
     v[0] > @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
+  end
 end

data/lib/factbase.rb

@@ -26,7 +26,7 @@
 # License:: MIT
 class Factbase
   # Current version of the library and of this class.
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 
   # Constructor.
   def initialize
@@ -48,15 +48,14 @@ class Factbase
 
   # Create a query capable of iterating.
   #
-  # There is a Lisp-like syntax, for example (all string literals
-  # must be HTML-escaped):
+  # There is a Lisp-like syntax, for example:
   #
-  #  (eq title 'ObjectThinking')
+  #  (eq title 'Object Thinking')
   #  (gt time '2024-03-23T03:21:43')
   #  (gt cost 42)
   #  (exists seenBy)
   #  (and
-  #    (eq foo '42')
+  #    (eq foo 42)
   #    (or
   #      (gt bar 200)
   #      (absent zzz)))
@@ -77,6 +76,10 @@ class Factbase
     @maps += Marshal.load(bytes)
     # rubocop:enable Security/MarshalLoad
   end
+
+  def to_json(_ = nil)
+    @maps.to_json
+  end
 end
 
 require_relative 'factbase/fact'

data/test/factbase/test_syntax.rb

@@ -29,12 +29,23 @@ require_relative '../../lib/factbase/syntax'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class TestSyntax < Minitest::Test
+  def test_parses_string_right
+    [
+      "(foo 'abc')",
+      "(foo 'one two')",
+      "(foo 'one two three   ')",
+      "(foo 'one two three   ' 'tail tail')"
+    ].each do |q|
+      assert_equal(q, Factbase::Syntax.new(q).to_term.to_s)
+    end
+  end
+
   def test_simple_parsing
     [
       '()',
       '(foo)',
       '(foo (bar) (zz 77)   )',
-      "(eq foo    'Hello,&#x20;world!')",
+      "(eq foo    'Hello, world!')",
       "(or ( a 4) (b 5) () (and () (c 5) (r 7 8s 8is 'Foo')))"
     ].each do |q|
       Factbase::Syntax.new(q).to_term
@@ -49,7 +60,7 @@ class TestSyntax < Minitest::Test
       '(foo x y z)',
       "(foo x y z t f 42 'Hi!' 33)",
       '(foo (x) y z)',
-      "(foo (x (f (t (y 42 'Hey'))) (f) (r 3)) y z)"
+      "(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)
     end
@@ -64,7 +75,7 @@ class TestSyntax < Minitest::Test
     {
       '(eq z 1)' => true,
       '(or (eq bar 888) (eq z 1))' => true,
-      "(or (gt bar 100) (eq foo 'Hello,&#x20;world!'))" => true
+      "(or (gt bar 100) (eq foo 'Hello, world!'))" => true
     }.each do |k, v|
       assert_equal(v, Factbase::Syntax.new(k).to_term.matches?(m), k)
     end

data/test/factbase/test_term.rb

@@ -36,6 +36,12 @@ class TestTerm < Minitest::Test
     assert(!t.matches?({ 'bar' => ['Hello!'] }))
   end
 
+  def test_eq_matching
+    t = Factbase::Term.new(:eq, ['foo', 42])
+    assert(t.matches?({ 'foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'] }))
+    assert(!t.matches?({ 'foo' => [100] }))
+  end
+
   def test_lt_matching
     t = Factbase::Term.new(:lt, ['foo', 42])
     assert(t.matches?({ 'foo' => [10] }))
@@ -53,6 +59,12 @@ class TestTerm < Minitest::Test
     assert(!t.matches?({ 'foo' => [100] }))
   end
 
+  def test_not_exists_matching
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
+    assert(t.matches?({ 'foo' => [42, 12, -90] }))
+    assert(!t.matches?({ 'foo' => [100] }))
+  end
+
   def test_or_matching
     t = Factbase::Term.new(
       :or,

data/test/test__helper.rb

@@ -26,5 +26,7 @@ $stdout.sync = true
 require 'simplecov'
 SimpleCov.start
 
+require 'simplecov-cobertura'
+SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+
 require 'minitest/autorun'
-require_relative '../lib/factbase'

data/test/test_factbase.rb

@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'json'
 require_relative '../lib/factbase'
 
 # Factbase main module test.
@@ -53,4 +54,13 @@ class TestFactbase < Minitest::Test
     end
     assert_equal(1, f2.query('(eq foo 42)').to_a.count)
   end
+
+  def test_to_json
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 256
+    json = JSON.parse(fb.to_json)
+    assert(42, json[0]['foo'][1])
+  end
 end

metadata

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