fbe 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5738119a9d73b0ec3e019726bb057059059d0bd5fe08815b0290477902aa4c9
-  data.tar.gz: f2a54bd36e5672e060d9066fe3aa67077e52dc705da9a2cc3f01002dd9ef1bd4
+  metadata.gz: '095a45978ce9e57eae04c5d10dc974071b3400dfe5f3fe0ce5da88acf87d6fd1'
+  data.tar.gz: 63e430609dab7392f310b9772f35a427d8ec8799717da1a7fb70c4552d92a44c
 SHA512:
-  metadata.gz: c394e6be7d4a376681ba87e308b28b21187454f68725c2fd3774dda934c0fa9a7caadced6e982da9c8f79c6b276abdf4fc2d26e64e325e801e8a0487ddb7dcc2
-  data.tar.gz: 7815c260f71e1b77fee5a61faaafc41bd5a98843ef250209fb267fc0dc3cd81b466a257ac7452df664bf5e859ab1ae78cc7e23d3e9bc6ad58d24aa33c57750be
+  metadata.gz: 223d399f84eb5a6290b4c0e13d0e04124a6ebd449964ce60b439942b73e6fda71db43ddead097b0a8ca15adea0e37bf9e6d5938a281d602ba3333fd4634bcdda
+  data.tar.gz: 405c244aa9637bda9fb035051248c54edf9c6eba6008f4c371e435a34ab5e80c7d93b4796e55650335714b30062cbf66b211acb7bdf48a8270fbeb5fd0c29ae7

data/lib/fbe/if_absent.rb

@@ -27,7 +27,8 @@ require 'others'
 require_relative '../fbe'
 require_relative 'fb'
 
-# Injects a fact if it's absent in the factbase.
+# Injects a fact if it's absent in the factbase, otherwise (it is already
+# there) returns NIL.
 def Fbe.if_absent(fb: Fbe.fb)
   attrs = {}
   f =
@@ -50,7 +51,7 @@ def Fbe.if_absent(fb: Fbe.fb)
     "(eq #{k} #{vv})"
   end.join(' ')
   q = "(and #{q})"
-  return unless fb.query(q).each.to_a.empty?
+  return nil unless fb.query(q).each.to_a.empty?
   n = fb.insert
   attrs.each { |k, v| n.send("#{k}=", v) }
   n

data/lib/fbe/just_one.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'time'
+require 'others'
+require_relative '../fbe'
+require_relative 'fb'
+
+# Injects a fact if it's absent in the factbase, otherwise (it is already
+# there) returns the existing one.
+def Fbe.just_one(fb: Fbe.fb)
+  attrs = {}
+  f =
+    others(map: attrs) do |*args|
+      k = args[0]
+      if k.end_with?('=')
+        @map[k[0..-2].to_sym] = args[1]
+      else
+        @map[k.to_sym]
+      end
+    end
+  yield f
+  q = attrs.except('_id', '_time', '_version').map do |k, v|
+    vv = v.to_s
+    if v.is_a?(String)
+      vv = "'#{vv.gsub('"', '\\\\"').gsub("'", "\\\\'")}'"
+    elsif v.is_a?(Time)
+      vv = v.utc.iso8601
+    end
+    "(eq #{k} #{vv})"
+  end.join(' ')
+  q = "(and #{q})"
+  before = fb.query(q).each.to_a.first
+  return before unless before.nil?
+  n = fb.insert
+  attrs.each { |k, v| n.send("#{k}=", v) }
+  n
+end

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.40'
+  VERSION = '0.0.42'
 end

data/test/fbe/test_just_one.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'factbase'
+require_relative '../test__helper'
+require_relative '../../lib/fbe/just_one'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Zerocracy
+# License:: MIT
+class TestJustOne < Minitest::Test
+  def test_ignores
+    fb = Factbase.new
+    fb.insert.foo = 'hello dude'
+    n =
+      Fbe.just_one(fb:) do |f|
+        f.foo = 'hello dude'
+      end
+    assert(!n.nil?)
+  end
+
+  def test_injects
+    fb = Factbase.new
+    n =
+      Fbe.just_one(fb:) do |f|
+        f.foo = 42
+      end
+    assert_equal(42, n.foo)
+  end
+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.40
+  version: 0.0.42
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -230,6 +230,7 @@ files:
 - lib/fbe/if_absent.rb
 - lib/fbe/issue.rb
 - lib/fbe/iterate.rb
+- lib/fbe/just_one.rb
 - lib/fbe/middleware.rb
 - lib/fbe/middleware/quota.rb
 - lib/fbe/octo.rb
@@ -248,6 +249,7 @@ files:
 - test/fbe/test_if_absent.rb
 - test/fbe/test_issue.rb
 - test/fbe/test_iterate.rb
+- test/fbe/test_just_one.rb
 - test/fbe/test_octo.rb
 - test/fbe/test_overwrite.rb
 - test/fbe/test_pmp.rb