chore-core 1.5.10 → 1.7.2

data/spec/chore/strategies/worker/single_worker_strategy_spec.rb

@@ -1,33 +1,31 @@
 require 'spec_helper'
 
 describe Chore::Strategy::SingleWorkerStrategy do
-  let(:manager) { mock('Manager') }
+  let(:manager) { double('Manager') }
   subject       { described_class.new(manager) }
 
   describe '#stop!' do
     before(:each) do
-      subject.stub(:worker).and_return worker
+      expect(subject).to receive(:worker).and_return worker
     end
 
     context 'given there is no current worker' do
       let(:worker)  { nil }
 
       it 'does nothing' do
-        allow_message_expectations_on_nil
-        
-        worker.should_not_receive(:stop!)
+        expect(worker).to_not receive(:stop!)
         subject.stop!
       end
     end
 
     context 'given there is a current worker' do
-      let(:worker)  { mock('Worker') }
+      let(:worker)  { double('Worker') }
       before(:each) do
-        subject.stub(:worker).and_return worker
+        expect(subject).to receive(:worker).and_return worker
       end
 
       it 'stops the worker' do
-        worker.should_receive(:stop!)
+        expect(worker).to receive(:stop!)
         subject.stop!
       end
     end

data/spec/chore/worker_spec.rb

@@ -4,7 +4,9 @@ describe Chore::Worker do
 
   class SimpleJob
     include Chore::Job
-    queue_options :name => 'test', :publisher => FakePublisher, :max_attempts => 100
+    queue_options :name => 'test',
+      :publisher => FakePublisher,
+      :max_attempts => 100
 
     def perform(*args)
       return args
@@ -140,4 +142,55 @@ describe Chore::Worker do
       end
     end
   end
+
+  describe 'delaying retries' do
+    let(:encoded_job) { Chore::Encoder::JsonEncoder.encode(job) }
+    let(:parsed_job) { JSON.parse(encoded_job) }
+    let(:work) { Chore::UnitOfWork.new(2, 'test', 60, encoded_job, 0, consumer) }
+
+    before(:each) do
+      SimpleJob.options[:backoff] = lambda { |work| work.current_attempt }
+
+      allow(SimpleJob).to receive(:perform).and_raise(RuntimeError)
+      SimpleJob.stub(:run_hooks_for).and_return(true)
+    end
+
+    context 'and the consumer can delay' do
+      before(:each) do
+        allow(consumer).to receive(:delay).and_return(0)
+      end
+
+      it 'will not complete the message' do
+        expect(consumer).not_to receive(:complete)
+        Chore::Worker.start(work)
+      end
+
+      it 'will delay the message' do
+        expect(consumer).to receive(:delay).with(work, SimpleJob.options[:backoff])
+        Chore::Worker.start(work)
+      end
+
+      it 'triggers the on_delay callback' do
+        expect(SimpleJob).to receive(:run_hooks_for).with(:on_delay, parsed_job)
+        Chore::Worker.start(work)
+      end
+    end
+
+    context 'and the consumer cannot delay' do
+      before(:each) do
+        allow(consumer).to receive(:delay).and_raise(NoMethodError)
+      end
+
+      it 'will not complete the item' do
+        expect(consumer).not_to receive(:complete)
+        Chore::Worker.start(work)
+      end
+
+      it 'triggers the failure callback' do
+        worker = Chore::Worker.new(work)
+        expect(worker).to receive(:handle_failure)
+        worker.start
+      end
+    end
+  end
 end

data/spec/chore_spec.rb

@@ -7,7 +7,7 @@ describe Chore do
   it 'should allow you to add a hook' do
     blk = proc { true }
     Chore.add_hook(:before_perform,&blk)
-    Chore.hooks_for(:before_perform).first.should == blk
+    expect(Chore.hooks_for(:before_perform).first).to be blk
   end
 
   it 'should call a hook if it exists' do
@@ -23,14 +23,14 @@ describe Chore do
 
   it 'should pass args to the block if present' do
     blk = proc {|*args| true }
-    blk.should_receive(:call).with('1','2',3)
+    expect(blk).to receive(:call).with('1','2',3)
     Chore.add_hook(:an_event,&blk)
     Chore.run_hooks_for(:an_event, '1','2',3)
   end
 
   it 'should support multiple hooks for an event' do
     blk = proc { true }
-    blk.should_receive(:call).twice
+    expect(blk).to receive(:call).twice
     Chore.add_hook(:before_perform,&blk)
     Chore.add_hook(:before_perform,&blk)
 
@@ -41,8 +41,8 @@ describe Chore do
     runner = proc { }
 
     blk = proc { true }
-    blk.should_receive(:call) do |&arg1|
-      arg1.should_not be_nil
+    expect(blk).to receive(:call) do |&arg1|
+      expect(arg1).to_not be nil
     end
     Chore.add_hook(:around_perform,&blk)
 
@@ -56,51 +56,51 @@ describe Chore do
 
     run = false
     Chore.run_hooks_for(:around_perform) { run = true }
-    run.should be_true
+    expect(run).to be true
   end
 
   it 'should call passed blocks even if there are no hooks' do
     run = false
     Chore.run_hooks_for(:around_perform) { run = true }
-    run.should be_true
+    expect(run).to be true
   end
 
   it 'should set configuration' do
     Chore.configure {|c| c.test_config_option = 'howdy' }
-    Chore.config.test_config_option.should == 'howdy'
+    expect(Chore.config.test_config_option).to eq 'howdy'
   end
 
   describe 'reopen_logs' do
     let(:open_files) do
       [
-        mock('file', :closed? => false, :reopen => nil, :sync= => nil, :path => '/a'),
-        mock('file2', :closed? => false, :reopen => nil, :sync= => nil, :path => '/b')
+        double('file', :closed? => false, :reopen => nil, :sync= => nil, :path => '/a'),
+        double('file2', :closed? => false, :reopen => nil, :sync= => nil, :path => '/b')
       ]
     end
     let(:closed_files) do
-      [mock('file3', :closed? => true)]
+      [double('file3', :closed? => true)]
     end
     let(:files) { open_files + closed_files }
 
     before(:each) do
-      ObjectSpace.stub(:each_object).and_yield(open_files[0]).and_yield(open_files[1])
+      allow(ObjectSpace).to receive(:each_object).and_yield(open_files[0]).and_yield(open_files[1])
     end
 
     it 'should look up all instances of files' do
-      ObjectSpace.should_receive(:each_object).with(File)
+      expect(ObjectSpace).to receive(:each_object).with(File)
       Chore.reopen_logs
     end
 
     it 'should reopen files that are not closed' do
       open_files.each do |file|
-        file.should_receive(:reopen).with(file.path, 'a+')
+        expect(file).to receive(:reopen).with(file.path, 'a+')
       end
       Chore.reopen_logs
     end
 
     it 'should sync files' do
       open_files.each do |file|
-        file.should_receive(:sync=).with(true)
+        expect(file).to receive(:sync=).with(true)
       end
       Chore.reopen_logs
     end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ class FakePublisher < Chore::Publisher
   end
 end
 
-TestMessage = Struct.new(:handle,:queue,:body,:receive_count) do
+TestMessage = Struct.new(:handle, :queue, :body, :receive_count) do
   def empty?
     false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chore-core
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.7.2
 platform: ruby
 authors:
 - Tapjoy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement