factbase 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293bbd84f64af3f20536142ba6de6e76fc7846e7950b25ad2dc78e908a14b6dc
-  data.tar.gz: d4371da72e71042ade69da947ca0cf4e8e79deda4bf4327b507a553f364dd386
+  metadata.gz: 870d9d422444751180a6e69d1be17c9f89ac46e168d7fc1023e7df22829f9134
+  data.tar.gz: 21e5886fc43c7f297a5f0dd4070d738efb4d6b2ff1f1b9d261d0007bf9ce483d
 SHA512:
-  metadata.gz: 5e3c488b073a69319dcdd493eb25fdc8da65891da43c7f43e496c5c84f8c9faa110651917b7b4e7b8c29f7c40d0726b438f18dff4a94f5cdfdd6bc08ac79e286
-  data.tar.gz: 8b693e2d32899eb6c3f1e3c98b6378b32f5f979d6c879c4107f5e092333a51859479c954f0e4e5d1dc0958ac3569571ad7da8cf8f5df92c4f926e0f7ba699516
+  metadata.gz: 91992d0fe70646084d7da8091ca5659a3f1aa64c474cfbf328278d40b0e5bc56233abb3b316435660ca3522afd3af275c29291b4f178136ef0544cf173a6d243
+  data.tar.gz: 97c605569af192e7f6960c0bac50777134acb917aa2085b6195d89be95687cde606084569db351025c7c0d4472247feb5f394af1e346a9f14c6af7d5422c2242

data/.github/workflows/codecov.yml

@@ -36,5 +36,3 @@ jobs:
       - uses: codecov/codecov-action@v4.0.0-beta.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage/.resultset.json
-          fail_ci_if_error: true

data/Gemfile

@@ -29,4 +29,5 @@ gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.63.5', require: false
 gem 'rubocop-rspec', '2.29.2', require: false
 gem 'simplecov', '0.22.0', require: false
+gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/lib/factbase/term.rb

@@ -55,10 +55,12 @@ class Factbase::Term
   private
 
   def nil(_map)
+    assert_args(0)
     true
   end
 
   def not(map)
+    assert_args(1)
     !@operands[0].matches?(map)
   end
 
@@ -77,23 +79,27 @@ class Factbase::Term
   end
 
   def exists(map)
+    assert_args(1)
     k = @operands[0].to_s
     !map[k].nil?
   end
 
   def absent(map)
+    assert_args(1)
     k = @operands[0].to_s
     map[k].nil?
   end
 
   def eq(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
-    v[0] == @operands[1]
+    v.include?(@operands[1])
   end
 
   def lt(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
@@ -101,9 +107,15 @@ class Factbase::Term
   end
 
   def gt(map)
+    assert_args(2)
     k = @operands[0].to_s
     v = map[k]
     return false if v.nil?
     v[0] > @operands[1]
   end
+
+  def assert_args(num)
+    raise "Too many operands for '#{@op}'" if @operands.size > num
+    raise "Too few operands for '#{@op}'" if @operands.size < num
+  end
 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.1'
+  VERSION = '0.0.2'
 
   # Constructor.
   def initialize
@@ -77,6 +77,10 @@ class Factbase
     @maps += Marshal.load(bytes)
     # rubocop:enable Security/MarshalLoad
   end
+
+  def to_json(_ = nil)
+    @maps.to_json
+  end
 end
 
 require_relative 'factbase/fact'

data/test/factbase/test_term.rb

@@ -36,6 +36,12 @@ class TestTerm < Minitest::Test
     assert(!t.matches?({ 'bar' => ['Hello!'] }))
   end
 
+  def test_eq_matching
+    t = Factbase::Term.new(:eq, ['foo', 42])
+    assert(t.matches?({ 'foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'] }))
+    assert(!t.matches?({ 'foo' => [100] }))
+  end
+
   def test_lt_matching
     t = Factbase::Term.new(:lt, ['foo', 42])
     assert(t.matches?({ 'foo' => [10] }))
@@ -53,6 +59,12 @@ class TestTerm < Minitest::Test
     assert(!t.matches?({ 'foo' => [100] }))
   end
 
+  def test_not_exists_matching
+    t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
+    assert(t.matches?({ 'foo' => [42, 12, -90] }))
+    assert(!t.matches?({ 'foo' => [100] }))
+  end
+
   def test_or_matching
     t = Factbase::Term.new(
       :or,

data/test/test__helper.rb

@@ -26,5 +26,7 @@ $stdout.sync = true
 require 'simplecov'
 SimpleCov.start
 
+require 'simplecov-cobertura'
+SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+
 require 'minitest/autorun'
-require_relative '../lib/factbase'

data/test/test_factbase.rb

@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'json'
 require_relative '../lib/factbase'
 
 # Factbase main module test.
@@ -53,4 +54,13 @@ class TestFactbase < Minitest::Test
     end
     assert_equal(1, f2.query('(eq foo 42)').to_a.count)
   end
+
+  def test_to_json
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 256
+    json = JSON.parse(fb.to_json)
+    assert(42, json[0]['foo'][1])
+  end
 end

metadata

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