fbe 0.33.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05709f3a8b84855b1cb59a586eb4ae7a83f2f87bf0d8490d14a4b59659513cd6'
-  data.tar.gz: 54da9a5a7e9d638859cfdb0b7c9b192673fdb2ede19ae4e3afecdbcf1164db36
+  metadata.gz: 6640546ac78327c9198d84ead54ecb48c08706f015d487ac5ee1e68a33012579
+  data.tar.gz: 4257c989c9af1be8e8c45755df5c182c1feef2eb9e8247578239e08d08d6c175
 SHA512:
-  metadata.gz: ab66f21e8f0f80070e3a8908fade06c2088659660d6d9aa127f6bc86e555b3efc4d3542aae40cfd301e2caa0af80a9227b02aaac5ce7e562ec346dad85d06ecf
-  data.tar.gz: e381efafdacff36bf1119f0075c18f558af4531a17a4e2ad9d15663f330bca2da7cde3c0862d2d98db5ee6bbe28e12d41c8617bd923b334c5b833befbfe8dcbb
+  metadata.gz: 3eef26c76c8a03ec95fc92a18ede1fa53a1fb3c89e189d7694d6175ab742750414c437cde293c342c30c2cf82db519119e801eade81fbaa4fb806aeced6ece0f
+  data.tar.gz: 48e608695735e4ffe0af617394b236bb2b82507c7504617a8a810256a6aa74aecb5851d7e72f64e868764461e7331f9744fff2b339e8b8d5a8cce96297b74288

data/Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    factbase (0.16.1)
+    factbase (0.16.2)
       backtrace (~> 0.4)
       decoor (~> 0.1)
       ellipsized (~> 0.3)
@@ -188,7 +188,7 @@ GEM
     rake (13.3.0)
     regexp_parser (2.11.2)
     retries (0.0.5)
-    rexml (3.4.2)
+    rexml (3.4.3)
     rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)

data/assets/bylaws/{code-contribution-was-rewarded.liquid → code-contribution-was-rewarded.fe.liquid}

@@ -17,24 +17,20 @@
     (set bonus_for_hoc (if (lt hoc hoc_threshold) (times hoc hoc_k) 0))
     (set bonus_for_hoc (between bonus_for_hoc hoc_min hoc_max))
     (give bonus_for_hoc "for the ${hoc} hits-of-code that you wrote")
-    "add ${hoc_k} points for each
-      [hit-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html),
-      but not more than ${hoc_max} points")
+    "add ${hoc_k} points for each [hit-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html), but not more than ${hoc_max} points")
 
   (aka
     (let many_hoc_fee {{ 4 | times: anger }})
     (set penalty_for_hoc (if (gte hoc hoc_threshold) (times -1 many_hoc_fee) 0))
     (give penalty_for_hoc "for too many hits-of-code (${hoc} >= ${hoc_threshold})")
-    "deduct ${many_hoc_fee} points if more than ${hoc_threshold}
-      [hits-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html)")
+    "deduct ${many_hoc_fee} points if more than ${hoc_threshold} [hits-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html)")
 
   (aka
     (let many_hoc_fee2 {{ 8 | times: anger }})
     (let hoc_threshold2 {{ 1600 | divided_by: paranoia }})
     (set penalty_for_hoc2 (if (gte hoc hoc_threshold2) (times -1 many_hoc_fee2) 0))
     (give penalty_for_hoc2 "for way too many hits-of-code (${hoc} >= ${hoc_threshold2})")
-    "deduct ${many_hoc_fee2} points if more than ${hoc_threshold2}
-      [hits-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html)")
+    "deduct ${many_hoc_fee2} points if more than ${hoc_threshold2} [hits-of-code](https://www.yegor256.com/2014/11/14/hits-of-code.html)")
 
   (aka
     (let no_review_fee {{ 8 | times: anger }})

data/lib/fbe/bylaws.rb

@@ -41,10 +41,10 @@ def Fbe.bylaws(anger: 2, love: 2, paranoia: 2)
   raise "The 'paranoia' must be in the [1..4] interval: #{paranoia.inspect}" unless paranoia.positive? && paranoia < 5
   home = File.join(__dir__, '../../assets/bylaws')
   raise "The directory with templates is absent #{home.inspect}" unless File.exist?(home)
-  Dir[File.join(home, '*.liquid')].to_h do |f|
+  Dir[File.join(home, '*.fe.liquid')].to_h do |f|
     formula = Liquid::Template.parse(File.read(f)).render(
       'anger' => anger, 'love' => love, 'paranoia' => paranoia
     )
-    [File.basename(f).gsub(/\.liquid$/, ''), formula]
+    [File.basename(f).gsub(/\.fe.liquid$/, ''), formula]
   end
 end

data/lib/fbe/consider.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
+# SPDX-License-Identifier: MIT
+
+require_relative '../fbe'
+require_relative 'conclude'
+require_relative 'fb'
+
+# Creates an instance of {Fbe::Conclude} and then runs "consider" in it.
+#
+# @param [String] query The query
+# @param [Factbase] fb The factbase
+# @param [String] judge The name of the judge, from the +judges+ tool
+# @param [Hash] global The hash for global caching
+# @param [Judges::Options] options The options coming from the +judges+ tool
+# @param [Loog] loog The logging facility
+# @yield [Factbase::Fact] The fact
+def Fbe.consider(
+  query,
+  fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
+  start: $start, &
+)
+  Fbe.conclude(fb:, judge:, loog:, options:, global:, start:) do
+    on query
+    consider(&)
+  end
+end

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.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -351,21 +351,22 @@ files:
 - README.md
 - REUSE.toml
 - Rakefile
-- assets/bylaws/bad-branch-name-was-punished.liquid
-- assets/bylaws/bug-report-was-rewarded.liquid
-- assets/bylaws/code-contribution-was-rewarded.liquid
-- assets/bylaws/code-review-was-rewarded.liquid
-- assets/bylaws/dud-was-punished.liquid
-- assets/bylaws/enhancement-suggestion-was-rewarded.liquid
-- assets/bylaws/long-pull-was-punished.liquid
-- assets/bylaws/published-release-was-rewarded.liquid
-- assets/bylaws/push-to-master-was-punished.liquid
-- assets/bylaws/resolved-bug-was-rewarded.liquid
+- assets/bylaws/bad-branch-name-was-punished.fe.liquid
+- assets/bylaws/bug-report-was-rewarded.fe.liquid
+- assets/bylaws/code-contribution-was-rewarded.fe.liquid
+- assets/bylaws/code-review-was-rewarded.fe.liquid
+- assets/bylaws/dud-was-punished.fe.liquid
+- assets/bylaws/enhancement-suggestion-was-rewarded.fe.liquid
+- assets/bylaws/long-pull-was-punished.fe.liquid
+- assets/bylaws/published-release-was-rewarded.fe.liquid
+- assets/bylaws/push-to-master-was-punished.fe.liquid
+- assets/bylaws/resolved-bug-was-rewarded.fe.liquid
 - fbe.gemspec
 - lib/fbe.rb
 - lib/fbe/award.rb
 - lib/fbe/bylaws.rb
 - lib/fbe/conclude.rb
+- lib/fbe/consider.rb
 - lib/fbe/copy.rb
 - lib/fbe/delete.rb
 - lib/fbe/delete_one.rb