factbase 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 870d9d422444751180a6e69d1be17c9f89ac46e168d7fc1023e7df22829f9134
-  data.tar.gz: 21e5886fc43c7f297a5f0dd4070d738efb4d6b2ff1f1b9d261d0007bf9ce483d
+  metadata.gz: dc21a8440801909645bc06e200ca9b238ab899f6ecd5ef422eec4d082fdbbfaf
+  data.tar.gz: 05fb34e5249ec11dd0cddcfe74888d89a3343c44afada52926f720c102804321
 SHA512:
-  metadata.gz: 91992d0fe70646084d7da8091ca5659a3f1aa64c474cfbf328278d40b0e5bc56233abb3b316435660ca3522afd3af275c29291b4f178136ef0544cf173a6d243
-  data.tar.gz: 97c605569af192e7f6960c0bac50777134acb917aa2085b6195d89be95687cde606084569db351025c7c0d4472247feb5f394af1e346a9f14c6af7d5422c2242
+  metadata.gz: 6c72854f13afe4af7be6a232c12c60025cd9d286559940e96a0ebd9decf748e13e8db4993bffe64f8416d3c03cd20f9a491c06c55434bdba2f53c32edd7d7410
+  data.tar.gz: e44f1b7c3c83f207ead55e5aed42844eb98dd53ee6ef5241be0e0931cbe7670dc0c6103c002ce6a4a7cbc8818784de6c7f600a7102d91a20a2dcc732a62fc5d7

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'
 
@@ -38,7 +37,9 @@ class Factbase::Syntax
   def to_term
     @tokens ||= to_tokens
     @ast ||= to_ast(@tokens, 0)
-    @ast[0]
+    term = @ast[0]
+    raise 'No terms found' if term.nil?
+    term
   end
 
   private
@@ -51,6 +52,7 @@ class Factbase::Syntax
   # is the term/literal and the second one is the position where the
   # scanning should continue.
   def to_ast(tokens, at)
+    raise "Closing too soon at ##{at}" if tokens[at] == :close
     return [tokens[at], at + 1] unless tokens[at] == :open
     at += 1
     op = tokens[at]
@@ -58,8 +60,11 @@ class Factbase::Syntax
     operands = []
     at += 1
     loop do
+      raise "End of token stream at ##{at}" if tokens[at].nil?
       break if tokens[at] == :close
       (operand, at1) = to_ast(tokens, at)
+      raise "Stuck at position ##{at}" if at == at1
+      raise "Jump back at position ##{at}" if at1 < at
       at = at1
       operands << operand
       break if tokens[at] == :close
@@ -70,7 +75,19 @@ class Factbase::Syntax
   def to_tokens
     list = []
     acc = ''
+    string = false
     @query.to_s.chars.each do |c|
+      if ['\'', '"'].include?(c)
+        if string && acc[acc.length - 1] == '\\'
+          acc = acc[0..-2]
+        else
+          string = !string
+        end
+      end
+      if string
+        acc += c
+        next
+      end
       if !acc.empty? && [' ', ')'].include?(c)
         list << acc
         acc = ''
@@ -86,11 +103,12 @@ class Factbase::Syntax
         acc += c
       end
     end
+    raise 'String not closed' if string
     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

@@ -44,7 +44,7 @@ class Factbase::Term
     items << @op
     items += @operands.map do |o|
       if o.is_a?(String)
-        "'#{o}'"
+        "'#{o.gsub("'", "\\\\'").gsub('"', '\\\\"')}'"
       else
         o.to_s
       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.2'
+  VERSION = '0.0.4'
 
   # 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)))

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
@@ -46,10 +57,12 @@ class TestSyntax < Minitest::Test
       '(foo)',
       '(foo 7)',
       "(foo 7 'Dude')",
+      "(r 'Dude\\'s Friend')",
+      "(r 'I\\'m \\\"good\\\"')",
       '(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,9 +77,29 @@ 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
   end
+
+  def test_broken_syntax
+    [
+      '',
+      '(foo',
+      '"hello, world!',
+      '(foo 7',
+      "(foo 7 'Dude'",
+      '(foo x y z (',
+      '(foo x y (z t (f 42 ',
+      ')foo ) y z)',
+      ")y 42 'Hey you)",
+      ')',
+      '"'
+    ].each do |q|
+      assert_raises do
+        Factbase::Syntax.new(q).to_term
+      end
+    end
+  end
 end

metadata

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