fbe 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c7a8e786ff71b8449f19751665bc82f32ba777248218bcac806b76b8be3fa2
-  data.tar.gz: 361d1413b6649089e1ba3e8b499d60540b25261da616b94ac56687fe1af1b7fe
+  metadata.gz: 61a57de71b1c292ec12e6f990c09be1b71b271ca5b91df227042f853b96772f8
+  data.tar.gz: 55f9f3384299ef325505c2ac1721fdaa166fd346ad0d9b2759d88df1dfeeedba
 SHA512:
-  metadata.gz: 04b8c247dda95f931519f496cab03d02c8d912eafc0d2114e1dd21d507a9b81ed156d26accd2f5be50394cc3dec1fe4c86d4c0415f4f0a8a5c4d1eccef3510b8
-  data.tar.gz: 75f0f3ca32b28aee6d1206975bb066b7da7c022f9bee785c723d2a88585cce70ec6e7c5da201418676c0b56bda9db385f8af2ddd0557d157137e5dc3241c3563
+  metadata.gz: bc243fbc22b222834b791ffa62ba115fac2c938fad223d8c3ae4a06a42a1233d02d1953a8537451fa0c6e1dd9b2f33bfae49d37baf36c469718c9734a94510ff
+  data.tar.gz: 981cfa09101bb45b7951bd11b8c95757fde0b95361995cace2c60a59e48bd69adc2b3aa2d679df25c78dd54cb16c0ae4d11fc89aae5a44399ea3b06a9db5d9d1

data/Gemfile.lock

@@ -74,7 +74,7 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    ethon (0.17.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     factbase (0.15.6)
       backtrace (~> 0.4)
@@ -189,7 +189,7 @@ GEM
     regexp_parser (2.11.2)
     retries (0.0.5)
     rexml (3.4.2)
-    rubocop (1.80.0)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -236,8 +236,8 @@ GEM
     tago (0.1.0)
     timeout (0.4.3)
     total (0.4.1)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
+    typhoeus (1.5.0)
+      ethon (>= 0.9.0, < 0.16.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.5)

data/lib/fbe/tombstone.rb

@@ -22,17 +22,22 @@ class Fbe::Tombstone
   end
 
   # Put it there.
+  # @param [String] where The place, e.g. "github"
   # @param [Integer] repo ID of repository
-  # @param [Integer] issue ID of issue
-  def bury!(repo, issue)
+  # @param [Integer] issue ID of issue (or array of them)
+  def bury!(where, repo, issue)
     f =
       Fbe.if_absent(fb: @fb, always: true) do |n|
         n.what = 'tombstone'
-        n.repository = repo
+        n.where = where
+        n.repo = repo
       end
     f.send(:"#{@fid}=", SecureRandom.random_number(99_999)) if f[@fid].nil?
     nn = f['issues']&.map { |ii| ii.split('-').map(&:to_i) } || []
-    nn << [issue, issue]
+    issue = [issue] unless issue.is_a?(Array)
+    issue.each do |i|
+      nn << [i, i]
+    end
     nn = nn.sort_by(&:first)
     merged = []
     nn.each do |a, b|
@@ -51,17 +56,21 @@ class Fbe::Tombstone
   end
 
   # Is it there?
+  # @param [String] where The place, e.g. "github"
   # @param [Integer] repo ID of repository
-  # @param [Integer] issue ID of issue
+  # @param [Integer] issue ID of issue (or array of them)
   # @return [Boolean] True if it's there
-  def has?(repo, issue)
+  def has?(where, repo, issue)
     f = @fb.query(
-      "(and (eq what 'tombstone') (eq repository #{repo}) (exists issues))"
+      "(and (eq where '#{where}') (eq what 'tombstone') (eq repo #{repo}) (exists issues))"
     ).each.first
     return false if f.nil?
-    f['issues'].any? do |ii|
-      a, b = ii.split('-').map(&:to_i)
-      (a..b).cover?(issue)
+    issue = [issue] unless issue.is_a?(Array)
+    issue.all? do |i|
+      f['issues'].any? do |ii|
+        a, b = ii.split('-').map(&:to_i)
+        (a..b).cover?(i)
+      end
     end
   end
 end

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.28.0' unless const_defined?(:VERSION)
+  VERSION = '0.28.2' unless const_defined?(:VERSION)
 end

data/test/fbe/test_tombstone.rb

@@ -15,32 +15,42 @@ class TestTombstone < Fbe::Test
   def test_simple
     fb = Factbase.new
     ts = Fbe::Tombstone.new(fb:)
-    ts.bury!(41, 13)
-    ts.bury!(42, 13)
-    ts.bury!(42, 999)
-    assert(ts.has?(41, 13))
-    assert(ts.has?(42, 999))
-    refute(ts.has?(8, 7))
-    refute(ts.has?(43, 999))
-    refute(ts.has?(43, 990))
+    where = 'github'
+    ts.bury!(where, 41, 13)
+    ts.bury!(where, 42, 13)
+    ts.bury!(where, 42, 999)
+    assert(ts.has?(where, 41, 13))
+    assert(ts.has?(where, 42, 999))
+    refute(ts.has?(where, 8, 7))
+    refute(ts.has?(where, 43, 999))
+    refute(ts.has?(where, 43, 990))
   end
 
   def test_on_empty
     fb = Factbase.new
     ts = Fbe::Tombstone.new(fb:)
-    refute(ts.has?(8, 7))
+    where = 'github'
+    refute(ts.has?(where, 8, 7))
+  end
+
+  def test_bury_twice
+    fb = Factbase.new
+    ts = Fbe::Tombstone.new(fb:)
+    where = 'github'
+    2.times { ts.bury!(where, 42, 7) }
+    assert(ts.has?(where, 42, 7))
   end
 
   def test_merges_them
     fb = Factbase.new
     ts = Fbe::Tombstone.new(fb:)
-    ts.bury!(42, 13)
-    ts.bury!(42, 18)
-    ts.bury!(42, 14)
-    ts.bury!(42, 17)
-    ts.bury!(42, 15)
-    ts.bury!(42, 16)
-    assert(ts.has?(42, 16))
-    refute(ts.has?(42, 22))
+    where = 'github'
+    ts.bury!(where, 42, 13)
+    ts.bury!(where, 42, 18)
+    ts.bury!(where, 42, 14)
+    ts.bury!(where, 42, [17, 15, 16])
+    assert(ts.has?(where, 42, 16))
+    assert(ts.has?(where, 42, [16, 18]))
+    refute(ts.has?(where, 42, 22))
   end
 end

metadata

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