activejob-retry 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ed8260c84b5c95a405c8cadb2a2b0e93ba5070
-  data.tar.gz: 1b7d2e89e1843ee73c6461374397a5e0450637c5
+  metadata.gz: 5a5bb27165e98b31cb047ca32c39686a3c65d999
+  data.tar.gz: 15d359bf6d2352c1b63f7f0729ce38ba12928a73
 SHA512:
-  metadata.gz: 1c03c64268ed4f9a40a0d35b178e96550d24ad6b03b7cc65a1e43440845d6ff39f78fda571e5e06dcc6b83b6a736d97c9449768abca698d2bfd20830cd03d99a
-  data.tar.gz: 64233f0b5a15269e040f5f9b306ab58cb27f437dd93fe610dc68f880b28f1758e878674aaa547479b9faac12c74820bec73714891afd743f5690f1c6db78ce5f
+  metadata.gz: b95cb88b0dd261c6712fdd4063e94b0ada6b7854de361df98a424cee25f64fa01b967643a18665bf5120b2e5335339f1409d094b3e39f525538ec0f01bf6f1a3
+  data.tar.gz: 9c8c5fe96d0d16926db4d13c05a78db0977b2d045a26b3fdea62f8f79194cc4f293221c96d84e8b97bacab0d18260b1d74938ac2a2f33c865409a3a97eb4f0bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activejob-retry (0.6.0)
+    activejob-retry (0.6.1)
       activejob (>= 4.2)
       activesupport (>= 4.2)
 
@@ -199,4 +199,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.3
+   1.12.5

data/lib/active_job/retry.rb

@@ -44,6 +44,8 @@ module ActiveJob
     end
 
     def included(base)
+      klass = self
+      base.define_singleton_method(:inherited) { |subclass| subclass.include(klass) }
       define_backoff_strategy(base)
       define_retry_attempt_tracking(base)
       define_retry_method(base)

data/lib/active_job/retry/version.rb

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

data/spec/retry_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ActiveJob::Retry do
     end.include(retry_instance)
   end
 
-  describe '.constant_retry' do
+  describe 'constant strategy' do
     let(:strategy) { :constant }
     let(:options) { { limit: 10, delay: 5 } }
 
@@ -28,9 +28,17 @@ RSpec.describe ActiveJob::Retry do
           to raise_error(ActiveJob::Retry::InvalidConfigurationError)
       end
     end
+
+    context 'subclassing' do
+      let(:subclass) { Class.new(job) }
+      it 'has the ConstantBackoffStrategy' do
+        expect(subclass.backoff_strategy).
+          to be_a(ActiveJob::Retry::ConstantBackoffStrategy)
+      end
+    end
   end
 
-  describe '.variable_retry' do
+  describe 'variable strategy' do
     let(:strategy) { :variable }
     let(:options) { { delays: [0, 5, 10, 60, 200] } }
 
@@ -46,9 +54,23 @@ RSpec.describe ActiveJob::Retry do
           to raise_error(ActiveJob::Retry::InvalidConfigurationError)
       end
     end
+
+    context 'subclassing' do
+      let(:subclass) { Class.new(job) }
+      it 'has the VariableBackoffStrategy' do
+        expect(subclass.backoff_strategy).
+          to be_a(ActiveJob::Retry::VariableBackoffStrategy)
+      end
+
+      it 'allows overriding' do
+        subclass.include(described_class.new(strategy: :constant))
+        expect(subclass.backoff_strategy).
+          to be_a(ActiveJob::Retry::ConstantBackoffStrategy)
+      end
+    end
   end
 
-  describe '.exponential_retry' do
+  describe 'exponential strategy' do
     let(:strategy) { :exponential }
     let(:options) { { limit: 10 } }
 
@@ -73,6 +95,14 @@ RSpec.describe ActiveJob::Retry do
           to raise_error(ActiveJob::Retry::InvalidConfigurationError)
       end
     end
+
+    context 'subclassing' do
+      let(:subclass) { Class.new(job) }
+      it 'has the ExponentialBackoffStrategy' do
+        expect(subclass.backoff_strategy).
+          to be_a(ActiveJob::Retry::ExponentialBackoffStrategy)
+      end
+    end
   end
 
   describe 'custom strategy' do
@@ -96,6 +126,13 @@ RSpec.describe ActiveJob::Retry do
     it 'sets the backoff_strategy when it is valid' do
       expect(job.backoff_strategy).to eq(CustomBackoffStrategy)
     end
+
+    context 'subclassing' do
+      let(:subclass) { Class.new(job) }
+      it 'has the CustomBackoffStrategy' do
+        expect(subclass.backoff_strategy).to eq(strategy)
+      end
+    end
   end
 
   describe '#serialize' do
@@ -115,6 +152,26 @@ RSpec.describe ActiveJob::Retry do
       before { instance.instance_variable_set(:@retry_attempt, 7) }
       it { is_expected.to include('retry_attempt' => 7) }
     end
+
+    context 'when inherited' do
+      let(:subclass) { Class.new(job) }
+      let(:instance) { subclass.new }
+      subject { instance.serialize }
+
+      context 'first instantiated' do
+        it { is_expected.to include('retry_attempt' => 1) }
+      end
+
+      context '1st attempt' do
+        before { instance.instance_variable_set(:@retry_attempt, 1) }
+        it { is_expected.to include('retry_attempt' => 1) }
+      end
+
+      context '7th attempt' do
+        before { instance.instance_variable_set(:@retry_attempt, 7) }
+        it { is_expected.to include('retry_attempt' => 7) }
+      end
+    end
   end
 
   describe '#deserialize' do
@@ -151,6 +208,43 @@ RSpec.describe ActiveJob::Retry do
       its(:arguments) { is_expected.to eq(['arg1', { 'arg' => 2 }]) }
       its(:retry_attempt) { is_expected.to eq(7) }
     end
+
+    context 'when subclassing' do
+      let(:subclass) { Class.new(job) }
+      subject(:instance) { subclass.new }
+      before { instance.deserialize(job_data) }
+      before { instance.send(:deserialize_arguments_if_needed) }
+
+      context '1st attempt' do
+        let(:job_data) do
+          {
+            'job_class'     => 'SomeJob',
+            'job_id'        => 'uuid',
+            'arguments'     => ['arg1', { 'arg' => 2 }],
+            'retry_attempt' => 1
+          }
+        end
+
+        its(:job_id) { is_expected.to eq('uuid') }
+        its(:arguments) { is_expected.to eq(['arg1', { 'arg' => 2 }]) }
+        its(:retry_attempt) { is_expected.to eq(1) }
+      end
+
+      context '7th attempt' do
+        let(:job_data) do
+          {
+            'job_class'     => 'SomeJob',
+            'job_id'        => 'uuid',
+            'arguments'     => ['arg1', { 'arg' => 2 }],
+            'retry_attempt' => 7
+          }
+        end
+
+        its(:job_id) { is_expected.to eq('uuid') }
+        its(:arguments) { is_expected.to eq(['arg1', { 'arg' => 2 }]) }
+        its(:retry_attempt) { is_expected.to eq(7) }
+      end
+    end
   end
 
   describe '#rescue_with_handler' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-retry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Isaac Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob