fbe 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c7a8e786ff71b8449f19751665bc82f32ba777248218bcac806b76b8be3fa2
-  data.tar.gz: 361d1413b6649089e1ba3e8b499d60540b25261da616b94ac56687fe1af1b7fe
+  metadata.gz: 25b95f924ac73210555c91b1102ab632a0ad478b843a4c0e13d8aad5ea193d3a
+  data.tar.gz: 4b9c39ac83710018b43edb06963e1bf5bf27f9800b64a19bd51986d0611295d3
 SHA512:
-  metadata.gz: 04b8c247dda95f931519f496cab03d02c8d912eafc0d2114e1dd21d507a9b81ed156d26accd2f5be50394cc3dec1fe4c86d4c0415f4f0a8a5c4d1eccef3510b8
-  data.tar.gz: 75f0f3ca32b28aee6d1206975bb066b7da7c022f9bee785c723d2a88585cce70ec6e7c5da201418676c0b56bda9db385f8af2ddd0557d157137e5dc3241c3563
+  metadata.gz: 9959047b9386598ba19232bc2101c97400bfee084c01d0cf5285f5ec84681cf2f1f39da10c7a88e09dcc705b87d45d03a38b9b529c64645fb6e8ba334727bf63
+  data.tar.gz: 31ce58af7e239460b310afd89aa8c719c8984f73087233fda8c1d1453b7a836d19f3dddfea9ea9592b4a5a0de616be380c8791e201e37377265a2cc9f65606c9

data/lib/fbe/tombstone.rb

@@ -23,7 +23,7 @@ class Fbe::Tombstone
 
   # Put it there.
   # @param [Integer] repo ID of repository
-  # @param [Integer] issue ID of issue
+  # @param [Integer] issue ID of issue (or array of them)
   def bury!(repo, issue)
     f =
       Fbe.if_absent(fb: @fb, always: true) do |n|
@@ -32,7 +32,10 @@ class Fbe::Tombstone
       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|
@@ -52,16 +55,19 @@ class Fbe::Tombstone
 
   # Is it there?
   # @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)
     f = @fb.query(
       "(and (eq what 'tombstone') (eq repository #{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.1' unless const_defined?(:VERSION)
 end

data/test/fbe/test_tombstone.rb

@@ -31,16 +31,22 @@ class TestTombstone < Fbe::Test
     refute(ts.has?(8, 7))
   end
 
+  def test_bury_twice
+    fb = Factbase.new
+    ts = Fbe::Tombstone.new(fb:)
+    2.times { ts.bury!(42, 7) }
+    assert(ts.has?(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)
+    ts.bury!(42, [17, 15, 16])
     assert(ts.has?(42, 16))
+    assert(ts.has?(42, [16, 18]))
     refute(ts.has?(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.1
 platform: ruby
 authors:
 - Yegor Bugayenko