factbase 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a464f6fa40a3aef098e4ab4a58b6f6905ac101421f22fb806b63c4fb624aa610
-  data.tar.gz: ad19a0147890d8b4ff8fff96f7e9f47b09ecb264b3cb52fa606be892278fa380
+  metadata.gz: f3c7e0abf7bec6e53f050b4eeaeddd2b9954ee77b2a5f9a0332394c995d91ba9
+  data.tar.gz: 5da4b8574d7b1a93fd67f3d833bf51952eb5b3d9c303b9e20a084dc5953d71bc
 SHA512:
-  metadata.gz: 6abb74b759ef7eea421e8a7f4f1ebdbf7ae46836dfefcd324286508fbb82e207a787265c0cf9f8931b43b00d50e5df983266fa9442f9c277111dfa9ea3a778de
-  data.tar.gz: b0ed97f83f59230bafce810488f3e720d098a748149f7fbd58b7f1c25425b2fba6b742ce16b18692df34607eb3c42f9f11196ca212bc0273d7bdffe15e759efe
+  metadata.gz: f472603e32966c098979c2a461d94cd60f1f6213c4cea4abae225694d59ae88df252bbd42dcfb3292efb97352618cfa35fe56bef86bf87310dc74b4dbce65a20
+  data.tar.gz: fb91b271a5d57c59268dd386f8960e1c3c3c1577ea80e5c9bc3b623eaa6c559b15ce326f23ec9035e795d08ce647af353f4ae12aef5a34a124286f41fdf79130

data/.rubocop.yml

@@ -43,7 +43,7 @@ Metrics/BlockLength:
 Metrics/CyclomaticComplexity:
   Max: 25
 Metrics/PerceivedComplexity:
-  Max: 25
+  Max: 30
 Metrics/ClassLength:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:

data/README.md

@@ -71,7 +71,7 @@ There are some terms available in a query:
 * `(many a)` return true if there are many values in the `a` property
 * `(one a)` returns true if there is only one value in the `a` property
 * `(at i a)` returns the `i`-th value of the `a` property
-* `(nonil a b)` returns `b` if `a` is `nil`
+* `(either a b)` returns `b` if `a` is `nil`
 * `(matches a re)` returns true when `a` matches regular expression `re`
 * `(defn foo "self.to_s")` defines a new term using Ruby syntax and returns true
 

data/lib/factbase/syntax.rb

@@ -44,7 +44,9 @@ class Factbase::Syntax
   def to_term
     build.simplify
   rescue StandardError => e
-    raise "#{e.message} in \"#{@query}\""
+    err = "#{e.message} in #{@query}"
+    err = "#{err}, tokens: #{@tokens}" unless @tokens.nil?
+    raise err
   end
 
   private
@@ -95,7 +97,11 @@ class Factbase::Syntax
     list = []
     acc = ''
     string = false
-    @query.to_s.gsub(/#.*$/, '').chars.each do |c|
+    comment = false
+    @query.to_s.chars.each do |c|
+      comment = true if !string && c == '#'
+      comment = false if comment && c == "\n"
+      next if comment
       if ['\'', '"'].include?(c)
         if string && acc[acc.length - 1] == '\\'
           acc = acc[0..-2]

data/lib/factbase/term.rb

@@ -158,7 +158,7 @@ class Factbase::Term
     by_symbol(0, fact).nil?
   end
 
-  def nonil(fact, maps)
+  def either(fact, maps)
     assert_args(2)
     v = the_values(0, fact, maps)
     return v unless v.nil?

data/lib/factbase.rb

@@ -49,7 +49,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 
   # Constructor.
   def initialize(facts = [])

data/test/factbase/test_query.rb

@@ -59,7 +59,7 @@ class TestQuery < Minitest::Test
       '(when (eq num 0) (exists time))' => 2,
       '(many num)' => 1,
       '(one num)' => 2,
-      '(gt num (minus 1 (nonil (at 0 (prev num)) 0)))' => 3,
+      '(gt num (minus 1 (either (at 0 (prev num)) 0)))' => 3,
       '(and (not (many num)) (eq num (plus 21 +21)))' => 1,
       '(and (not (many num)) (eq num (minus -100 -142)))' => 1,
       '(and (one num) (eq num (times 7 6)))' => 1,

data/test/factbase/test_syntax.rb

@@ -42,10 +42,12 @@ class TestSyntax < Minitest::Test
   def test_simple_parsing
     [
       '(foo)',
-      '(foo (bar) (zz 77)   )',
+      '(foo (bar) (zz 77)   ) # hey',
+      "# hello\n\n\n(foo (bar))",
       "(eq foo   \n\n 'Hello, world!'\n)\n",
       "(eq x 'Hello, \\' \n) \\' ( world!')",
       "# this is a comment\n(eq foo # test\n 42)\n\n# another comment\n",
+      "(foo 'Hello,\n\nworld!\r\t\n')\n",
       "(or ( a 4) (b 5) (always) (and (always) (c 5) \t\t(r 7 w8s w8is 'Foo')))"
     ].each do |q|
       Factbase::Syntax.new(q).to_term
@@ -60,7 +62,7 @@ class TestSyntax < Minitest::Test
       "(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 t f 42 'Hi!# you' 33)",
       '(foo (x) y z)',
       '(eq t 2024-05-25T19:43:48Z)',
       '(eq t 2024-05-25T19:43:48Z)',
@@ -106,11 +108,10 @@ class TestSyntax < Minitest::Test
       ')',
       '"'
     ].each do |q|
-      assert(
-        assert_raises(q) do
-          Factbase::Syntax.new(q).to_term
-        end.message.include?(q)
-      )
+      msg = assert_raises(q) do
+        Factbase::Syntax.new(q).to_term
+      end.message
+      assert(msg.include?(q), msg)
     end
   end
 

data/test/factbase/test_term.rb

@@ -178,8 +178,8 @@ class TestTerm < Minitest::Test
     assert_equal(5, t.evaluate(fact('foo' => [4, 5]), []))
   end
 
-  def test_nonil
-    t = Factbase::Term.new(:nonil, [Factbase::Term.new(:at, [5, :foo]), 42])
+  def test_either
+    t = Factbase::Term.new(:either, [Factbase::Term.new(:at, [5, :foo]), 42])
     assert_equal([42], t.evaluate(fact('foo' => 4), []))
   end
 

metadata

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