fbe 0.0.41 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562ad71216aae43bcbc061bc11381c765eacae86bf7f7deb5e5c2a7a68e9d279
-  data.tar.gz: '0942fcb9385e3828e1d50dfde029c8368e3b9f2cd5cd5b0630b732f6b5cf32cf'
+  metadata.gz: '081da62424351c5ee65fc8a949e74f16326905f3a0748d89ba47d13ee2a5e5df'
+  data.tar.gz: fd71a1f8d8fd721c992a46f16269357c7e784aac172b1909f09e97436190d971
 SHA512:
-  metadata.gz: d683b6cd0ecbf15ec069fee0bf0b92ad1387010bf2ea9cb0fd12d85d3f245d03552941c0ca054cf3d2b3a3730a1bc2419ae16383b442c55bfe674e7e9b8aac42
-  data.tar.gz: 4d74ef7c0765883a5f2829cc4b960650736aa2fc7dc0e829bba50de93a34c334196a5f37a324611b8d5b5d8bbeac4e7b4ef725937e4ea7d58ab9215ec50e0722
+  metadata.gz: 5752ff7c46fba04d57d6357209827994c45d693d9447a951ba6118dd56d9d2b96774bd141316ae9d17e1552ba98476be7ef1b8edb70538cf43ac6d80887b7e97
+  data.tar.gz: 0a8a030cfd4781ef70841db89a6e4db6114e83083ae111e5d80fc51093795ba1251f400b5cb0cf795db3f15baef105079101d74213d68637801127e15cda912e

data/lib/fbe/middleware/quota.rb

@@ -26,13 +26,20 @@ require 'faraday'
 
 # Faraday Middleware that monitors GitHub API rate limits.
 class Fbe::Middleware::Quota < Faraday::Middleware
-  def initialize(app, logger: Loog::NULL, pause: 60, limit: 100, rate: 5)
+  def initialize(app, loog: Loog::NULL, pause: 60, limit: 100, rate: 5)
     super(app)
-    @limit = limit
     @requests = 0
     @app = app
-    @logger = logger
+    raise 'The "loog" cannot be nil' if loog.nil?
+    @loog = loog
+    raise 'The "pause" cannot be nil' if pause.nil?
+    raise 'The "pause" must be a positive integer' unless pause.positive?
     @pause = pause
+    raise 'The "limit" cannot be nil' if limit.nil?
+    raise 'The "limit" must be a positive integer' unless limit.positive?
+    @limit = limit
+    raise 'The "rate" cannot be nil' if rate.nil?
+    raise 'The "rate" must be a positive integer' unless rate.positive?
     @rate = rate
   end
 
@@ -40,7 +47,7 @@ class Fbe::Middleware::Quota < Faraday::Middleware
     @requests += 1
     response = @app.call(env)
     if out_of_limit?(env)
-      @logger.info(
+      @loog.info(
         "Too much GitHub API quota consumed, pausing for #{@pause} seconds"
       )
       sleep(@pause)

data/lib/fbe/octo.rb

@@ -33,6 +33,15 @@ require_relative '../fbe'
 require_relative 'middleware'
 require_relative 'middleware/quota'
 
+# Interface to GitHub API.
+#
+# It is supposed to be used instead of Octokit client, because it
+# is pre-configured and enables additional fearues, such as retrying,
+# logging, and caching.
+#
+# @param [Judges::Options] options The options available globally
+# @param [Hash] global Hash of global options
+# @param [Loog] loog Logging facility
 def Fbe.octo(options: $options, global: $global, loog: $loog)
   raise 'The $global is not set' if global.nil?
   global[:octo] ||=
@@ -79,11 +88,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
               methods: [:get],
               backoff_factor: 2
             )
-            builder.use(
-              Fbe::Middleware::Quota,
-              logger: loog,
-              pause: options.github_api_pause
-            )
+            builder.use(Fbe::Middleware::Quota, loog:, pause: options.github_api_pause || 60)
             builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false, logger: Loog::NULL)
             builder.use(Octokit::Response::RaiseError)
             builder.use(Faraday::Response::Logger, Loog::NULL)

data/lib/fbe/overwrite.rb

@@ -31,20 +31,25 @@ 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
 def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
+  raise 'The fact is nil' if fact.nil?
   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!
+  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.43'
 end

data/test/fbe/middleware/test_quota.rb

@@ -45,9 +45,9 @@ class QuotaTest < Minitest::Test
 
   def test_quota_middleware_pauses_when_quota_low
     loog = Loog::NULL
-    pause = 0
+    pause = 1
     app = FakeApp.new
-    middleware = Fbe::Middleware::Quota.new(app, logger: loog, pause:)
+    middleware = Fbe::Middleware::Quota.new(app, loog:, pause:)
     start_time = Time.now
     105.times do
       env = Judges::Options.new(
@@ -66,7 +66,7 @@ class QuotaTest < Minitest::Test
     log_output = StringIO.new
     loog = Logger.new(log_output)
     app = FakeApp.new
-    middleware = Fbe::Middleware::Quota.new(app, logger: loog, pause:)
+    middleware = Fbe::Middleware::Quota.new(app, loog:, pause:)
     105.times do
       env = Judges::Options.new(
         'method' => :get,

data/test/fbe/test_overwrite.rb

@@ -35,20 +35,43 @@ 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_without_id
+    fb = Factbase.new
+    f = fb.insert
+    assert_raises do
+      Fbe.overwrite(f, :foo, 42, fb:)
+    end
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.43
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace