shoryuken 3.2.3 → 3.3.0

data/spec/shoryuken/queue_spec.rb

@@ -121,10 +121,10 @@ RSpec.describe Shoryuken::Queue do
     it 'accepts SQS request parameters' do
       # https://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Client.html#send_message_batch-instance_method
       expect(sqs).to(
-        receive(:send_message_batch).with(hash_including(entries: [{id: '0', message_body: 'msg1'}, {id: '1', message_body: 'msg2'}]))
+        receive(:send_message_batch).with(hash_including(entries: [{ id: '0', message_body: 'msg1' }, { id: '1', message_body: 'msg2' }]))
       )
 
-      subject.send_messages(entries: [{id: '0', message_body: 'msg1'}, {id: '1', message_body: 'msg2'}])
+      subject.send_messages(entries: [{ id: '0', message_body: 'msg1' }, { id: '1', message_body: 'msg2' }])
     end
 
     it 'accepts an array of messages' do
@@ -188,7 +188,7 @@ RSpec.describe Shoryuken::Queue do
         )
       )
 
-      subject.send_messages(%w(msg1 msg2))
+      subject.send_messages(%w[msg1 msg2])
     end
   end
 

data/spec/shoryuken/util_spec.rb

@@ -9,7 +9,7 @@ describe 'Shoryuken::Util' do
 
   describe '#unparse_queues' do
     it 'returns queues and weights' do
-      queues = %w(queue1 queue1 queue2 queue3 queue4 queue4 queue4)
+      queues = %w[queue1 queue1 queue2 queue3 queue4 queue4 queue4]
 
       expect(subject.unparse_queues(queues)).to eq([['queue1', 2], ['queue2', 1], ['queue3', 1], ['queue4', 3]])
     end

data/spec/shoryuken/worker/default_executor_spec.rb

@@ -18,7 +18,8 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
           }
         },
         message_body: 'message',
-        delay_seconds: 60)
+        delay_seconds: 60
+      )
 
       TestWorker.perform_in(60, 'message')
     end
@@ -40,7 +41,8 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
           }
         },
         message_body: 'message',
-        delay_seconds: 60)
+        delay_seconds: 60
+      )
 
       TestWorker.perform_in(Time.now + 60, 'message')
     end
@@ -61,7 +63,8 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
             data_type: 'String'
           }
         },
-        message_body: 'message')
+        message_body: 'message'
+      )
 
       TestWorker.perform_async('message')
     end
@@ -75,7 +78,8 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
             data_type: 'String'
           }
         },
-        message_body: 'delayed message')
+        message_body: 'delayed message'
+      )
 
       TestWorker.perform_async('delayed message', delay_seconds: 60)
     end
@@ -92,7 +96,8 @@ RSpec.describe Shoryuken::Worker::DefaultExecutor do
             data_type: 'String'
           }
         },
-        message_body: 'delayed message')
+        message_body: 'delayed message'
+      )
 
       TestWorker.perform_async('delayed message', queue: new_queue)
     end

data/spec/shoryuken/worker/inline_executor_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
   describe '.perform_async' do
     specify do
-      expect_any_instance_of(TestWorker).to receive(:perform)
+      expect_any_instance_of(TestWorker).to receive(:perform).with(anything, 'test')
 
       TestWorker.perform_async('test')
     end
@@ -15,9 +15,35 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
   describe '.perform_in' do
     specify do
-      expect_any_instance_of(TestWorker).to receive(:perform)
+      expect_any_instance_of(TestWorker).to receive(:perform).with(anything, 'test')
 
       TestWorker.perform_in(60, 'test')
     end
   end
+
+  context 'batch' do
+    before do
+      TestWorker.get_shoryuken_options['batch'] = true
+    end
+
+    after do
+      TestWorker.get_shoryuken_options['batch'] = false
+    end
+
+    describe '.perform_async' do
+      specify do
+        expect_any_instance_of(TestWorker).to receive(:perform).with(anything, ['test'])
+
+        TestWorker.perform_async('test')
+      end
+    end
+
+    describe '.perform_in' do
+      specify do
+        expect_any_instance_of(TestWorker).to receive(:perform).with(anything, ['test'])
+
+        TestWorker.perform_in(60, 'test')
+      end
+    end
+  end
 end

data/spec/shoryuken/worker_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Shoryuken::Worker do
       class NewTestWorker
         include Shoryuken::Worker
 
-        shoryuken_options queue: ->{ "#{$queue_prefix}_default" }
+        shoryuken_options queue: -> { "#{$queue_prefix}_default" }
       end
 
       expect(Shoryuken.worker_registry.workers('production_default')).to eq([NewTestWorker])
@@ -30,7 +30,7 @@ RSpec.describe Shoryuken::Worker do
       class TestWorker
         include Shoryuken::Worker
 
-        OPT = { queue: :default }
+        OPT = { queue: :default }.freeze
 
         shoryuken_options OPT
       end
@@ -93,15 +93,15 @@ RSpec.describe Shoryuken::Worker do
       class ParentWorker
         include Shoryuken::Worker
 
-        shoryuken_options queue: "myqueue", auto_delete: false
+        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['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
@@ -110,7 +110,7 @@ RSpec.describe Shoryuken::Worker do
   describe '.server_middleware' do
     before do
       class FakeMiddleware
-        def call(*args)
+        def call(*_args)
           yield
         end
       end
@@ -133,9 +133,7 @@ RSpec.describe Shoryuken::Worker do
         class NewTestWorker2
           include Shoryuken::Worker
 
-          server_middleware do |chain|
-            chain.clear
-          end
+          server_middleware(&:clear)
         end
       end
 

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ if ENV['CODECLIMATE_REPO_TOKEN']
   SimpleCov.start
 end
 
-config_file = File.join(File.expand_path('../..', __FILE__), 'spec', 'shoryuken.yml')
+config_file = File.join(File.expand_path('..', __dir__), 'spec', 'shoryuken.yml')
 
 Shoryuken::EnvironmentLoader.setup_options(config_file: config_file)
 

data/test_workers/endless_interruptive_worker.rb

@@ -12,7 +12,7 @@ class EndlessInterruptiveWorker
     end
 
     def max_execution_time
-      ENV["MAX_EXECUTION_TIME"] ? ENV["MAX_EXECUTION_TIME"].to_i : 100
+      ENV['MAX_EXECUTION_TIME'] ? ENV['MAX_EXECUTION_TIME'].to_i : 100
     end
 
     def rng
@@ -25,7 +25,7 @@ class EndlessInterruptiveWorker
     end
   end
 
-  def perform(sqs_msg, body)
+  def perform(_sqs_msg, body)
     Shoryuken.logger.info("Received message: '#{body}'")
 
     execution_ms = self.class.random_number(self.class.max_execution_time)

data/test_workers/endless_uninterruptive_worker.rb

@@ -12,7 +12,7 @@ class EndlessUninterruptiveWorker
     end
 
     def max_execution_time
-      ENV["MAX_EXECUTION_TIME"] ? ENV["MAX_EXECUTION_TIME"].to_i : 100
+      ENV['MAX_EXECUTION_TIME'] ? ENV['MAX_EXECUTION_TIME'].to_i : 100
     end
 
     def rng
@@ -25,13 +25,13 @@ class EndlessUninterruptiveWorker
     end
   end
 
-  def perform(sqs_msg, body)
+  def perform(_sqs_msg, body)
     Shoryuken.logger.info("Received message: #{body}")
 
     execution_ms = self.class.random_number(self.class.max_execution_time)
     Shoryuken.logger.info("Going to burn metal for #{execution_ms}ms")
     end_time = Time.now + execution_ms.to_f / 1000
-    while Time.now < end_time do
+    while Time.now < end_time
       # burn metal
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor