activejob-retry 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5bb27165e98b31cb047ca32c39686a3c65d999
-  data.tar.gz: 15d359bf6d2352c1b63f7f0729ce38ba12928a73
+  metadata.gz: bb158e4b3bbb44f1212648e777ca1701f5dab910
+  data.tar.gz: a93e0a2c4949b1a3e87024ada9508e0347f3ec84
 SHA512:
-  metadata.gz: b95cb88b0dd261c6712fdd4063e94b0ada6b7854de361df98a424cee25f64fa01b967643a18665bf5120b2e5335339f1409d094b3e39f525538ec0f01bf6f1a3
-  data.tar.gz: 9c8c5fe96d0d16926db4d13c05a78db0977b2d045a26b3fdea62f8f79194cc4f293221c96d84e8b97bacab0d18260b1d74938ac2a2f33c865409a3a97eb4f0bc
+  metadata.gz: 5f08d5d8a6466b54a798e988c50a8e27d6ab1c9273e5910e0c11b15a38facae0b7f75c3a5d5970b51178661f0a5e13ec624b36ffee97d1c64eae93c4946132f5
+  data.tar.gz: feef5212819586918cb91968980974c84a5e142ba94ace753d8cac05eb04e98fc3ebed1679c6582283791d8fe05ec44cea85d134e65ed75a42eb7f2a8c328e03

data/.gitignore

@@ -3,3 +3,5 @@
 .rbx/
 *.gem
 .ruby-version
+Gemfile.lock
+Gemfile.*.lock

data/.travis.yml

@@ -4,16 +4,22 @@ cache: bundler
 language: ruby
 
 matrix:
-  allow_failures:
-    - rvm: jruby
-    - rvm: rbx-2
+  exclude:
+    # Rails 5.0 dropped support for Ruby <2.2
+    - rvm: 2.0
+      gemfile: Gemfile.activejob50
+    - rvm: 2.1
+      gemfile: Gemfile.activejob50
 
 rvm:
+  - 2.0
   - 2.1
-  - 2.2
+  - 2.2.2
   - 2.3.1
-  - jruby
-  - rbx-2
+
+gemfile:
+  - Gemfile.activejob42
+  - Gemfile.activejob50
 
 script:
   - bundle exec rubocop

data/{Gemfile → Gemfile.activejob42}

@@ -16,5 +16,5 @@ group :test, :integration do
   # Specs
   gem 'sqlite3'
   gem 'pg'
-  gem 'rails'
+  gem 'rails', '~> 4.2'
 end

data/Gemfile.activejob50

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :test, :integration do
+  # Queues
+  gem 'resque', require: false
+  gem 'resque-scheduler', require: false
+  gem 'sidekiq', require: false
+  gem 'delayed_job', require: false
+  gem 'delayed_job_active_record', require: false
+  gem 'que', require: false
+  gem 'backburner', require: false
+  gem 'sequel', require: false
+
+  # Specs
+  gem 'sqlite3'
+  gem 'pg'
+  gem 'rails', '~> 5.0'
+
+  gem 'pry'
+end

data/README.md

@@ -118,6 +118,13 @@ just executing the logic in the `rescue_from`, which makes manual re-enqueueing
 easier. On the other hand it does disable Sidekiq's automatic retrying for all
 ActiveJob jobs.
 
+Supported Versions
+------------------
+
+Rails 4.2 and 5.0 are supported, on all versions of MRI which they support, except
+Ruby 1.9.3. Other Ruby runtimes (e.g. JRuby, Rubinius) probably work, but are not
+tested in Travis CI.
+
 Contributing
 ------------
 

data/lib/active_job/retry.rb

@@ -45,7 +45,9 @@ module ActiveJob
 
     def included(base)
       klass = self
-      base.define_singleton_method(:inherited) { |subclass| subclass.include(klass) }
+      base.define_singleton_method(:inherited) do |subclass|
+        subclass.send(:include, klass)
+      end
       define_backoff_strategy(base)
       define_retry_attempt_tracking(base)
       define_retry_method(base)
@@ -102,10 +104,16 @@ module ActiveJob
     end
 
     def check_adapter!
-      if PROBLEMATIC_ADAPTERS.include?(ActiveJob::Base.queue_adapter.name)
-        warn("#{ActiveJob::Base.queue_adapter.name} does not support delayed retries, " \
-             'so does not work with ActiveJob::Retry. You may experience strange ' \
-             'behaviour.')
+      adapter = ActiveJob::Base.queue_adapter
+      adapter_name =
+        case adapter
+        when Class then adapter.name
+        else adapter.class.name
+        end
+
+      if PROBLEMATIC_ADAPTERS.include?(adapter_name)
+        warn("#{adapter_name} does not support delayed retries, so does not work with " \
+             'ActiveJob::Retry. You may experience strange behaviour.')
       end
     end
 

data/lib/active_job/retry/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   class Retry < Module
-    VERSION = '0.6.1'.freeze
+    VERSION = '0.6.2'.freeze
   end
 end

data/spec/retry_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe ActiveJob::Retry do
       def perform(*_args)
         raise RuntimeError
       end
-    end.include(retry_instance)
+    end.send(:include, retry_instance)
   end
 
   describe 'constant strategy' do
@@ -63,7 +63,7 @@ RSpec.describe ActiveJob::Retry do
       end
 
       it 'allows overriding' do
-        subclass.include(described_class.new(strategy: :constant))
+        subclass.send(:include, described_class.new(strategy: :constant))
         expect(subclass.backoff_strategy).
           to be_a(ActiveJob::Retry::ConstantBackoffStrategy)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-retry
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Isaac Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -115,8 +115,8 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
+- Gemfile.activejob42
+- Gemfile.activejob50
 - LICENSE
 - README.md
 - Rakefile
@@ -150,7 +150,6 @@ files:
 - test/adapters/sidekiq.rb
 - test/adapters/sneakers.rb
 - test/adapters/sucker_punch.rb
-- test/cases/adapter_test.rb
 - test/cases/callbacks_test.rb
 - test/cases/job_serialization_test.rb
 - test/cases/logging_test.rb
@@ -158,7 +157,6 @@ files:
 - test/cases/queuing_test.rb
 - test/cases/rescue_test.rb
 - test/cases/test_case_test.rb
-- test/cases/test_helper_test.rb
 - test/helper.rb
 - test/integration/queuing_test.rb
 - test/jobs/callback_job.rb

data/Gemfile.lock

@@ -1,202 +0,0 @@
-PATH
-  remote: .
-  specs:
-    activejob-retry (0.6.1)
-      activejob (>= 4.2)
-      activesupport (>= 4.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
-      globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    ast (2.2.0)
-    backburner (1.3.0)
-      beaneater (~> 1.0)
-      dante (> 0.1.5)
-    beaneater (1.0.0)
-    builder (3.2.2)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
-    dante (0.2.0)
-    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.1)
-    delayed_job_active_record (4.1.1)
-      activerecord (>= 3.0, < 5.1)
-      delayed_job (>= 3.0, < 5)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.0)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.9.0)
-    mono_logger (1.1.0)
-    multi_json (1.12.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    parser (2.3.1.0)
-      ast (~> 2.2)
-    pg (0.18.4)
-    powerpack (0.1.1)
-    que (0.11.5)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (11.1.2)
-    redis (3.3.0)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.26.0)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-scheduler (4.2.0)
-      mono_logger (~> 1.0)
-      redis (~> 3.0)
-      resque (~> 1.25)
-      rufus-scheduler (~> 3.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    rufus-scheduler (3.2.1)
-    sequel (4.34.0)
-    sidekiq (4.1.2)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      redis (~> 3.2, >= 3.2.1)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sprockets (3.6.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.0.4)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.0.5)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activejob-retry!
-  backburner
-  delayed_job
-  delayed_job_active_record
-  pg
-  que
-  rails
-  rake (>= 10.3)
-  resque
-  resque-scheduler
-  rspec
-  rspec-its
-  rubocop
-  sequel
-  sidekiq
-  sqlite3
-
-BUNDLED WITH
-   1.12.5

data/test/cases/adapter_test.rb

@@ -1,8 +0,0 @@
-require 'helper'
-
-class AdapterTest < ActiveSupport::TestCase
-  test "should load #{ENV['AJADAPTER']} adapter" do
-    ActiveJob::Base.queue_adapter = ENV['AJADAPTER'].to_sym
-    assert_equal "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify.constantize, ActiveJob::Base.queue_adapter
-  end
-end

data/test/cases/test_helper_test.rb

@@ -1,226 +0,0 @@
-require 'helper'
-require 'active_support/core_ext/time'
-require 'active_support/core_ext/date'
-require 'jobs/hello_job'
-require 'jobs/logging_job'
-require 'jobs/nested_job'
-
-class EnqueuedJobsTest < ActiveJob::TestCase
-  def test_assert_enqueued_jobs
-    assert_nothing_raised do
-      assert_enqueued_jobs 1 do
-        HelloJob.perform_later('david')
-      end
-    end
-  end
-
-  def test_repeated_enqueued_jobs_calls
-    assert_nothing_raised do
-      assert_enqueued_jobs 1 do
-        HelloJob.perform_later('abdelkader')
-      end
-    end
-
-    assert_nothing_raised do
-      assert_enqueued_jobs 2 do
-        HelloJob.perform_later('sean')
-        HelloJob.perform_later('yves')
-      end
-    end
-  end
-
-  def test_assert_enqueued_jobs_with_no_block
-    assert_nothing_raised do
-      HelloJob.perform_later('rafael')
-      assert_enqueued_jobs 1
-    end
-
-    assert_nothing_raised do
-      HelloJob.perform_later('aaron')
-      HelloJob.perform_later('matthew')
-      assert_enqueued_jobs 3
-    end
-  end
-
-  def test_assert_no_enqueued_jobs_with_no_block
-    assert_nothing_raised do
-      assert_no_enqueued_jobs
-    end
-  end
-
-  def test_assert_no_enqueued_jobs
-    assert_nothing_raised do
-      assert_no_enqueued_jobs do
-        HelloJob.perform_now
-      end
-    end
-  end
-
-  def test_assert_enqueued_jobs_too_few_sent
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_enqueued_jobs 2 do
-        HelloJob.perform_later('xavier')
-      end
-    end
-
-    assert_match(/2 .* but 1/, error.message)
-  end
-
-  def test_assert_enqueued_jobs_too_many_sent
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_enqueued_jobs 1 do
-        HelloJob.perform_later('cristian')
-        HelloJob.perform_later('guillermo')
-      end
-    end
-
-    assert_match(/1 .* but 2/, error.message)
-  end
-
-  def test_assert_no_enqueued_jobs_failure
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_no_enqueued_jobs do
-        HelloJob.perform_later('jeremy')
-      end
-    end
-
-    assert_match(/0 .* but 1/, error.message)
-  end
-
-  def test_assert_enqueued_job
-    assert_enqueued_with(job: LoggingJob, queue: 'default') do
-      LoggingJob.set(wait_until: Date.tomorrow.noon).perform_later
-    end
-  end
-
-  def test_assert_enqueued_job_failure
-    assert_raise ActiveSupport::TestCase::Assertion do
-      assert_enqueued_with(job: LoggingJob, queue: 'default') do
-        NestedJob.perform_later
-      end
-    end
-
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_enqueued_with(job: NestedJob, queue: 'low') do
-        NestedJob.perform_later
-      end
-    end
-
-    assert_equal 'No enqueued job found with {:job=>NestedJob, :queue=>"low"}', error.message
-  end
-
-  def test_assert_enqueued_job_args
-    assert_raise ArgumentError do
-      assert_enqueued_with(class: LoggingJob) do
-        NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
-      end
-    end
-  end
-end
-
-class PerformedJobsTest < ActiveJob::TestCase
-  def test_assert_performed_jobs
-    assert_nothing_raised do
-      assert_performed_jobs 1 do
-        HelloJob.perform_later('david')
-      end
-    end
-  end
-
-  def test_repeated_performed_jobs_calls
-    assert_nothing_raised do
-      assert_performed_jobs 1 do
-        HelloJob.perform_later('abdelkader')
-      end
-    end
-
-    assert_nothing_raised do
-      assert_performed_jobs 2 do
-        HelloJob.perform_later('sean')
-        HelloJob.perform_later('yves')
-      end
-    end
-  end
-
-  def test_assert_performed_jobs_with_no_block
-    assert_nothing_raised do
-      perform_enqueued_jobs do
-        HelloJob.perform_later('rafael')
-      end
-      assert_performed_jobs 1
-    end
-
-    assert_nothing_raised do
-      perform_enqueued_jobs do
-        HelloJob.perform_later('aaron')
-        HelloJob.perform_later('matthew')
-        assert_performed_jobs 3
-      end
-    end
-  end
-
-  def test_assert_no_performed_jobs_with_no_block
-    assert_nothing_raised do
-      assert_no_performed_jobs
-    end
-  end
-
-  def test_assert_no_performed_jobs
-    assert_nothing_raised do
-      assert_no_performed_jobs do
-        # empty block won't perform jobs
-      end
-    end
-  end
-
-  def test_assert_performed_jobs_too_few_sent
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_jobs 2 do
-        HelloJob.perform_later('xavier')
-      end
-    end
-
-    assert_match(/2 .* but 1/, error.message)
-  end
-
-  def test_assert_performed_jobs_too_many_sent
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_jobs 1 do
-        HelloJob.perform_later('cristian')
-        HelloJob.perform_later('guillermo')
-      end
-    end
-
-    assert_match(/1 .* but 2/, error.message)
-  end
-
-  def test_assert_no_performed_jobs_failure
-    error = assert_raise ActiveSupport::TestCase::Assertion do
-      assert_no_performed_jobs do
-        HelloJob.perform_later('jeremy')
-      end
-    end
-
-    assert_match(/0 .* but 1/, error.message)
-  end
-
-  def test_assert_performed_job
-    assert_performed_with(job: NestedJob, queue: 'default') do
-      NestedJob.perform_later
-    end
-  end
-
-  def test_assert_performed_job_failure
-    assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_with(job: LoggingJob, at: Date.tomorrow.noon, queue: 'default') do
-        NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
-      end
-    end
-
-    assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_with(job: NestedJob, at: Date.tomorrow.noon, queue: 'low') do
-        NestedJob.set(queue: 'low', wait_until: Date.tomorrow.noon).perform_later
-      end
-    end
-  end
-end