shoryuken 6.2.1 → 7.0.0.alpha2

data/spec/shoryuken/polling/queue_configuration_spec.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+RSpec.describe Shoryuken::Polling::QueueConfiguration do
+  describe '#initialize' do
+    it 'creates configuration with name and options' do
+      config = described_class.new('test_queue', { priority: :high })
+
+      expect(config.name).to eq('test_queue')
+      expect(config.options).to eq({ priority: :high })
+    end
+
+    it 'creates configuration with empty options' do
+      config = described_class.new('simple_queue', {})
+
+      expect(config.name).to eq('simple_queue')
+      expect(config.options).to eq({})
+    end
+
+    it 'accepts nil options' do
+      config = described_class.new('queue', nil)
+
+      expect(config.name).to eq('queue')
+      expect(config.options).to be_nil
+    end
+  end
+
+  describe '#hash' do
+    it 'returns hash based on queue name' do
+      config1 = described_class.new('queue', {})
+      config2 = described_class.new('queue', { weight: 5 })
+
+      expect(config1.hash).to eq(config2.hash)
+      expect(config1.hash).to eq('queue'.hash)
+    end
+
+    it 'returns different hash for different queue names' do
+      config1 = described_class.new('queue1', {})
+      config2 = described_class.new('queue2', {})
+
+      expect(config1.hash).not_to eq(config2.hash)
+    end
+  end
+
+  describe '#==' do
+    context 'when comparing with another QueueConfiguration' do
+      it 'returns true for same name and options' do
+        config1 = described_class.new('queue', { weight: 5 })
+        config2 = described_class.new('queue', { weight: 5 })
+
+        expect(config1).to eq(config2)
+      end
+
+      it 'returns false for same name but different options' do
+        config1 = described_class.new('queue', { weight: 5 })
+        config2 = described_class.new('queue', { weight: 10 })
+
+        expect(config1).not_to eq(config2)
+      end
+
+      it 'returns false for different names' do
+        config1 = described_class.new('queue1', {})
+        config2 = described_class.new('queue2', {})
+
+        expect(config1).not_to eq(config2)
+      end
+    end
+
+    context 'when comparing with a string' do
+      it 'returns true when options are empty and names match' do
+        config = described_class.new('test_queue', {})
+
+        expect(config).to eq('test_queue')
+      end
+
+      it 'returns false when options are not empty' do
+        config = described_class.new('test_queue', { weight: 5 })
+
+        expect(config).not_to eq('test_queue')
+      end
+
+      it 'returns false when names do not match' do
+        config = described_class.new('queue1', {})
+
+        expect(config).not_to eq('queue2')
+      end
+    end
+
+    context 'when comparing with other objects' do
+      it 'returns false for non-string, non-QueueConfiguration objects' do
+        config = described_class.new('queue', {})
+
+        expect(config).not_to eq(123)
+        expect(config).not_to eq([])
+        expect(config).not_to eq({ name: 'queue' })
+      end
+    end
+  end
+
+  describe '#eql?' do
+    it 'behaves the same as ==' do
+      config1 = described_class.new('queue', {})
+      config2 = described_class.new('queue', {})
+
+      expect(config1.eql?(config2)).to eq(config1 == config2)
+      expect(config1.eql?('queue')).to eq(config1 == 'queue')
+    end
+  end
+
+  describe '#to_s' do
+    context 'when options are empty' do
+      it 'returns just the queue name' do
+        config = described_class.new('simple_queue', {})
+
+        expect(config.to_s).to eq('simple_queue')
+      end
+    end
+
+    context 'when options are present' do
+      it 'returns detailed representation with options' do
+        config = described_class.new('complex_queue', { priority: :high, weight: 5 })
+
+        expect(config.to_s).to include('#<QueueConfiguration complex_queue options={')
+      end
+
+      it 'handles single option' do
+        config = described_class.new('weighted_queue', { weight: 10 })
+
+        expect(config.to_s).to include('#<QueueConfiguration weighted_queue options={')
+      end
+    end
+
+    context 'when options are nil' do
+      it 'returns detailed representation' do
+        config = described_class.new('nil_options_queue', nil)
+
+        expect(config.to_s).to eq('#<QueueConfiguration nil_options_queue options=nil>')
+      end
+    end
+  end
+
+  describe 'struct behavior' do
+    it 'provides attribute accessors' do
+      config = described_class.new('queue', { weight: 5 })
+
+      expect(config.name).to eq('queue')
+      expect(config.options).to eq({ weight: 5 })
+    end
+
+    it 'allows attribute modification' do
+      config = described_class.new('queue', {})
+
+      config.name = 'new_queue'
+      config.options = { priority: :low }
+
+      expect(config.name).to eq('new_queue')
+      expect(config.options).to eq({ priority: :low })
+    end
+
+    it 'supports array-like access' do
+      config = described_class.new('queue', { weight: 5 })
+
+      expect(config[0]).to eq('queue')
+      expect(config[1]).to eq({ weight: 5 })
+    end
+  end
+
+  describe 'usage as hash key' do
+    it 'can be used as hash keys' do
+      config1 = described_class.new('queue', {})
+      config2 = described_class.new('queue', {})  # Same config
+
+      hash = {}
+      hash[config1] = 'value1'
+      hash[config2] = 'value2'
+
+      # Same queue name and options should use same hash key
+      expect(hash[config1]).to eq('value2')
+      expect(hash[config2]).to eq('value2')
+      expect(hash.size).to eq(1)
+    end
+
+    it 'different queue names create different keys' do
+      config1 = described_class.new('queue1', {})
+      config2 = described_class.new('queue2', {})
+
+      hash = {}
+      hash[config1] = 'value1'
+      hash[config2] = 'value2'
+
+      expect(hash[config1]).to eq('value1')
+      expect(hash[config2]).to eq('value2')
+      expect(hash.size).to eq(2)
+    end
+  end
+end

