factbase 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be768141fbb97e4753b38b4b8c438a8cf870957744868af05ab325bec94582c
-  data.tar.gz: bcef0970b79fba877d7f677440e595382a64cab724b00d7df101a0a2bf66d146
+  metadata.gz: 29134d600523642a5dd215f28aa9b48ec3337fec96d4dc41ea0500a3a4ee46c5
+  data.tar.gz: 2335e295a7b5dfe6f3cb1eb5ace692cfbc32d788c91906a6f609249b26c4da13
 SHA512:
-  metadata.gz: 2b705bad3bc10f08a9865217f015069c34e679c6718382f321926d6ae76b96db6e56dd4c76540eeec8fb0511a8e7a40077d7ac8092fbe6588d75cefaf9e5f4d1
-  data.tar.gz: 3e4c1a563194008beb1697f5a4e146a0a88713fb876c8414893bff69db34b33a10d812135f85cac8ef9655d50d40d7186a3b00aa4c863f5ce4ba4a52429d9c37
+  metadata.gz: bf293f3f8ce5b6f1a515a071f771f1a8d84149e0198b0f11073900ed55a6b218bc2d4dcc65ecc439b777fb8163bb13b2f5d24bea9f2600639276183218f2d9f5
+  data.tar.gz: ec4c0b3a780ea432b8560485b4a8c467d2b7fc165a1d29fd27b1e03d35f7f481cc11584b3f60100f4a63b308d84023304eb92f8f970cc105cff7e9eba06df0af

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

@@ -133,6 +133,15 @@ class Factbase::Term
     fact[k].size
   end
 
+  def type(fact)
+    assert_args(1)
+    o = @operands[0]
+    raise "A symbol expected: #{o}" unless o.is_a?(Symbol)
+    k = o.to_s
+    return 'nil' if fact[k].nil?
+    fact[k].class.to_s
+  end
+
   def arithmetic(op, fact)
     assert_args(2)
     o = @operands[0]

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.27'
 
   # Constructor.
   def initialize(facts = [])

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.27
 platform: ruby
 authors:
 - Yegor Bugayenko