factbase 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be768141fbb97e4753b38b4b8c438a8cf870957744868af05ab325bec94582c
-  data.tar.gz: bcef0970b79fba877d7f677440e595382a64cab724b00d7df101a0a2bf66d146
+  metadata.gz: ffdf62af221a65ab9efa6097b01dab23edba0399bc8551757d450ff828f14367
+  data.tar.gz: 175dd8ead3a933305d46c8c4bb657a46efc507db3ad1045bb7495614dedfc1c2
 SHA512:
-  metadata.gz: 2b705bad3bc10f08a9865217f015069c34e679c6718382f321926d6ae76b96db6e56dd4c76540eeec8fb0511a8e7a40077d7ac8092fbe6588d75cefaf9e5f4d1
-  data.tar.gz: 3e4c1a563194008beb1697f5a4e146a0a88713fb876c8414893bff69db34b33a10d812135f85cac8ef9655d50d40d7186a3b00aa4c863f5ce4ba4a52429d9c37
+  metadata.gz: ccade318b2db8568b72fcd29dd8d8cc301a791911a749bba8154485e8e95d1a00c2466477ff7e798f8a5146e87e03c69af8493fd05ae38c9463a8ffc9e29da62
+  data.tar.gz: 30730a5e848923b73c98f188142f30f56fd8eec95d8839561a6be01956922f60d9fe46a9dcf361b2f6b4bffca993fd20471bd51f1e2840659ba7bc252c9853b2

data/lib/factbase/syntax.rb

@@ -43,6 +43,7 @@ class Factbase::Syntax
     @ast ||= to_ast(@tokens, 0)
     term = @ast[0]
     raise 'No terms found' if term.nil?
+    raise 'Not a term' unless term.is_a?(Factbase::Term)
     term
   end
 
@@ -81,7 +82,7 @@ class Factbase::Syntax
     list = []
     acc = ''
     string = false
-    @query.to_s.chars.each do |c|
+    @query.to_s.gsub(/#.*$/, '').chars.each do |c|
       if ['\'', '"'].include?(c)
         if string && acc[acc.length - 1] == '\\'
           acc = acc[0..-2]

data/lib/factbase/term.rb

@@ -97,18 +97,12 @@ class Factbase::Term
 
   def exists(fact)
     assert_args(1)
-    o = @operands[0]
-    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
-    k = o.to_s
-    !fact[k].nil?
+    !by_symbol(0, fact).nil?
   end
 
   def absent(fact)
     assert_args(1)
-    o = @operands[0]
-    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
-    k = o.to_s
-    fact[k].nil?
+    by_symbol(0, fact).nil?
   end
 
   def eq(fact)
@@ -125,29 +119,31 @@ class Factbase::Term
 
   def size(fact)
     assert_args(1)
-    o = @operands[0]
-    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
-    k = o.to_s
-    return 0 if fact[k].nil?
-    return 1 unless fact[k].is_a?(Array)
-    fact[k].size
+    v = by_symbol(0, fact)
+    return 0 if v.nil?
+    return 1 unless v.is_a?(Array)
+    v.size
+  end
+
+  def type(fact)
+    assert_args(1)
+    v = by_symbol(0, fact)
+    return 'nil' if v.nil?
+    v.class.to_s
   end
 
   def arithmetic(op, fact)
     assert_args(2)
-    o = @operands[0]
-    if o.is_a?(Factbase::Term)
-      v = o.eval(fact)
-    else
-      raise "A symbol expected by #{op}: #{o}" unless o.is_a?(Symbol)
-      k = o.to_s
-      v = fact[k]
-    end
-    return false if v.nil?
-    v = [v] unless v.is_a?(Array)
-    v.any? do |vv|
-      vv = vv.floor if vv.is_a?(Time) && op == :==
-      vv.send(op, @operands[1])
+    lefts = the_value(0, fact)
+    return false if lefts.nil?
+    rights = the_value(1, fact)
+    return false if rights.nil?
+    lefts.any? do |l|
+      l = l.floor if l.is_a?(Time) && op == :==
+      rights.any? do |r|
+        r = r.floor if r.is_a?(Time) && op == :==
+        l.send(op, r)
+      end
     end
   end
 
@@ -156,4 +152,20 @@ class Factbase::Term
     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
+
+  def by_symbol(pos, fact)
+    o = @operands[pos]
+    raise "A symbol expected at ##{pos}, but provided: #{o}" unless o.is_a?(Symbol)
+    k = o.to_s
+    fact[k]
+  end
+
+  def the_value(pos, fact)
+    v = @operands[pos]
+    v = v.eval(fact) if v.is_a?(Factbase::Term)
+    v = fact[v.to_s] if v.is_a?(Symbol)
+    return v if v.nil?
+    v = [v] unless v.is_a?(Array)
+    v
+  end
 end

data/lib/factbase.rb

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

data/test/factbase/test_query.rb

@@ -54,9 +54,11 @@ class TestQuery < Minitest::Test
       "(and (lt pi 100) \n\n (gt num 1000))" => 0,
       '(exists pi)' => 1,
       '(not (exists hello))' => 3,
+      '(eq "Integer" (type num))' => 2,
       '(gt (size num) 2)' => 1,
       '(lt (size num) 2)' => 2,
       '(eq (size hello) 0)' => 3,
+      '(eq num pi)' => 0,
       '(absent time)' => 2,
       '(and (absent time) (exists pi))' => 1,
       "(and (exists time) (not (\t\texists pi)))" => 1,

data/test/factbase/test_syntax.rb

@@ -45,6 +45,7 @@ class TestSyntax < Minitest::Test
       '(foo)',
       '(foo (bar) (zz 77)   )',
       "(eq foo   \n\n 'Hello, world!'\n)\n",
+      "# this is a comment\n(eq foo # test\n 42)\n\n# another comment\n",
       "(or ( a 4) (b 5) () (and () (c 5) \t\t(r 7 8s 8is 'Foo')))"
     ].each do |q|
       Factbase::Syntax.new(q).to_term
@@ -90,6 +91,7 @@ class TestSyntax < Minitest::Test
     [
       '',
       '(foo',
+      'some text',
       '"hello, world!',
       '(foo 7',
       "(foo 7 'Dude'",

data/test/factbase/test_term.rb

@@ -111,6 +111,16 @@ class TestTerm < Minitest::Test
     assert(!t.eval(fact('foo' => 100)))
   end
 
+  def test_type_matching
+    t = Factbase::Term.new(:type, [:foo])
+    assert_equal('Integer', t.eval(fact('foo' => 42)))
+    assert_equal('Array', t.eval(fact('foo' => [1, 2, 3])))
+    assert_equal('String', t.eval(fact('foo' => 'Hello, world!')))
+    assert_equal('Float', t.eval(fact('foo' => 3.14)))
+    assert_equal('Time', t.eval(fact('foo' => Time.now)))
+    assert_equal('nil', t.eval(fact))
+  end
+
   def test_or_matching
     t = Factbase::Term.new(
       :or,
@@ -139,7 +149,7 @@ class TestTerm < Minitest::Test
 
   private
 
-  def fact(map)
+  def fact(map = {})
     Factbase::Fact.new(Mutex.new, map)
   end
 end

metadata

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