fbe 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562ad71216aae43bcbc061bc11381c765eacae86bf7f7deb5e5c2a7a68e9d279
-  data.tar.gz: '0942fcb9385e3828e1d50dfde029c8368e3b9f2cd5cd5b0630b732f6b5cf32cf'
+  metadata.gz: '095a45978ce9e57eae04c5d10dc974071b3400dfe5f3fe0ce5da88acf87d6fd1'
+  data.tar.gz: 63e430609dab7392f310b9772f35a427d8ec8799717da1a7fb70c4552d92a44c
 SHA512:
-  metadata.gz: d683b6cd0ecbf15ec069fee0bf0b92ad1387010bf2ea9cb0fd12d85d3f245d03552941c0ca054cf3d2b3a3730a1bc2419ae16383b442c55bfe674e7e9b8aac42
-  data.tar.gz: 4d74ef7c0765883a5f2829cc4b960650736aa2fc7dc0e829bba50de93a34c334196a5f37a324611b8d5b5d8bbeac4e7b4ef725937e4ea7d58ab9215ec50e0722
+  metadata.gz: 223d399f84eb5a6290b4c0e13d0e04124a6ebd449964ce60b439942b73e6fda71db43ddead097b0a8ca15adea0e37bf9e6d5938a281d602ba3333fd4634bcdda
+  data.tar.gz: 405c244aa9637bda9fb035051248c54edf9c6eba6008f4c371e435a34ab5e80c7d93b4796e55650335714b30062cbf66b211acb7bdf48a8270fbeb5fd0c29ae7

data/lib/fbe/overwrite.rb

@@ -31,6 +31,9 @@ require_relative 'fb'
 # exist, it will be removed (the entire fact will be destroyed, new fact
 # created, and property set).
 #
+# It is important that the fact has +_id+ property. If it doesn't, an exception
+# will be raised.
+#
 # @param [Factbase::Fact] fact The fact to modify
 # @param [String] property The name of the property to set
 # @param [Any] vqlue The value to set
@@ -39,12 +42,13 @@ def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
   fact.all_properties.each do |prop|
     before[prop.to_s] = fact[prop]
   end
-  fb.query("(and #{before.map { |k, vv| vv.is_a?(Array) ? '' : " (eq #{k} #{vv})" }.join})").delete!
+  id = fact['_id'].first
+  raise 'There is no _id in the fact, cannot use Fbe.overwrite' if id.nil?
+  raise "No facts by _id = #{id}" if fb.query("(eq _id #{id})").delete!.zero?
   n = fb.insert
-  before[property.to_s] = value
+  before[property.to_s] = [value]
   before.each do |k, vv|
-    next if k.start_with?('_')
-    vv = [vv] unless vv.is_a?(Array)
+    next unless n[k].nil?
     vv.each do |v|
       n.send("#{k}=", v)
     end

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.41'
+  VERSION = '0.0.42'
 end

data/test/fbe/test_overwrite.rb

@@ -35,20 +35,35 @@ class TestOverwrite < Minitest::Test
   def test_simple_overwrite
     fb = Factbase.new
     f = fb.insert
+    f._id = 1
     f.foo = 42
-    f.bar = 'hey'
+    f.bar = 'hey you друг'
     f.many = 3
     f.many = 3.14
     Fbe.overwrite(f, :foo, 55, fb:)
     assert_equal(55, fb.query('(always)').each.to_a.first['foo'].first)
-    assert_equal('hey', fb.query('(always)').each.to_a.first['bar'].first)
+    assert_equal('hey you друг', fb.query('(always)').each.to_a.first['bar'].first)
     assert_equal(2, fb.query('(always)').each.to_a.first['many'].size)
   end
 
   def test_simple_insert
     fb = Factbase.new
     f = fb.insert
+    f._id = 1
     Fbe.overwrite(f, :foo, 42, fb:)
     assert_equal(42, fb.query('(always)').each.to_a.first['foo'].first)
   end
+
+  def test_safe_insert
+    fb = Factbase.new
+    f1 = fb.insert
+    f1.bar = 'a'
+    f2 = fb.insert
+    f2.bar = 'b'
+    f2._id = 2
+    f3 = fb.insert
+    f3._id = 1
+    Fbe.overwrite(f3, :foo, 42, fb:)
+    assert_equal(3, fb.size)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Yegor Bugayenko