shoryuken 5.0.4 → 5.2.3

data/spec/shoryuken/polling/strict_priority_spec.rb

@@ -145,4 +145,14 @@ RSpec.describe Shoryuken::Polling::StrictPriority do
       expect(subject.next_queue).to eq(queue3)
     end
   end
+
+  describe '#message_processed' do
+    it 'removes paused queue, adds to active queues' do
+      strategy = Shoryuken::Polling::StrictPriority.new([queue1, queue2])
+      strategy.send(:pause, queue1)
+      expect(strategy.active_queues).to eq([[queue2, 1]])
+      strategy.message_processed(queue1)
+      expect(strategy.active_queues).to eq([[queue1, 2], [queue2, 1]])
+    end
+  end
 end

data/spec/shoryuken/polling/weighted_round_robin_spec.rb

@@ -104,4 +104,14 @@ RSpec.describe Shoryuken::Polling::WeightedRoundRobin do
       expect(subject.delay).to eq(1.0)
     end
   end
+
+  describe '#message_processed' do
+    it 'removes paused queue, adds to active queues' do
+      strategy = Shoryuken::Polling::WeightedRoundRobin.new([queue1, queue2])
+      strategy.send(:pause, queue1)
+      expect(strategy.active_queues).to eq([[queue2, 1]])
+      strategy.message_processed(queue1)
+      expect(strategy.active_queues).to eq([[queue2, 1], [queue1, 1]])
+    end
+  end
 end

data/spec/shoryuken/queue_spec.rb

@@ -39,6 +39,29 @@ RSpec.describe Shoryuken::Queue do
       end
     end
 
+    context 'when queue ARN supplied' do
+      let(:queue_arn) { 'arn:aws:sqs:ap-southeast-2:000000000000:queue-name' }
+
+      it 'initializes by URL and validate the URL' do
+        subject = described_class.new(sqs, queue_arn)
+
+        expect(subject.name).to eq('queue-name')
+        expect(subject.url).to eq('https://sqs.ap-southeast-2.amazonaws.com/000000000000/queue-name')
+      end
+    end
+
+    context 'when invalid queue ARN supplied' do
+      let(:queue_arn) { 'arn:aws:sqs::000000000000:queue-name' }
+
+      it 'raises an error' do
+        expect do
+          described_class.new(sqs, queue_arn)
+        end.to raise_error(
+          'Invalid ARN: arn:aws:sqs::000000000000:queue-name. A valid ARN must include: region, account_id and resource.'
+        )
+      end
+    end
+
     context 'when queue name supplied' do
       subject { described_class.new(sqs, queue_name) }
 

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require 'bundler/setup'
 Bundler.setup
 
-require 'pry-byebug'
+begin
+  require 'pry-byebug'
+rescue LoadError
+end
+
 require 'shoryuken'
 require 'json'
 require 'dotenv'
@@ -28,13 +32,6 @@ class TestWorker
 end
 
 RSpec.configure do |config|
-  # Only run slow tests if SPEC_ALL=true and AWS_ACCESS_KEY_ID is present
-  # The AWS_ACCESS_KEY_ID checker is because Travis CI
-  # does not expose ENV variables to pull requests from forked repositories
-  # http://docs.travis-ci.com/user/pull-requests/
-  # config.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?
-  config.filter_run_excluding slow: true
-
   config.before do
     Shoryuken::Client.class_variable_set :@@queues, {}
 
@@ -63,7 +60,6 @@ RSpec.configure do |config|
 
     Shoryuken.cache_visibility_timeout = false
 
-    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: 5.0.4
+  version: 5.2.3
 platform: ruby
 authors:
 - Pablo Cantero
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,13 +104,14 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".github/FUNDING.yml"
+- ".github/workflows/specs.yml"
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.aws-sdk-core-v2
 - LICENSE
 - README.md
 - Rakefile
@@ -133,6 +120,12 @@ files:
 - bin/shoryuken
 - examples/bootstrap_queues.rb
 - examples/default_worker.rb
+- gemfiles/.gitignore
+- gemfiles/aws_sdk_core_2.gemfile
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/shoryuken.rb
 - lib/shoryuken/body_parser.rb
 - lib/shoryuken/client.rb
@@ -141,6 +134,7 @@ files:
 - lib/shoryuken/environment_loader.rb
 - lib/shoryuken/extensions/active_job_adapter.rb
 - lib/shoryuken/extensions/active_job_concurrent_send_adapter.rb
+- lib/shoryuken/extensions/active_job_extensions.rb
 - lib/shoryuken/fetcher.rb
 - lib/shoryuken/launcher.rb
 - lib/shoryuken/logging.rb
@@ -176,7 +170,9 @@ files:
 - 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_wrapper_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -202,7 +198,7 @@ homepage: https://github.com/phstc/shoryuken
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
@@ -231,7 +227,9 @@ test_files:
 - 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_wrapper_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb

data/.travis.yml

@@ -1,34 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.8
-  - 2.4.4
-  - 2.5.1
-  - 2.6.3
-
-notifications:
-  email:
-    on_success: change
-    on_failure: always
-
-gemfile:
-  - Gemfile
-  - Gemfile.aws-sdk-core-v2
-
-env:
-  - SPEC_ALL=true
-
-script: bundle exec rspec spec
-
-before_install:
-  - gem install bundler -v '< 2'
-
-after_success:
-  - bundle exec codeclimate-test-reporter
-
-addons:
-  code_climate:
-    repo_token: 7709fd21981bb9d2658647a66d959415a1029a83f1c199573828797944f26c52

data/Gemfile.aws-sdk-core-v2

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in shoryuken.gemspec
-gemspec
-
-group :test do
-  gem 'activejob', '~> 4'
-  gem 'aws-sdk-core', '~> 2'
-  gem 'codeclimate-test-reporter', require: nil
-  gem 'httparty'
-  gem 'multi_xml'
-  gem 'simplecov'
-end