fbe 0.34.0 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40e7887e9c6e73b462571ba9ce5d55e53803f49ffd8f75f2599910e66907c14
-  data.tar.gz: fedeb150bf39faff3b67f160ecca956670da69b5d367951d2835297ef5aa6bd1
+  metadata.gz: 7e7998274813bcfe22b556cad1258e2776bb56ce05a5d9d316db0ae37df92d5d
+  data.tar.gz: dde0bcf9e6dd7662268a25e9cb4a45ac1ecf86a1fc4d53d187a428bd85588518
 SHA512:
-  metadata.gz: 23507c63c45d42a3c1b742f2f3a73a5a57b84a783a23765886a334b2c74dfdbe49818a1023f54c95d0dc368acbc403532646e32275a84544f70f4ac2c27bf257
-  data.tar.gz: bb4f0ca37ef989a0c52d06608d13b6561ffefe99a5f8e3e3ee4c461936cec91591c063cf9c0c4d88596694fe237ef9aab7e4849bbaa340214db34ee2b7230a97
+  metadata.gz: 93dc3351ac1123d64b38fe249ef44303f60b1303aaf8a54ecd32efe9ab339dd4dff0e4380c8f8890ece93fc35909232f1b891680f54a04427a9fc90a9dca6d79
+  data.tar.gz: 60378ba5c1f1fb4c8c4c59a3102e3dbb511a1e40bfb39f3774c18c14cb839b4187c2327920b32b6be359cc889015746a9b8052883ea265fde23962633f461422

data/lib/fbe/delete.rb

@@ -24,6 +24,7 @@ require_relative 'fb'
 #   # new_fact will have all properties except 'age' and 'city'
 def Fbe.delete(fact, *props, fb: Fbe.fb, id: '_id')
   raise 'The fact is nil' if fact.nil?
+  return if props.all? { |k| fact[k].nil? }
   i = fact[id]
   raise "There is no #{id.inspect} in the fact" if i.nil?
   i = i.first

data/lib/fbe/overwrite.rb

@@ -17,7 +17,7 @@ require_relative 'fb'
 #
 # @param [Factbase::Fact] fact The fact to modify (must have _id property)
 # @param [String] property The name of the property to set
-# @param [Any] value The value to set (can be any type, including array)
+# @param [Any] values The value to set (can be any type, including array)
 # @param [Factbase] fb The factbase to use (defaults to Fbe.fb)
 # @return [nil] Nothing
 # @raise [RuntimeError] If fact is nil, has no _id, or property is not a String
@@ -27,11 +27,19 @@ require_relative 'fb'
 #   user = fb.query('(eq login "john")').first
 #   updated_user = Fbe.overwrite(user, 'status', 'active')
 #   # All properties preserved, only 'status' is set to 'active'
-def Fbe.overwrite(fact, property, value, fb: Fbe.fb, fid: '_id')
+def Fbe.overwrite(fact, property, values, fb: Fbe.fb, fid: '_id')
   raise 'The fact is nil' if fact.nil?
   raise 'The fb is nil' if fb.nil?
   raise "The property is not a String but #{property.class} (#{property})" unless property.is_a?(String)
-  return fact if !fact[property].nil? && fact[property].size == 1 && fact[property].first == value
+  raise 'The values is nil' if values.nil?
+  values = [values] unless values.is_a?(Array)
+  return fact if !fact[property].nil? && fact[property].one? && values.one? && fact[property].first == values.first
+  if fact[property].nil?
+    values.each do |v|
+      fact.send(:"#{property}=", v)
+    end
+    return
+  end
   before = {}
   fact.all_properties.each do |prop|
     before[prop.to_s] = fact[prop]
@@ -41,7 +49,7 @@ def Fbe.overwrite(fact, property, value, fb: Fbe.fb, fid: '_id')
   raise "No facts by #{fid} = #{id}" if fb.query("(eq #{fid} #{id})").delete!.zero?
   fb.txn do |fbt|
     n = fbt.insert
-    before[property.to_s] = value.is_a?(Array) ? value : [value]
+    before[property.to_s] = values
     before.each do |k, vv|
       next unless n[k].nil?
       vv.each do |v|

data/lib/fbe/tombstone.rb

@@ -31,7 +31,7 @@ class Fbe::Tombstone
       Fbe.if_absent(fb: @fb, always: true) do |n|
         n.what = 'tombstone'
         n.where = where
-        n.repo = repo
+        n.repository = repo
       end
     f.send(:"#{@fid}=", SecureRandom.random_number(99_999)) if f[@fid].nil?
     nn = f['issues']&.map { |ii| ii.split('-').map(&:to_i).then { |ii| ii.size == 1 ? ii << ii[0] : ii } } || []
@@ -59,7 +59,7 @@ class Fbe::Tombstone
   # @return [Boolean] True if it's there
   def has?(where, repo, issue)
     f = @fb.query(
-      "(and (eq where '#{where}') (eq what 'tombstone') (eq repo #{repo}) (exists issues))"
+      "(and (eq where '#{where}') (eq what 'tombstone') (eq repository #{repo}) (exists issues))"
     ).each.first
     return false if f.nil?
     issue = [issue] unless issue.is_a?(Array)

data/lib/fbe.rb

@@ -10,5 +10,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by +.rultor.yml+ on every release)
-  VERSION = '0.34.0' unless const_defined?(:VERSION)
+  VERSION = '0.34.2' unless const_defined?(:VERSION)
 end

metadata

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