shoryuken 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 020543c4df213954780e2db9436ab1ff93d481c5
-  data.tar.gz: fe7346621ec5e094ff5d13fcfb12591595ab678e
+SHA256:
+  metadata.gz: bd77c85674d135c91607fd5d422af325a2eea48b6e6bd7039b0d2c63cd6f0094
+  data.tar.gz: 41909fd74b45cc2dbb3c1cfced6717299e0819e960210c741d3c468e8f4fa569
 SHA512:
-  metadata.gz: f902d276c0255c23c2103375aac35f545fd8a3ad477e940a0f2628ed6d00874aa5dab09731f8c1554ebf1a9426b858075f16b20921c08536e54c26424f34de16
-  data.tar.gz: b95c4a300b3df721c5a11a7871870b08d77068bdabb46773d276dc98d040f56a66407e5dc6a6cda08d843d5f69ccc1d953ce6e718e593a0950c8da344bc45ec7
+  metadata.gz: 1e10d6ca93d95bd1fccd6da3dd05df596db6fc5613a5a7d56c83ff6bb3db08202780939fd847d4a54db932f289a553706e8290ead58a174b982f036b524c8b46
+  data.tar.gz: 5abaac5fdd7c5c5ea1e512ee13757a25491da1c8999e3fc8001b9d5465023e511d7754224d684f1c7b16014c85d9019533bec86d1740fe0da54c7d9d4b97adab

data/.gitignore

@@ -25,3 +25,4 @@ shoryuken.yml
 *.log
 .env
 rubocop.html
+.byebug_history

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v4.0.3] - 2019-01-06
+
+- Support delay per processing group
+  - [#543](https://github.com/phstc/shoryuken/pull/543)
+
 ## [v4.0.2] - 2018-11-26
 
 - Fix the delegated methods to public warning

data/lib/shoryuken/environment_loader.rb

@@ -122,7 +122,7 @@ module Shoryuken
 
     def parse_queues
       if Shoryuken.options[:queues].to_a.any?
-        Shoryuken.add_group('default', Shoryuken.options.fetch(:concurrency, 25))
+        Shoryuken.add_group('default', Shoryuken.options[:concurrency])
 
         Shoryuken.options[:queues].to_a.each do |queue, weight|
           parse_queue(queue, weight, 'default')
@@ -130,7 +130,8 @@ module Shoryuken
       end
 
       Shoryuken.options[:groups].to_a.each do |group, options|
-        Shoryuken.add_group(group, options.fetch(:concurrency, 25))
+        Shoryuken.add_group(group, options[:concurrency], delay: options[:delay])
+
         options[:queues].to_a.each do |queue, weight|
           parse_queue(queue, weight, group)
         end

data/lib/shoryuken/launcher.rb

@@ -72,7 +72,7 @@ module Shoryuken
       Shoryuken.groups.map do |group, options|
         Shoryuken::Manager.new(
           Shoryuken::Fetcher.new(group),
-          Shoryuken.polling_strategy(group).new(options[:queues]),
+          Shoryuken.polling_strategy(group).new(options[:queues], Shoryuken::Options.delay(group)),
           options[:concurrency],
           executor
         )

data/lib/shoryuken/options.rb

@@ -4,7 +4,7 @@ module Shoryuken
       concurrency: 25,
       queues: [],
       aws: {},
-      delay: 0,
+      delay: 0.0,
       timeout: 8,
       lifecycle_events: {
         startup: [],
@@ -30,9 +30,13 @@ module Shoryuken
         defined?(::ActiveJob)
       end
 
-      def add_group(group, concurrency)
+      def add_group(group, concurrency = nil, delay: nil)
+        concurrency ||= options[:concurrency]
+        delay ||= options[:delay]
+
         groups[group] ||= {
           concurrency: concurrency,
+          delay: delay,
           queues: []
         }
       end
@@ -77,7 +81,6 @@ module Shoryuken
 
       def polling_strategy(group)
         strategy = (group == 'default' ? options : options[:groups].to_h[group]).to_h[:polling_strategy]
-
         case strategy
         when 'WeightedRoundRobin', nil # Default case
           Polling::WeightedRoundRobin
@@ -90,6 +93,10 @@ module Shoryuken
         end
       end
 
+      def delay(group)
+        groups[group].to_h.fetch(:delay, options[:delay]).to_f
+      end
+
       def start_callback
         @@start_callback
       end

data/lib/shoryuken/polling/base.rb

@@ -57,10 +57,8 @@ module Shoryuken
         end
       end
 
-      private
-
       def delay
-        Shoryuken.options[:delay].to_f
+        @delay || Shoryuken.options[:delay].to_f
       end
     end
   end

data/lib/shoryuken/polling/strict_priority.rb

@@ -1,7 +1,7 @@
 module Shoryuken
   module Polling
     class StrictPriority < BaseStrategy
-      def initialize(queues)
+      def initialize(queues, delay = nil)
         # Priority ordering of the queues, highest priority first
         @queues = queues
                   .group_by { |q| q }
@@ -12,6 +12,7 @@ module Shoryuken
         @paused_until = queues
                         .each_with_object({}) { |queue, h| h[queue] = Time.at(0) }
 
+        @delay = delay
         # Start queues at 0
         reset_next_queue
       end

data/lib/shoryuken/polling/weighted_round_robin.rb

@@ -1,10 +1,11 @@
 module Shoryuken
   module Polling
     class WeightedRoundRobin < BaseStrategy
-      def initialize(queues)
+      def initialize(queues, delay = nil)
         @initial_queues = queues
         @queues = queues.dup.uniq
         @paused_queues = []
+        @delay = delay
       end
 
       def next_queue

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '4.0.2'.freeze
+  VERSION = '4.0.3'.freeze
 end

data/spec/shoryuken/environment_loader_spec.rb

@@ -4,7 +4,7 @@ require 'active_job'
 RSpec.describe Shoryuken::EnvironmentLoader do
   subject { described_class.new({}) }
 
-  describe '#parse_queues' do
+  describe '#parse_queues loads default queues' do
     before do
       allow(subject).to receive(:load_rails)
       allow(subject).to receive(:prefix_active_job_queue_names)
@@ -22,6 +22,29 @@ RSpec.describe Shoryuken::EnvironmentLoader do
     end
   end
 
+  describe '#parse_queues includes delay per groups' do
+    before do
+      allow(subject).to receive(:load_rails)
+      allow(subject).to receive(:prefix_active_job_queue_names)
+      allow(subject).to receive(:require_workers)
+      allow(subject).to receive(:validate_queues)
+      allow(subject).to receive(:validate_workers)
+      allow(subject).to receive(:patch_deprecated_workers)
+    end
+
+    specify do
+      Shoryuken.options[:queues] = ['queue1', 'queue2'] # default queues
+      Shoryuken.options[:groups] = [[ 'custom', { queues: ['queue3'], delay: 25 }]]
+      subject.load
+
+      expect(Shoryuken.groups['default'][:queues]).to eq(%w[queue1 queue2])
+      expect(Shoryuken.groups['default'][:delay]).to eq(Shoryuken.options[:delay])
+      expect(Shoryuken.groups['custom'][:queues]).to eq(%w[queue3])
+      expect(Shoryuken.groups['custom'][:delay]).to eq(25)
+    end
+  end
+
+
   describe '#prefix_active_job_queue_names' do
     before do
       allow(subject).to receive(:load_rails)

data/spec/shoryuken/options_spec.rb

@@ -1,19 +1,35 @@
 require 'spec_helper'
 
 RSpec.describe Shoryuken::Options do
-  describe '.add_group' do
+  describe '.add_group adds queues and optional delay' do
     before do
       Shoryuken.groups.clear
       Shoryuken.add_group('group1', 25)
       Shoryuken.add_group('group2', 25)
+      Shoryuken.add_group('group3', 25, delay: 5)
     end
 
     specify do
       described_class.add_queue('queue1', 1, 'group1')
       described_class.add_queue('queue2', 2, 'group2')
+      described_class.add_queue('queue3', 1, 'group3')
 
       expect(described_class.groups['group1'][:queues]).to eq(%w[queue1])
       expect(described_class.groups['group2'][:queues]).to eq(%w[queue2 queue2])
+      expect(described_class.groups['group3'][:queues]).to eq(%w[queue3])
+      expect(described_class.groups['group3'][:delay]).to eq(5)
+    end
+  end
+
+  describe '.delay works for each group' do
+    specify do
+      Shoryuken.add_group('group1', 25)
+      Shoryuken.add_group('group2', 25, delay: 5)
+      described_class.add_queue('queue1', 1, 'group1')
+      described_class.add_queue('queue2', 2, 'group2')
+
+      expect(described_class.delay('group1')).to eq(Shoryuken.options[:delay])
+      expect(described_class.delay('group2')).to eq(5.0)
     end
   end
 

data/spec/shoryuken/polling/strict_priority_spec.rb

@@ -86,6 +86,14 @@ RSpec.describe Shoryuken::Polling::StrictPriority do
     end
   end
 
+  describe '#delay' do
+    it 'sets delay based on group' do
+      delay_polling = Shoryuken::Polling::StrictPriority.new(queues, 25)
+      expect(delay_polling.delay).to eq(25.0)
+      expect(subject.delay).to eq(1.0)
+    end
+  end
+
   describe '#messages_found' do
     it 'pauses a queue if there are no messages found' do
       # [shoryuken, 2]

data/spec/shoryuken/polling/weighted_round_robin_spec.rb

@@ -96,4 +96,12 @@ RSpec.describe Shoryuken::Polling::WeightedRoundRobin do
       expect(subject.instance_variable_get(:@queues)).to eq([queue1, queue2, queue1])
     end
   end
+
+  describe '#delay' do
+    it 'sets delay based on group' do
+      delay_polling = Shoryuken::Polling::WeightedRoundRobin.new(queues, 25)
+      expect(delay_polling.delay).to eq(25.0)
+      expect(subject.delay).to eq(1.0)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -43,7 +43,7 @@ RSpec.configure do |config|
     Shoryuken.groups.clear
 
     Shoryuken.options[:concurrency] = 1
-    Shoryuken.options[:delay]       = 1
+    Shoryuken.options[:delay]       = 1.0
     Shoryuken.options[:timeout]     = 1
     Shoryuken.options[:daemon]      = nil
     Shoryuken.options[:logfile]     = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor