shoryuken 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62098d7fa2041d2ae1cfd8a4cfedd0e09766bbb
-  data.tar.gz: 38445deab5aeb3a08310d105264338d64e5d835d
+  metadata.gz: fff521cc6ef6173b686df9b83b5145901d3b20cb
+  data.tar.gz: a7841963b11b2e4025ab368698e7571df0e506e9
 SHA512:
-  metadata.gz: 7ac1f46247119f055a0ed55494d7e39f687520197790458effdb8b23323cf9cb8d54ba64ce5107e8e53285522c7083dc90298afc2b202589945b80c51d5c1835
-  data.tar.gz: 6c2997f79ad3822134fa0a2f5be6563e3b382ac17134a7afcdaf812c78719f56f657c430ee7b3b4880f0ca9022f3e17514f9e7e1a835a71283e65fa169e6d36d
+  metadata.gz: 3c45ecb9a4a2d63408978af8eda9d7a2fcf85122a1a603b16550143dff23f16f6e145b0f2985f85b41f1be8f107b1c8a4bf232d75e931d9e0b5635fd82bba7ab
+  data.tar.gz: 80410090f98a1a9d3112401c0fbf02e44b5b1f7fdb6e753df2f6ae2b4887927dcadc9937b2395fd5421c790892984c2e0fea4b3475077bf2411a0de0ecb854a9

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## [v2.0.2] - 2015-10-22
+## [v2.0.3] - 2015-12-30
+
+- Allow multiple queues per worker
+ - [#164](https://github.com/phstc/shoryuken/pull/164)
+
+- Fix typo
+ - [#166](https://github.com/phstc/shoryuken/pull/166)
+
+## [v2.0.2] - 2015-10-27
 
 - Fix warnings that are triggered in some cases with the raise_error matcher
  - [#144](https://github.com/phstc/shoryuken/pull/144)

data/README.md

@@ -169,7 +169,7 @@ shoryuken [options]
 
 ## More Information
 
-Please check the [Shoryuken Wiki](https://github.com/phstc/shoryuken/wiki).
+For more information on advanced topics such as signals (shutdown), ActiveJob integration, and so on please check the [Shoryuken Wiki](https://github.com/phstc/shoryuken/wiki).
 
 ## Credits
 

data/lib/shoryuken/message.rb

@@ -11,7 +11,7 @@ module Shoryuken
         self.queue_name = queue.name
       else
         # TODO: Remove next major release
-        Shoryuken.loggger.warn do
+        Shoryuken.logger.warn do
           '[DEPRECATION] Passing a queue url into Shoryuken::Message is deprecated, please pass the queue itself'
         end
         self.queue_url = queue

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/shoryuken/worker.rb

@@ -41,13 +41,7 @@ module Shoryuken
 
       def shoryuken_options(opts = {})
         @shoryuken_options = get_shoryuken_options.merge(stringify_keys(opts || {}))
-        queue = @shoryuken_options['queue']
-        if queue.respond_to? :call
-          queue = queue.call
-          @shoryuken_options['queue'] = queue
-        end
-
-        Shoryuken.register_worker(queue, self)
+        normalize_worker_queue!
       end
 
       def auto_visibility_timeout?
@@ -64,6 +58,22 @@ module Shoryuken
         end
         hash
       end
+
+      private
+
+      def normalize_worker_queue!
+        queue = @shoryuken_options['queue']
+        if queue.respond_to? :call
+          queue = queue.call
+          @shoryuken_options['queue'] = queue
+        end
+
+        [@shoryuken_options['queue']].flatten.compact.each(&method(:register_worker))
+      end
+
+      def register_worker(queue)
+        Shoryuken.register_worker(queue, self)
+      end
     end
   end
 end

data/shoryuken.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'dotenv'
 
   spec.add_dependency 'aws-sdk-core', '~> 2'
-  spec.add_dependency 'celluloid', '~> 0.16.0'
+  spec.add_dependency 'celluloid', '~> 0.16'
 end

data/spec/integration/launcher_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'shoryuken/manager'
 require 'shoryuken/launcher'
 
-describe Shoryuken::Launcher do
+RSpec.describe Shoryuken::Launcher do
   describe 'Consuming messages', slow: :true do
     before do
       Shoryuken.options[:aws][:receive_message] = { wait_time_seconds: 5 }

data/spec/shoryuken/worker_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Shoryuken::Worker' do
+RSpec.describe 'Shoryuken::Worker' do
   let(:sqs_queue) { double 'SQS Queue' }
   let(:queue)     { 'default' }
 
@@ -103,7 +103,7 @@ describe 'Shoryuken::Worker' do
       expect(Shoryuken.worker_registry.workers('default')).to eq([TestWorker])
     end
 
-    it 'accepts a block as queue name' do
+    it 'accepts a block as a queue' do
       $queue_prefix = 'production'
 
       class NewTestWorker
@@ -116,6 +116,18 @@ describe 'Shoryuken::Worker' do
       expect(NewTestWorker.get_shoryuken_options['queue']).to eq 'production_default'
     end
 
+    it 'accepts an array as a queue' do
+      class WorkerMultipleQueues
+        include Shoryuken::Worker
+
+        shoryuken_options queue: %w[queue1 queue2 queue3]
+      end
+
+      expect(Shoryuken.worker_registry.workers('queue1')).to eq([WorkerMultipleQueues])
+      expect(Shoryuken.worker_registry.workers('queue2')).to eq([WorkerMultipleQueues])
+      expect(Shoryuken.worker_registry.workers('queue3')).to eq([WorkerMultipleQueues])
+    end
+
     it 'is possible to configure the global defaults' do
       queue = SecureRandom.uuid
       Shoryuken.default_worker_options['queue'] = queue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
 description: Shoryuken is a super efficient AWS SQS thread based message processor
 email:
 - pablo@pablocantero.com