factbase 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29134d600523642a5dd215f28aa9b48ec3337fec96d4dc41ea0500a3a4ee46c5
-  data.tar.gz: 2335e295a7b5dfe6f3cb1eb5ace692cfbc32d788c91906a6f609249b26c4da13
+  metadata.gz: ffdf62af221a65ab9efa6097b01dab23edba0399bc8551757d450ff828f14367
+  data.tar.gz: 175dd8ead3a933305d46c8c4bb657a46efc507db3ad1045bb7495614dedfc1c2
 SHA512:
-  metadata.gz: bf293f3f8ce5b6f1a515a071f771f1a8d84149e0198b0f11073900ed55a6b218bc2d4dcc65ecc439b777fb8163bb13b2f5d24bea9f2600639276183218f2d9f5
-  data.tar.gz: ec4c0b3a780ea432b8560485b4a8c467d2b7fc165a1d29fd27b1e03d35f7f481cc11584b3f60100f4a63b308d84023304eb92f8f970cc105cff7e9eba06df0af
+  metadata.gz: ccade318b2db8568b72fcd29dd8d8cc301a791911a749bba8154485e8e95d1a00c2466477ff7e798f8a5146e87e03c69af8493fd05ae38c9463a8ffc9e29da62
+  data.tar.gz: 30730a5e848923b73c98f188142f30f56fd8eec95d8839561a6be01956922f60d9fe46a9dcf361b2f6b4bffca993fd20471bd51f1e2840659ba7bc252c9853b2

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,38 +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)
-    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
+    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
 
@@ -165,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.27'
+  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,

metadata

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