shoryuken 7.0.0.alpha1 → 7.0.0.rc1

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

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 7.0.0.alpha1
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Pablo Cantero
@@ -10,27 +10,27 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.66.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.66.0
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -38,13 +38,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -52,7 +52,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,27 +80,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-sqs
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.66.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.66.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -94,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -118,7 +132,6 @@ files:
 - ".devcontainer/Dockerfile"
 - ".devcontainer/base.Dockerfile"
 - ".devcontainer/devcontainer.json"
-- ".github/FUNDING.yml"
 - ".github/workflows/push.yml"
 - ".github/workflows/specs.yml"
 - ".github/workflows/verify-action-pins.yml"
@@ -139,15 +152,12 @@ files:
 - examples/bootstrap_queues.rb
 - examples/default_worker.rb
 - gemfiles/.gitignore
-- gemfiles/rails_6_1.gemfile
-- gemfiles/rails_7_0.gemfile
-- gemfiles/rails_7_1.gemfile
 - gemfiles/rails_7_2.gemfile
 - gemfiles/rails_8_0.gemfile
+- gemfiles/rails_8_1.gemfile
 - lib/shoryuken.rb
 - lib/shoryuken/body_parser.rb
 - lib/shoryuken/client.rb
-- lib/shoryuken/core_ext.rb
 - lib/shoryuken/default_exception_handler.rb
 - lib/shoryuken/default_worker_registry.rb
 - lib/shoryuken/environment_loader.rb
@@ -155,18 +165,30 @@ files:
 - lib/shoryuken/extensions/active_job_concurrent_send_adapter.rb
 - lib/shoryuken/extensions/active_job_extensions.rb
 - lib/shoryuken/fetcher.rb
+- lib/shoryuken/helpers/atomic_boolean.rb
+- lib/shoryuken/helpers/atomic_counter.rb
+- lib/shoryuken/helpers/atomic_hash.rb
+- lib/shoryuken/helpers/hash_utils.rb
+- lib/shoryuken/helpers/string_utils.rb
+- lib/shoryuken/helpers/timer_task.rb
+- lib/shoryuken/inline_message.rb
 - lib/shoryuken/launcher.rb
 - lib/shoryuken/logging.rb
+- lib/shoryuken/logging/base.rb
+- lib/shoryuken/logging/pretty.rb
+- lib/shoryuken/logging/without_timestamp.rb
 - lib/shoryuken/manager.rb
 - lib/shoryuken/message.rb
 - lib/shoryuken/middleware/chain.rb
+- lib/shoryuken/middleware/entry.rb
 - lib/shoryuken/middleware/server/active_record.rb
 - lib/shoryuken/middleware/server/auto_delete.rb
 - lib/shoryuken/middleware/server/auto_extend_visibility.rb
 - lib/shoryuken/middleware/server/exponential_backoff_retry.rb
 - lib/shoryuken/middleware/server/timing.rb
 - lib/shoryuken/options.rb
-- lib/shoryuken/polling/base.rb
+- lib/shoryuken/polling/base_strategy.rb
+- lib/shoryuken/polling/queue_configuration.rb
 - lib/shoryuken/polling/strict_priority.rb
 - lib/shoryuken/polling/weighted_round_robin.rb
 - lib/shoryuken/processor.rb
@@ -180,21 +202,29 @@ files:
 - lib/shoryuken/worker_registry.rb
 - renovate.json
 - shoryuken.gemspec
-- shoryuken.jpg
+- spec/integration/active_job_continuation_spec.rb
 - spec/integration/launcher_spec.rb
 - spec/shared_examples_for_active_job.rb
 - spec/shoryuken.yml
 - spec/shoryuken/body_parser_spec.rb
 - spec/shoryuken/client_spec.rb
-- spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_exception_handler_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
 - spec/shoryuken/environment_loader_spec.rb
 - spec/shoryuken/extensions/active_job_adapter_spec.rb
 - spec/shoryuken/extensions/active_job_base_spec.rb
 - spec/shoryuken/extensions/active_job_concurrent_send_adapter_spec.rb
+- spec/shoryuken/extensions/active_job_continuation_spec.rb
 - spec/shoryuken/extensions/active_job_wrapper_spec.rb
 - spec/shoryuken/fetcher_spec.rb
+- spec/shoryuken/helpers/atomic_boolean_spec.rb
+- spec/shoryuken/helpers/atomic_counter_spec.rb
+- spec/shoryuken/helpers/atomic_hash_spec.rb
+- spec/shoryuken/helpers/hash_utils_spec.rb
+- spec/shoryuken/helpers/string_utils_spec.rb
+- spec/shoryuken/helpers/timer_task_spec.rb
+- spec/shoryuken/helpers_integration_spec.rb
+- spec/shoryuken/inline_message_spec.rb
 - spec/shoryuken/launcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -203,6 +233,8 @@ files:
 - spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/options_spec.rb
+- spec/shoryuken/polling/base_strategy_spec.rb
+- spec/shoryuken/polling/queue_configuration_spec.rb
 - spec/shoryuken/polling/strict_priority_spec.rb
 - spec/shoryuken/polling/weighted_round_robin_spec.rb
 - spec/shoryuken/processor_spec.rb
@@ -227,31 +259,40 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
+- spec/integration/active_job_continuation_spec.rb
 - spec/integration/launcher_spec.rb
 - spec/shared_examples_for_active_job.rb
 - spec/shoryuken.yml
 - spec/shoryuken/body_parser_spec.rb
 - spec/shoryuken/client_spec.rb
-- spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_exception_handler_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
 - spec/shoryuken/environment_loader_spec.rb
 - spec/shoryuken/extensions/active_job_adapter_spec.rb
 - spec/shoryuken/extensions/active_job_base_spec.rb
 - spec/shoryuken/extensions/active_job_concurrent_send_adapter_spec.rb
+- spec/shoryuken/extensions/active_job_continuation_spec.rb
 - spec/shoryuken/extensions/active_job_wrapper_spec.rb
 - spec/shoryuken/fetcher_spec.rb
+- spec/shoryuken/helpers/atomic_boolean_spec.rb
+- spec/shoryuken/helpers/atomic_counter_spec.rb
+- spec/shoryuken/helpers/atomic_hash_spec.rb
+- spec/shoryuken/helpers/hash_utils_spec.rb
+- spec/shoryuken/helpers/string_utils_spec.rb
+- spec/shoryuken/helpers/timer_task_spec.rb
+- spec/shoryuken/helpers_integration_spec.rb
+- spec/shoryuken/inline_message_spec.rb
 - spec/shoryuken/launcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -260,6 +301,8 @@ test_files:
 - spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
 - spec/shoryuken/options_spec.rb
+- spec/shoryuken/polling/base_strategy_spec.rb
+- spec/shoryuken/polling/queue_configuration_spec.rb
 - spec/shoryuken/polling/strict_priority_spec.rb
 - spec/shoryuken/polling/weighted_round_robin_spec.rb
 - spec/shoryuken/processor_spec.rb

data/.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: phstc
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/gemfiles/rails_6_1.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-group :test do
-  gem "activejob", "~> 6.1"
-  gem "httparty"
-  gem "multi_xml"
-  gem "simplecov"
-end
-
-group :development do
-  gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
-  gem "pry-byebug", "3.9.0"
-  gem "rubocop"
-end
-
-gemspec path: "../"