shoryuken 3.1.1 → 3.2.0

data/spec/shoryuken/worker/inline_executor_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+RSpec.describe Shoryuken::Worker::InlineExecutor do
+  before do
+    Shoryuken.worker_executor = described_class
+  end
+
+  describe '.perform_async' do
+    specify do
+      expect_any_instance_of(TestWorker).to receive(:perform)
+
+      TestWorker.perform_async('test')
+    end
+  end
+
+  describe '.perform_in' do
+    specify do
+      expect_any_instance_of(TestWorker).to receive(:perform)
+
+      TestWorker.perform_in(60, 'test')
+    end
+  end
+end

data/spec/shoryuken/worker_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'Shoryuken::Worker' do
+RSpec.describe Shoryuken::Worker do
   let(:sqs_queue) { double 'SQS Queue' }
   let(:queue)     { 'default' }
 
@@ -8,96 +8,6 @@ RSpec.describe 'Shoryuken::Worker' do
     allow(Shoryuken::Client).to receive(:queues).with(queue).and_return(sqs_queue)
   end
 
-  describe '.perform_in' do
-    it 'delays a message' do
-      expect(sqs_queue).to receive(:send_message).with(
-        message_attributes: {
-          'shoryuken_class' => {
-            string_value: TestWorker.to_s,
-            data_type: 'String'
-          }
-        },
-        message_body: 'message',
-        delay_seconds: 60)
-
-      TestWorker.perform_in(60, 'message')
-    end
-
-    it 'raises an exception' do
-      expect {
-        TestWorker.perform_in(901, 'message')
-      }.to raise_error 'The maximum allowed delay is 15 minutes'
-    end
-  end
-
-  describe '.perform_at' do
-    it 'delays a message' do
-      expect(sqs_queue).to receive(:send_message).with(
-        message_attributes: {
-          'shoryuken_class' => {
-            string_value: TestWorker.to_s,
-            data_type: 'String'
-          }
-        },
-        message_body: 'message',
-        delay_seconds: 60)
-
-      TestWorker.perform_in(Time.now + 60, 'message')
-    end
-
-    it 'raises an exception' do
-      expect {
-        TestWorker.perform_in(Time.now + 901, 'message')
-      }.to raise_error 'The maximum allowed delay is 15 minutes'
-    end
-  end
-
-  describe '.perform_async' do
-    it 'enqueues a message' do
-      expect(sqs_queue).to receive(:send_message).with(
-        message_attributes: {
-          'shoryuken_class' => {
-            string_value: TestWorker.to_s,
-            data_type: 'String'
-          }
-        },
-        message_body: 'message')
-
-      TestWorker.perform_async('message')
-    end
-
-    it 'enqueues a message with options' do
-      expect(sqs_queue).to receive(:send_message).with(
-        delay_seconds: 60,
-        message_attributes: {
-          'shoryuken_class' => {
-            string_value: TestWorker.to_s,
-            data_type: 'String'
-          }
-        },
-        message_body: 'delayed message')
-
-      TestWorker.perform_async('delayed message', delay_seconds: 60)
-    end
-
-    it 'accepts an `queue` option' do
-      new_queue = 'some_different_queue'
-
-      expect(Shoryuken::Client).to receive(:queues).with(new_queue).and_return(sqs_queue)
-
-      expect(sqs_queue).to receive(:send_message).with(
-        message_attributes: {
-          'shoryuken_class' => {
-            string_value: TestWorker.to_s,
-            data_type: 'String'
-          }
-        },
-        message_body: 'delayed message')
-
-      TestWorker.perform_async('delayed message', queue: new_queue)
-    end
-  end
-
   describe '.shoryuken_options' do
     it 'registers a worker' do
       expect(Shoryuken.worker_registry.workers('default')).to eq([TestWorker])
@@ -116,6 +26,20 @@ RSpec.describe 'Shoryuken::Worker' do
       expect(NewTestWorker.get_shoryuken_options['queue']).to eq 'production_default'
     end
 
+    it 'does not change the original hash' do
+      class TestWorker
+        include Shoryuken::Worker
+
+        OPT = { queue: :default }
+
+        shoryuken_options OPT
+      end
+
+      expect(TestWorker::OPT['queue']).to eq(nil)
+      expect(TestWorker.get_shoryuken_options['queue']).to eq('default')
+      expect(TestWorker::OPT[:queue]).to eq(:default)
+    end
+
     it 'accepts an array as a queue' do
       class WorkerMultipleQueues
         include Shoryuken::Worker
@@ -164,6 +88,23 @@ RSpec.describe 'Shoryuken::Worker' do
       expect(Shoryuken.worker_registry.workers('symbol_queue2')).to eq([WorkerMultipleSymbolQueues])
       expect(Shoryuken.worker_registry.workers('symbol_queue3')).to eq([WorkerMultipleSymbolQueues])
     end
+
+    it 'preserves parent class options' do
+      class ParentWorker
+        include Shoryuken::Worker
+
+        shoryuken_options queue: "myqueue", auto_delete: false
+      end
+
+      class ChildWorker < ParentWorker
+        shoryuken_options auto_delete: true
+      end
+
+      expect(ParentWorker.get_shoryuken_options['queue']).to eq("myqueue")
+      expect(ChildWorker.get_shoryuken_options['queue']).to eq("myqueue")
+      expect(ParentWorker.get_shoryuken_options['auto_delete']).to eq(false)
+      expect(ChildWorker.get_shoryuken_options['auto_delete']).to eq(true)
+    end
   end
 
   describe '.server_middleware' do

data/spec/spec_helper.rb

@@ -52,11 +52,16 @@ 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
 
+    Shoryuken.sqs_client_receive_message_opts.clear
+
     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.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
@@ -137,6 +137,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.aws-sdk-core-v2
 - LICENSE
 - README.md
 - Rakefile
@@ -146,6 +147,7 @@ files:
 - examples/bootstrap_queues.rb
 - examples/default_worker.rb
 - lib/shoryuken.rb
+- lib/shoryuken/body_parser.rb
 - lib/shoryuken/client.rb
 - lib/shoryuken/core_ext.rb
 - lib/shoryuken/default_worker_registry.rb
@@ -172,11 +174,14 @@ files:
 - lib/shoryuken/util.rb
 - lib/shoryuken/version.rb
 - lib/shoryuken/worker.rb
+- lib/shoryuken/worker/default_executor.rb
+- lib/shoryuken/worker/inline_executor.rb
 - lib/shoryuken/worker_registry.rb
 - shoryuken.gemspec
 - shoryuken.jpg
 - spec/integration/launcher_spec.rb
 - spec/shoryuken.yml
+- spec/shoryuken/body_parser_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
@@ -195,6 +200,8 @@ files:
 - spec/shoryuken/queue_spec.rb
 - spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
+- spec/shoryuken/worker/default_executor_spec.rb
+- spec/shoryuken/worker/inline_executor_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb
@@ -220,13 +227,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
 - spec/integration/launcher_spec.rb
 - spec/shoryuken.yml
+- spec/shoryuken/body_parser_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
@@ -245,6 +253,8 @@ test_files:
 - spec/shoryuken/queue_spec.rb
 - spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
+- spec/shoryuken/worker/default_executor_spec.rb
+- spec/shoryuken/worker/inline_executor_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb