shoryuken 0.0.4 → 0.0.5

data/spec/shoryuken/worker_spec.rb

@@ -83,7 +83,7 @@ describe 'Shoryuken::Worker' do
 
   describe '.shoryuken_options' do
     it 'registers a worker' do
-      expect(Shoryuken.workers['default']).to eq TestWorker
+      expect(Shoryuken.worker_registry.workers('default')).to eq([TestWorker])
     end
 
     it 'accepts a block as queue name' do
@@ -95,8 +95,106 @@ describe 'Shoryuken::Worker' do
         shoryuken_options queue: ->{ "#{$queue_prefix}_default" }
       end
 
-      expect(Shoryuken.workers['production_default']).to eq NewTestWorker
+      expect(Shoryuken.worker_registry.workers('production_default')).to eq([NewTestWorker])
       expect(NewTestWorker.get_shoryuken_options['queue']).to eq 'production_default'
     end
+
+    it 'is possible to configure the global defaults' do
+      queue = SecureRandom.uuid
+      Shoryuken.default_worker_options['queue'] = queue
+
+      class GlobalDefaultsTestWorker
+        include Shoryuken::Worker
+
+        shoryuken_options auto_delete: true
+      end
+
+      expect(GlobalDefaultsTestWorker.get_shoryuken_options['queue']).to eq queue
+      expect(GlobalDefaultsTestWorker.get_shoryuken_options['auto_delete']).to eq true
+      expect(GlobalDefaultsTestWorker.get_shoryuken_options['batch']).to eq false
+    end
+  end
+
+  describe '.server_middleware' do
+    before do
+      class FakeMiddleware
+        def call(*args)
+          yield
+        end
+      end
+    end
+
+    context 'no middleware is defined in the worker' do
+      it 'returns the list of global middlewares' do
+        expect(TestWorker.server_middleware).to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::Timing)
+        end
+
+        expect(TestWorker.server_middleware).to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::AutoDelete)
+        end
+      end
+    end
+
+    context 'the worker clears the middleware chain' do
+      before do
+        class NewTestWorker2
+          include Shoryuken::Worker
+
+          server_middleware do |chain|
+            chain.clear
+          end
+        end
+      end
+
+      it 'returns an empty list' do
+        expect(NewTestWorker2.server_middleware.entries).to be_empty
+      end
+
+      it 'does not affect the global middleware chain' do
+        expect(Shoryuken.server_middleware.entries).not_to be_empty
+      end
+    end
+
+    context 'the worker modifies the chain' do
+      before do
+        class NewTestWorker3
+          include Shoryuken::Worker
+
+          server_middleware do |chain|
+            chain.remove Shoryuken::Middleware::Server::Timing
+            chain.insert_before Shoryuken::Middleware::Server::AutoDelete, FakeMiddleware
+          end
+        end
+      end
+
+      it 'returns the combined global and worker middlewares' do
+        expect(NewTestWorker3.server_middleware).not_to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::Timing)
+        end
+
+        expect(NewTestWorker3.server_middleware).to satisfy do |chain|
+          chain.exists?(FakeMiddleware)
+        end
+
+        expect(NewTestWorker3.server_middleware).to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::AutoDelete)
+        end
+      end
+
+      it 'does not affect the global middleware chain' do
+        expect(Shoryuken.server_middleware).to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::Timing)
+        end
+
+        expect(Shoryuken.server_middleware).to satisfy do |chain|
+          chain.exists?(Shoryuken::Middleware::Server::AutoDelete)
+        end
+
+        expect(Shoryuken.server_middleware).not_to satisfy do |chain|
+          chain.exists?(FakeMiddleware)
+        end
+      end
+    end
   end
 end

data/spec/shoryuken_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe Shoryuken do
   describe '.register_worker' do
     it 'registers a worker' do
-      described_class.workers.clear
+      described_class.worker_registry.clear
       described_class.register_worker('default', TestWorker)
-      expect(described_class.workers).to eq('default' => TestWorker)
+      expect(described_class.worker_registry.workers('default')).to eq([TestWorker])
     end
 
     it 'registers a batchable worker' do
-      described_class.workers.clear
+      described_class.worker_registry.clear
       TestWorker.get_shoryuken_options['batch'] = true
       described_class.register_worker('default', TestWorker)
-      expect(described_class.workers).to eq('default' => TestWorker)
+      expect(described_class.worker_registry.workers('default')).to eq([TestWorker])
     end
 
     it 'allows multiple workers' do
-      described_class.workers.clear
+      described_class.worker_registry.clear
       described_class.register_worker('default', TestWorker)
-      expect(described_class.workers).to eq('default' => TestWorker)
+      expect(described_class.worker_registry.workers('default')).to eq([TestWorker])
 
       class Test2Worker
         include Shoryuken::Worker
@@ -28,11 +28,11 @@ describe Shoryuken do
         def perform(sqs_msg, body); end
       end
 
-      expect(described_class.workers).to eq('default' => Test2Worker)
+      expect(described_class.worker_registry.workers('default')).to eq([Test2Worker])
     end
 
     it 'raises an exception when mixing batchable with non batchable' do
-      described_class.workers.clear
+      described_class.worker_registry.clear
       TestWorker.get_shoryuken_options['batch'] = true
       described_class.register_worker('default', TestWorker)
 
@@ -45,7 +45,7 @@ describe Shoryuken do
           def perform(sqs_msg, body); end
         end
       }.to raise_error("Could not register BatchableWorker for 'default', because TestWorker is already registered for this queue, " \
-                       "and Shoryuken doesn't support a batchable worker for a queue with multiple workers")
+                       "and Shoryuken doesn't support a batchable worker for a queue with multiple workers.")
     end
   end
 end

data/spec/spec_helper.rb

@@ -51,7 +51,7 @@ RSpec.configure do |config|
     TestWorker.get_shoryuken_options.clear
     TestWorker.get_shoryuken_options['queue'] = 'default'
 
-    Shoryuken.workers.clear
+    Shoryuken.worker_registry.clear
     Shoryuken.register_worker('default', TestWorker)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: Shoryuken is a super efficient AWS SQS thread based message processor
 email:
 - pablo@pablocantero.com
@@ -116,6 +116,8 @@ files:
 - lib/shoryuken/cli.rb
 - lib/shoryuken/client.rb
 - lib/shoryuken/core_ext.rb
+- lib/shoryuken/default_worker_registry.rb
+- lib/shoryuken/extensions/active_job_adapter.rb
 - lib/shoryuken/fetcher.rb
 - lib/shoryuken/launcher.rb
 - lib/shoryuken/logging.rb
@@ -128,12 +130,13 @@ files:
 - lib/shoryuken/util.rb
 - lib/shoryuken/version.rb
 - lib/shoryuken/worker.rb
-- lib/shoryuken/worker_loader.rb
+- lib/shoryuken/worker_registry.rb
 - shoryuken.gemspec
 - shoryuken.jpg
 - spec/integration/launcher_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
+- spec/shoryuken/default_worker_registry_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -141,13 +144,12 @@ files:
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/util_spec.rb
-- spec/shoryuken/worker_loader_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/phstc/shoryuken
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -173,6 +175,7 @@ test_files:
 - spec/integration/launcher_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
+- spec/shoryuken/default_worker_registry_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -180,7 +183,6 @@ test_files:
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/util_spec.rb
-- spec/shoryuken/worker_loader_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb

data/lib/shoryuken/worker_loader.rb

@@ -1,17 +0,0 @@
-module Shoryuken
-  class WorkerLoader
-    class << self
-      def call(queue, sqs_msg)
-        # missing `try?` - yes, I'm
-        worker_class = !sqs_msg.is_a?(Array) &&
-          sqs_msg.message_attributes &&
-          sqs_msg.message_attributes['shoryuken_class'] &&
-          sqs_msg.message_attributes['shoryuken_class'][:string_value]
-
-        worker_class = (worker_class.constantize rescue nil) || Shoryuken.workers[queue]
-
-        worker_class.new
-      end
-    end
-  end
-end

data/spec/shoryuken/worker_loader_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Shoryuken::WorkerLoader do
-  let(:queue)   { 'default' }
-  let(:sqs_msg) { double AWS::SQS::ReceivedMessage, id: 'fc754df7-9cc2-4c41-96ca-5996a44b771e', body: 'test', message_attributes: { } }
-
-  describe '.call' do
-    it 'returns the worker using `Shoryuken.workers`' do
-      expect(described_class.call(queue, sqs_msg)).to be_an_instance_of TestWorker
-    end
-
-    context 'when `message_attributes`' do
-      let(:sqs_msg) { double AWS::SQS::ReceivedMessage, id: 'fc754df7-9cc2-4c41-96ca-5996a44b771e', body: 'test', message_attributes: {
-        'shoryuken_class' => {
-          string_value: TestWorker.to_s,
-          data_type: 'String'
-        }
-      } }
-
-      it 'returns the worker using `message_attributes`' do
-        Shoryuken.workers.clear
-
-        expect(described_class.call(queue, sqs_msg)).to be_an_instance_of TestWorker
-      end
-    end
-  end
-end