fbe 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69702483c25c55333a0391946414e8204e5116c47af9ce6c76736f30ac60e09
-  data.tar.gz: 5d868159c91bd6c58d6b6be8c5ba25c1138c0191cf5b915044a49b170342a36e
+  metadata.gz: c5738119a9d73b0ec3e019726bb057059059d0bd5fe08815b0290477902aa4c9
+  data.tar.gz: f2a54bd36e5672e060d9066fe3aa67077e52dc705da9a2cc3f01002dd9ef1bd4
 SHA512:
-  metadata.gz: 0c7ed04c82fe5f4c1fe28a127113ab65bc539db0079bb097ebb9979ba2cb521f37a4f5b6ee16aab51f8eac2e67e3da2bbba2f28372218a4a17de6c767514edf4
-  data.tar.gz: 4dc676859c6a144bd405808180a63c23bebd61423dc6d009a752a983c4267786b170e6d50758f98896adeb699d775ed75d9978dbf3dc90d0dbd56faee9502a15
+  metadata.gz: c394e6be7d4a376681ba87e308b28b21187454f68725c2fd3774dda934c0fa9a7caadced6e982da9c8f79c6b276abdf4fc2d26e64e325e801e8a0487ddb7dcc2
+  data.tar.gz: 7815c260f71e1b77fee5a61faaafc41bd5a98843ef250209fb267fc0dc3cd81b466a257ac7452df664bf5e859ab1ae78cc7e23d3e9bc6ad58d24aa33c57750be

data/lib/fbe/overwrite.rb

@@ -0,0 +1,52 @@
+# 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_relative '../fbe'
+require_relative 'fb'
+
+# Overwrite a property in the fact.
+#
+# If the property doesn't exist in the fact, it will be added. If it does
+# exist, it will be removed (the entire fact will be destroyed, new fact
+# created, and property set).
+#
+# @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
+def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
+  before = {}
+  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!
+  n = fb.insert
+  before[property.to_s] = value
+  before.each do |k, vv|
+    next if k.start_with?('_')
+    vv = [vv] unless vv.is_a?(Array)
+    vv.each do |v|
+      n.send("#{k}=", v)
+    end
+  end
+end

data/lib/fbe/regularly.rb

@@ -25,11 +25,9 @@
 require_relative '../fbe'
 require_relative 'fb'
 
-def Fbe.regularly(area, days, interval, fb: Fbe.fb, judge: $judge, loog: $loog, &)
-  pmp = fb.query("(and (eq what 'pmp') (eq area '#{area}') (exists #{days}))").each.to_a.first
-  days = pmp.nil? ? 28 : pmp[days].first
-  since = Time.now - (days * 24 * 60 * 60)
-  interval = pmp.nil? ? 7 : pmp[interval].first
+def Fbe.regularly(area, p_every_days, p_since_days = nil, fb: Fbe.fb, judge: $judge, loog: $loog, &)
+  pmp = fb.query("(and (eq what 'pmp') (eq area '#{area}') (exists #{p_every_days}))").each.to_a.first
+  interval = pmp.nil? ? 7 : pmp[p_every_days].first
   unless fb.query(
     "(and
       (eq what '#{judge}')
@@ -41,6 +39,10 @@ def Fbe.regularly(area, days, interval, fb: Fbe.fb, judge: $judge, loog: $loog,
   f = fb.insert
   f.what = judge
   f.when = Time.now
-  f.since = since
+  unless p_since_days.nil?
+    days = pmp.nil? ? 28 : pmp[p_since_days].first
+    since = Time.now - (days * 24 * 60 * 60)
+    f.since = since
+  end
   yield f
 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.38'
+  VERSION = '0.0.40'
 end

data/test/fbe/test_award.rb

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'loog'
 require_relative '../test__helper'
 require_relative '../../lib/fbe/award'
 
@@ -58,7 +59,8 @@ class TestAward < Minitest::Test
         (set b2 (if (lt b2 at_least) b2 0))
         (set b2 (between b2 3 120))
         (give b2 "for holding the bug open for too long (${days} days)"))
-      '
+      ',
+      judge: '', global: {}, loog: Loog::NULL, options: nil
     )
     b = a.bill(hours: 10)
     assert(b.points <= 100)

data/test/fbe/test_overwrite.rb

@@ -0,0 +1,54 @@
+# 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/overwrite'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Zerocracy
+# License:: MIT
+class TestOverwrite < Minitest::Test
+  def test_simple_overwrite
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.bar = 'hey'
+    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(2, fb.query('(always)').each.to_a.first['many'].size)
+  end
+
+  def test_simple_insert
+    fb = Factbase.new
+    f = fb.insert
+    Fbe.overwrite(f, :foo, 42, fb:)
+    assert_equal(42, fb.query('(always)').each.to_a.first['foo'].first)
+  end
+end

data/test/fbe/test_regularly.rb

@@ -38,7 +38,7 @@ class TestRegularly < Minitest::Test
     loog = Loog::NULL
     judge = 'test'
     2.times do
-      Fbe.regularly('pmp', 'days', 'interval', fb:, loog:, judge:) do |f|
+      Fbe.regularly('pmp', 'interval', 'days', fb:, loog:, judge:) do |f|
         f.foo = 42
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -233,6 +233,7 @@ files:
 - lib/fbe/middleware.rb
 - lib/fbe/middleware/quota.rb
 - lib/fbe/octo.rb
+- lib/fbe/overwrite.rb
 - lib/fbe/pmp.rb
 - lib/fbe/regularly.rb
 - lib/fbe/sec.rb
@@ -248,6 +249,7 @@ files:
 - test/fbe/test_issue.rb
 - test/fbe/test_iterate.rb
 - test/fbe/test_octo.rb
+- test/fbe/test_overwrite.rb
 - test/fbe/test_pmp.rb
 - test/fbe/test_regularly.rb
 - test/fbe/test_sec.rb