data/spec/shoryuken/polling/strict_priority_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Polling::StrictPriority do
   let(:queue1) { 'shoryuken' }

data/spec/shoryuken/polling/weighted_round_robin_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Polling::WeightedRoundRobin do
   let(:queue1) { 'shoryuken' }

data/spec/shoryuken/processor_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Processor do
   let(:manager)   { double Shoryuken::Manager }

data/spec/shoryuken/queue_spec.rb

@@ -1,6 +1,5 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength
 RSpec.describe Shoryuken::Queue do
   let(:credentials) { Aws::Credentials.new('access_key_id', 'secret_access_key') }
   let(:sqs) { Aws::SQS::Client.new(stub_responses: true, credentials: credentials) }
@@ -30,7 +29,7 @@ RSpec.describe Shoryuken::Queue do
       let(:queue_url) { "http://localhost:4576/queue/#{queue_name}" }
 
       it 'instantiates by URL and validate the URL' do
-        # See https://github.com/phstc/shoryuken/pull/551
+        # See https://github.com/ruby-shoryuken/shoryuken/pull/551
         expect_any_instance_of(described_class).to receive(:fifo?).and_return(false)
 
         subject = described_class.new(sqs, queue_url)

data/spec/shoryuken/runner_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-require 'shoryuken/runner'
+# frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength
 RSpec.describe Shoryuken::Runner do
   let(:cli) { Shoryuken::Runner.instance }
 

data/spec/shoryuken/util_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe 'Shoryuken::Util' do
   subject do

data/spec/shoryuken/worker/default_executor_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Worker::DefaultExecutor do
   let(:sqs_queue) { double 'SQS Queue' }

data/spec/shoryuken/worker/inline_executor_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Worker::InlineExecutor do
   before do
@@ -11,6 +11,20 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
       TestWorker.perform_async('test')
     end
+
+    it 'properly sets message_attributes' do
+      custom_attributes = {
+        'custom_key' => { string_value: 'custom_value', data_type: 'String' }
+      }
+
+      expect_any_instance_of(TestWorker).to receive(:perform) do |_, sqs_msg, _|
+        expect(sqs_msg.message_attributes).to include('shoryuken_class')
+        expect(sqs_msg.message_attributes).to include('custom_key')
+        expect(sqs_msg.message_attributes['custom_key'][:string_value]).to eq('custom_value')
+      end
+
+      TestWorker.perform_async('test', message_attributes: custom_attributes)
+    end
   end
 
   describe '.perform_in' do
@@ -19,6 +33,20 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
       TestWorker.perform_in(60, 'test')
     end
+
+    it 'properly passes message_attributes to perform_async' do
+      custom_attributes = {
+        'custom_key' => { string_value: 'custom_value', data_type: 'String' }
+      }
+
+      expect_any_instance_of(TestWorker).to receive(:perform) do |_, sqs_msg, _|
+        expect(sqs_msg.message_attributes).to include('shoryuken_class')
+        expect(sqs_msg.message_attributes).to include('custom_key')
+        expect(sqs_msg.message_attributes['custom_key'][:string_value]).to eq('custom_value')
+      end
+
+      TestWorker.perform_in(60, 'test', message_attributes: custom_attributes)
+    end
   end
 
   context 'batch' do
