shoryuken 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d21819575a7b12f3697e5c06b390519f164baa
-  data.tar.gz: 967d57ff341f98b950661ca8d249b90a044ca08a
+  metadata.gz: 942ccdeaca0a94e766b82fa40da9ed091b703ea2
+  data.tar.gz: f94a089b56ed37b5db2752ccf418c667fae31b6d
 SHA512:
-  metadata.gz: a00ede2ec62aa8be31528aed16634bd1e99f04d5be4345b36fd1fa0c9baf01131a45ad6559c87a5f37432c95ca21a8a0d00060b85c9c60b94d4a7c3e01e0f651
-  data.tar.gz: 1fe49809c4a90e468a945979aebb1407f55d32a681788e882c82d08482dd768c571fe8e229dc3677ae6aeece348477fbd944ff7d04f80bdae7f8e258a35a6de3
+  metadata.gz: 67c92d3af6c4063f42afe07a3f56c32b847bd1bc76d80f4f9f46cc2aa48d3e7bf82213f4d98fe229265ce9b1387a3649652863f019e73aeb0d809b1a03c5ca4d
+  data.tar.gz: 1215eca9e669975edb70fa43855122e6f25c6e54452771ba26435f7e8df37684be20516037e1419a3e7d93a14773231387f471cc2ff8a03eb838f1e52f2c144d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v3.1.3] - 2017-07-11
+
+- Add queue prefixing support for groups
+ - [#405](https://github.com/phstc/shoryuken/pull/405)
+
+- Remove dead code
+ - [#402](https://github.com/phstc/shoryuken/pull/402)
+
 ## [v3.1.2] - 2017-07-06
 
 - Fix stack level too deep on Ubuntu

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'activejob'
   gem 'codeclimate-test-reporter', require: nil
   gem 'simplecov'
   gem 'multi_xml'

data/lib/shoryuken.rb

@@ -34,6 +34,7 @@ module Shoryuken
 
   def_delegators(
     :'Shoryuken::Options',
+    :active_job?,
     :add_group,
     :groups,
     :add_queue,
@@ -67,4 +68,4 @@ module Shoryuken
   )
 end
 
-require 'shoryuken/extensions/active_job_adapter' if defined?(::ActiveJob)
+require 'shoryuken/extensions/active_job_adapter' if Shoryuken.active_job?

data/lib/shoryuken/environment_loader.rb

@@ -44,7 +44,7 @@ module Shoryuken
 
       fail ArgumentError, "The supplied config file #{path} does not exist" unless File.exist?(path)
 
-      if result = YAML.load(ERB.new(IO.read(path)).result)
+      if (result = YAML.load(ERB.new(IO.read(path)).result))
         result.deep_symbolize_keys
       else
         {}
@@ -69,7 +69,7 @@ module Shoryuken
         ::Rails::Application.initializer 'shoryuken.eager_load' do
           ::Rails.application.config.eager_load = true
         end
-        require 'shoryuken/extensions/active_job_adapter' if defined?(::ActiveJob)
+        require 'shoryuken/extensions/active_job_adapter' if Shoryuken.active_job?
         require File.expand_path('config/environment.rb')
       end
     end
@@ -85,22 +85,36 @@ module Shoryuken
       end
     end
 
-    def prefix_active_job_queue_names
-      return unless defined? ::ActiveJob
-      return unless Shoryuken.active_job_queue_name_prefixing
-
+    def prefix_active_job_queue_name(queue_name, weight)
       queue_name_prefix = ::ActiveJob::Base.queue_name_prefix
       queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter
 
       # See https://github.com/rails/rails/blob/master/activejob/lib/active_job/queue_name.rb#L27
+      name_parts = [queue_name_prefix.presence, queue_name]
+      prefixed_queue_name = name_parts.compact.join(queue_name_delimiter)
+      [prefixed_queue_name, weight]
+    end
+
+    def prefix_active_job_queue_names
+      return unless Shoryuken.active_job?
+      return unless Shoryuken.active_job_queue_name_prefixing
+
       Shoryuken.options[:queues].to_a.map! do |queue_name, weight|
-        name_parts = [queue_name_prefix.presence, queue_name]
-        prefixed_queue_name = name_parts.compact.join(queue_name_delimiter)
-        [prefixed_queue_name, weight]
+        prefix_active_job_queue_name(queue_name, weight)
+      end
+
+      Shoryuken.options[:groups].to_a.map! do |group, options|
+        if options[:queues]
+          options[:queues].map! do |queue_name, weight|
+            prefix_active_job_queue_name(queue_name, weight)
+          end
+        end
+
+        [group, options]
       end
     end
 
-    def parse_queue(queue, weight = nil, group)
+    def parse_queue(queue, weight, group)
       Shoryuken.add_queue(queue, [weight.to_i, 1].max, group)
     end
 
@@ -155,7 +169,7 @@ module Shoryuken
     end
 
     def validate_workers
-      return if defined?(::ActiveJob)
+      return if Shoryuken.active_job?
 
       all_queues = Shoryuken.ungrouped_queues
       queues_with_workers = Shoryuken.worker_registry.queues

data/lib/shoryuken/logging.rb

@@ -3,7 +3,6 @@ require 'logger'
 
 module Shoryuken
   module Logging
-
     class Pretty < Logger::Formatter
       # Provide a call() method that returns the formatted message.
       def call(severity, time, program_name, message)
@@ -37,9 +36,5 @@ module Shoryuken
     def self.logger=(log)
       @logger = (log ? log : Logger.new('/dev/null'))
     end
-
-    def logger
-      shoryuken::Logging.logger
-    end
   end
 end

data/lib/shoryuken/options.rb

@@ -23,6 +23,10 @@ module Shoryuken
     @@stop_callback                   = nil
 
     class << self
+      def active_job?
+        defined?(::ActiveJob)
+      end
+
       def add_group(group, concurrency)
         groups[group] ||= {
           concurrency: concurrency,

data/lib/shoryuken/util.rb

@@ -30,7 +30,7 @@ module Shoryuken
     end
 
     def worker_name(worker_class, sqs_msg, body = nil)
-      if defined?(::ActiveJob) \
+      if Shoryuken.active_job? \
           && !sqs_msg.is_a?(Array) \
           && sqs_msg.message_attributes \
           && sqs_msg.message_attributes['shoryuken_class'] \

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.1.2'.freeze
+  VERSION = '3.1.3'.freeze
 end

data/spec/shoryuken/environment_loader_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
+require 'active_job'
 
-# rubocop:disable Metrics/BlockLength
 RSpec.describe Shoryuken::EnvironmentLoader do
   subject { described_class.new({}) }
 
   describe '#parse_queues' do
     before do
-      # TODO proper test other methods
-      allow(subject).to receive(:load_rails).with(anything)
+      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)
@@ -22,4 +21,34 @@ RSpec.describe Shoryuken::EnvironmentLoader do
       expect(Shoryuken.groups['default'][:queues]).to eq(%w(queue1 queue2 queue2))
     end
   end
+
+  describe '#prefix_active_job_queue_names' do
+    before do
+      allow(subject).to receive(:load_rails)
+      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)
+
+      ActiveJob::Base.queue_name_prefix    = 'test'
+      ActiveJob::Base.queue_name_delimiter = '_'
+
+      allow(Shoryuken).to receive(:active_job?).and_return(true)
+    end
+
+    specify do
+      Shoryuken.active_job_queue_name_prefixing = true
+
+      Shoryuken.options[:queues] = ['queue1', ['queue2', 2]]
+
+      Shoryuken.options[:groups] = {
+        'group1' => { queues: %w(group1_queue1 group1_queue2) }
+      }
+
+      subject.load
+
+      expect(Shoryuken.groups['default'][:queues]).to eq(%w(test_queue1 test_queue2 test_queue2))
+      expect(Shoryuken.groups['group1'][:queues]).to eq(%w(test_group1_queue1 test_group1_queue2))
+    end
+  end
 end

data/spec/shoryuken/middleware/server/timing_spec.rb

@@ -1,14 +1,16 @@
 require 'spec_helper'
 
-describe Shoryuken::Middleware::Server::Timing do
+RSpec.describe Shoryuken::Middleware::Server::Timing do
   let(:queue) { 'default' }
   let(:sqs_queue) { double Shoryuken::Queue, visibility_timeout: 60 }
 
   let(:sqs_msg) do
-    double Shoryuken::Message,
+    double(
+      Shoryuken::Message,
       queue_url: queue,
       body: 'test',
       message_id: 'fc754df7-9cc2-4c41-96ca-5996a44b771e'
+    )
   end
 
   before do
@@ -28,7 +30,7 @@ describe Shoryuken::Middleware::Server::Timing do
 
   context 'when exceeded the `visibility_timeout`' do
     it 'logs exceeded' do
-      allow(subject).to receive(:elapsed).and_return(120000)
+      allow(subject).to receive(:elapsed).and_return(120_000)
 
       expect(Shoryuken.logger).to receive(:info) do |&block|
         expect(block.call).to match(/started at/)

data/spec/spec_helper.rb

@@ -52,11 +52,14 @@ RSpec.configure do |config|
     TestWorker.get_shoryuken_options.clear
     TestWorker.get_shoryuken_options['queue'] = 'default'
 
+    Shoryuken.active_job_queue_name_prefixing = false
+
     Shoryuken.worker_registry.clear
     Shoryuken.register_worker('default', TestWorker)
 
     Aws.config[:stub_responses] = true
 
     allow(Concurrent).to receive(:global_io_executor).and_return(Concurrent::ImmediateExecutor.new)
+    allow(Shoryuken).to receive(:active_job?).and_return(false)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler