sidekiq-postpone 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a89193bb8e0ab78b7b5150307f5e59a130d8f7cd9042621c35bac7a1648ab4
-  data.tar.gz: 2cfae440c4f663e51bbf7866defac44525a0a2b77bbf4baf7e1b39278b535609
+  metadata.gz: 634e909de058d8e5c067a0007f7e83c20e764552677104e53fa80add81e9ad54
+  data.tar.gz: 8b906c5ce4efc944e6e388736310fb6c71ff304f72a19ac388367c43cb67b9fc
 SHA512:
-  metadata.gz: ee5312224a86a288ad8a0615ddb5dea981606fcaa602fa65fa840c8143fb836e42e0d9d5ea6667060a63df8edd9937db32b2606e0b10887d057336dff26f4a01
-  data.tar.gz: 1e39d84d4da4d3fc0d2b637367a9e7752b990dec5014e555764cbc480c5b13a616e7992d97bc309ef3a469c414f9290444acb548ad4b2dc49c51e88d8ee1601f
+  metadata.gz: bff94b3c27b98308a5bbe2d8771d626583ddb66f10a8df9524262931c3993a278d264539032a969b15f58b1c7314a9cf1e5d554a517e4cef8944a397e0b8ef82
+  data.tar.gz: 8e05448529a78055810c04d5d2bc750138114a0081a3634d46d255ad89b24abba56dc763c7ef583393d788e3701532d8045114a533b09b632b88f84efc16d307

data/.travis.yml

@@ -4,9 +4,10 @@ services:
   - redis-server
 rvm:
   - 2.1
-  - 2.2.2
-  - 2.3.0
+  - 2.2
+  - 2.3
   - 2.4
+  - 2.5
 gemfile:
   - gemfiles/sidekiq_3.0.gemfile
   - gemfiles/sidekiq_3.1.gemfile
@@ -18,14 +19,16 @@ gemfile:
   - gemfiles/sidekiq_4.1.gemfile
   - gemfiles/sidekiq_4.2.gemfile
   - gemfiles/sidekiq_5.0.gemfile
+  - gemfiles/sidekiq_5.1.gemfile
   - gemfiles/sidekiq_master.gemfile
 matrix:
   fast_finish: true
   exclude:
+    - gemfile: gemfiles/sidekiq_5.1.gemfile
+      rvm: 2.1
     - gemfile: gemfiles/sidekiq_5.0.gemfile
       rvm: 2.1
     - gemfile: gemfiles/sidekiq_master.gemfile
-      rvm: 2.1
 
 before_install: gem install bundler -v 1.15
 script:

data/Appraisals

@@ -38,6 +38,10 @@ appraise 'sidekiq-5.0' do
   gem 'sidekiq', '~> 5.0.0'
 end
 
+appraise 'sidekiq-5.1' do
+  gem 'sidekiq', '~> 5.1.0'
+end
+
 appraise 'sidekiq-master' do
   gem 'sidekiq', github: 'mperham/sidekiq'
 end

data/gemfiles/sidekiq_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 5.1.0"
+
+gemspec :path => "../"

data/lib/sidekiq/postpone.rb

@@ -11,8 +11,8 @@ class Sidekiq::Postpone
     setup_schedule
   end
 
-  def wrap(join_parent: true, flush: true)
-    enter!
+  def wrap(join_parent: true, flush: true, **options)
+    enter!(**options)
     begin
       yield self
     rescue
@@ -22,7 +22,7 @@ class Sidekiq::Postpone
       if join_parent && (parent = Thread.current[:sidekiq_postpone_stack][-2])
         join!(parent)
       elsif flush
-        flush!
+        @flush_on_leave = true
       end
     end
   ensure
@@ -34,12 +34,18 @@ class Sidekiq::Postpone
   end
 
   def push(payloads)
+    if @ignore
+      payloads, ignored = payloads.partition(&@ignore)
+      ignored = nil if ignored.empty?
+      return ignored if payloads.empty?
+    end
     if payloads.first['at']
       @schedule.concat(payloads)
     else
       q = payloads.first['queue']
       @queues[q].concat(payloads)
     end
+    ignored
   end
 
   def clear!
@@ -48,15 +54,17 @@ class Sidekiq::Postpone
   end
 
   def flush!
+    current_postpone = Thread.current[:sidekiq_postpone]
     return if empty?
 
-    current_postpone = Thread.current[:sidekiq_postpone]
     Thread.current[:sidekiq_postpone] = nil # activate real raw_push
 
     client = Sidekiq::Client.new(*@client_args)
-    raw_push = client.method(:raw_push)
-    @queues.each_value(&raw_push)
-    raw_push.(@schedule) unless @schedule.empty?
+
+    @queues.each_value { |item| client.raw_push(item) }
+    client.raw_push(@schedule) unless @schedule.empty?
+
+    clear!
   ensure
     Thread.current[:sidekiq_postpone] = current_postpone
   end
@@ -76,18 +84,23 @@ class Sidekiq::Postpone
     @queues.empty? && @schedule.empty?
   end
 
+  def jids
+    [*@queues.values.flatten(1), *@schedule].map! { |j| j['jid'] }
+  end
+
   protected
 
   attr_reader :queues, :schedule
 
   private
 
-  def enter!
+  def enter!(ignore: nil)
     if @entered
       raise 'Sidekiq::Postpone#wrap is not re-enterable on the same instance'
     else
       @entered = true
     end
+    @ignore = ignore
     Thread.current[:sidekiq_postpone_stack] ||= []
     Thread.current[:sidekiq_postpone_stack].push(self)
     Thread.current[:sidekiq_postpone] = self
@@ -98,6 +111,11 @@ class Sidekiq::Postpone
     head = Thread.current[:sidekiq_postpone_stack].last
     Thread.current[:sidekiq_postpone] = head
     @entered = false
+    @ignore = nil
+    if @flush_on_leave
+      @flush_on_leave = false
+      flush!
+    end
   end
 
   def setup_queues

data/lib/sidekiq/postpone/core_ext.rb

@@ -3,7 +3,9 @@ class Sidekiq::Postpone
     def raw_push(payloads)
       postpone = Thread.current[:sidekiq_postpone]
       if postpone
-        postpone.push(payloads)
+        ignored = postpone.push(payloads)
+        super(ignored) if ignored
+        true
       else
         super
       end

data/lib/sidekiq/postpone/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Postpone
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-postpone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vladimir Kochnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -125,6 +125,7 @@ files:
 - gemfiles/sidekiq_4.1.gemfile
 - gemfiles/sidekiq_4.2.gemfile
 - gemfiles/sidekiq_5.0.gemfile
+- gemfiles/sidekiq_5.1.gemfile
 - gemfiles/sidekiq_master.gemfile
 - lib/sidekiq/postpone.rb
 - lib/sidekiq/postpone/core_ext.rb