@@ -36,6 +64,20 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
         TestWorker.perform_async('test')
       end
+
+      it 'properly passes message_attributes with batch' do
+        custom_attributes = {
+          'custom_key' => { string_value: 'custom_value', data_type: 'String' }
+        }
+
+        expect_any_instance_of(TestWorker).to receive(:perform) do |_, sqs_msgs, _|
+          expect(sqs_msgs.first.message_attributes).to include('shoryuken_class')
+          expect(sqs_msgs.first.message_attributes).to include('custom_key')
+          expect(sqs_msgs.first.message_attributes['custom_key'][:string_value]).to eq('custom_value')
+        end
+
+        TestWorker.perform_async('test', message_attributes: custom_attributes)
+      end
     end
 
     describe '.perform_in' do
@@ -44,6 +86,20 @@ RSpec.describe Shoryuken::Worker::InlineExecutor do
 
         TestWorker.perform_in(60, 'test')
       end
+
+      it 'properly passes message_attributes with batch' do
+        custom_attributes = {
+          'custom_key' => { string_value: 'custom_value', data_type: 'String' }
+        }
+
+        expect_any_instance_of(TestWorker).to receive(:perform) do |_, sqs_msgs, _|
+          expect(sqs_msgs.first.message_attributes).to include('shoryuken_class')
+          expect(sqs_msgs.first.message_attributes).to include('custom_key')
+          expect(sqs_msgs.first.message_attributes['custom_key'][:string_value]).to eq('custom_value')
+        end
+
+        TestWorker.perform_in(60, 'test', message_attributes: custom_attributes)
+      end
     end
   end
 end

data/spec/shoryuken/worker_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Worker do
   let(:sqs_queue) { double 'SQS Queue' }
@@ -108,14 +108,16 @@ RSpec.describe Shoryuken::Worker do
   end
 
   describe '.server_middleware' do
-    before do
-      class FakeMiddleware
+    let(:fake_middleware_class) do
+      Class.new do
         def call(*_args)
           yield
         end
       end
     end
 
+    before { fake_middleware_class }
+
     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|
@@ -147,27 +149,29 @@ RSpec.describe Shoryuken::Worker do
     end
 
     context 'the worker modifies the chain' do
-      before do
-        class NewTestWorker3
+      let(:new_test_worker3_class) do
+        ref = fake_middleware_class
+
+        Class.new do
           include Shoryuken::Worker
 
           server_middleware do |chain|
             chain.remove Shoryuken::Middleware::Server::Timing
-            chain.insert_before Shoryuken::Middleware::Server::AutoDelete, FakeMiddleware
+            chain.insert_before Shoryuken::Middleware::Server::AutoDelete, ref
           end
         end
       end
 
       it 'returns the combined global and worker middlewares' do
-        expect(NewTestWorker3.server_middleware).not_to satisfy do |chain|
+        expect(new_test_worker3_class.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)
+        expect(new_test_worker3_class.server_middleware).to satisfy do |chain|
+          chain.exists?(fake_middleware_class)
         end
 
-        expect(NewTestWorker3.server_middleware).to satisfy do |chain|
+        expect(new_test_worker3_class.server_middleware).to satisfy do |chain|
           chain.exists?(Shoryuken::Middleware::Server::AutoDelete)
         end
       end
@@ -182,7 +186,7 @@ RSpec.describe Shoryuken::Worker do
         end
 
         expect(Shoryuken.server_middleware).not_to satisfy do |chain|
-          chain.exists?(FakeMiddleware)
+          chain.exists?(fake_middleware_class)
         end
       end
     end

data/spec/shoryuken_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken do
   describe '.healthy?' do

data/spec/spec_helper.rb

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+Warning[:performance] = true if RUBY_VERSION >= '3.3'
+Warning[:deprecated] = true
+$VERBOSE = true
+
+require 'warning'
+
+Warning.process do |warning|
+  next unless warning.include?(Dir.pwd)
+  next if warning.include?('useless use of a variable in void context') && warning.include?('core_ext')
+  next if warning.include?('vendor/')
+
+  raise "Warning in your code: #{warning}"
+end
+
 require 'bundler/setup'
 Bundler.setup
 
@@ -10,12 +26,11 @@ require 'shoryuken'
 require 'json'
 require 'dotenv'
 require 'securerandom'
+require 'ostruct'
 Dotenv.load
 
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'simplecov'
+SimpleCov.start
 
 config_file = File.join(File.expand_path('..', __dir__), 'spec', 'shoryuken.yml')