boss_queue 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/boss_queue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "boss_queue"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Nelson"]
-  s.date = "2013-10-09"
+  s.date = "2013-10-15"
   s.description = "A fault tolerant job queue built around Amazon SQS & DynamoDB"
   s.email = "daniel@populr.me"
   s.extra_rdoc_files = [

data/lib/boss_queue/job.rb

@@ -6,6 +6,8 @@ class BossQueue
     attr_accessor :queue_name
 
     boolean_attr :failed
+    boolean_attr :target_missing
+    boolean_attr :delete_if_target_missing
 
     string_attr :model_class_name
     string_attr :model_id
@@ -73,15 +75,27 @@ class BossQueue
       self.exception_message = err.message
       self.stacktrace = err.backtrace[0, 7].join("\n")
 
-      if failure_action == 'retry' && retry_delay
+      failed_target = target rescue nil
+
+      if failed_target.nil?
+        if delete_if_target_missing?
+          destroy
+        else
+          self.failed = true
+          self.target_missing = true
+          self.save!
+        end
+
+      elsif failure_action == 'retry' && retry_delay
         enqueue_with_delay(retry_delay)
         self.save!
 
       elsif failure_action == 'callback' &&
             failure_callback
 
-        callback_called = target.send(failure_callback, err, *arguments) rescue nil
-        if callback_called
+
+        delete_me = failed_target.send(failure_callback, err, *arguments)
+        if delete_me
           destroy
         else
           self.failed = true
@@ -110,6 +124,10 @@ class BossQueue
     end
 
     def target
+      @target ||= _target
+    end
+
+    def _target
       klass = constantize(model_class_name)
       if model_id
         klass.find(model_id)

data/spec/job_spec.rb

@@ -11,17 +11,48 @@ describe "BossQueue::Job" do
   end
 
 
-  it "should respond to failed" do
-    BossQueue::Job.new.should respond_to(:failed)
+
+  it "should respond to target_missing?" do
+    BossQueue::Job.new.should respond_to(:target_missing?)
+  end
+
+  it "should respond to target_missing=" do
+    BossQueue::Job.new.should respond_to(:target_missing=)
+  end
+
+  describe "#target_missing?" do
+    it "should default to false" do
+      BossQueue::Job.new.target_missing?.should be_false
+    end
+  end
+
+
+  it "should respond to delete_if_target_missing?" do
+    BossQueue::Job.new.should respond_to(:delete_if_target_missing?)
+  end
+
+  it "should respond to delete_if_target_missing=" do
+    BossQueue::Job.new.should respond_to(:delete_if_target_missing=)
+  end
+
+  describe "#delete_if_target_missing?" do
+    it "should default to false" do
+      BossQueue::Job.new.delete_if_target_missing?.should be_false
+    end
+  end
+
+
+  it "should respond to failed?" do
+    BossQueue::Job.new.should respond_to(:failed?)
   end
 
   it "should respond to failed=" do
     BossQueue::Job.new.should respond_to(:failed=)
   end
 
-  describe "#failed" do
+  describe "#failed?" do
     it "should default to false" do
-      BossQueue::Job.new.failed.should be_false
+      BossQueue::Job.new.failed?.should be_false
     end
   end
 
@@ -284,10 +315,24 @@ describe "BossQueue::Job" do
 
   describe "#fail" do
     before(:each) do
+      @instance_to_work_on = double('instance_to_work_on')
+      @instance_to_work_on.stub(:test_instance_method)
+      @instance_to_work_on.stub(:failure).and_return(false)
+      TestClass.stub(:find).and_return(@instance_to_work_on)
+
       @job = BossQueue::Job.new
       @job.stub(:retry_delay).and_return(nil)
       @job.stub(:save!)
       @job.stub(:enqueue_with_delay)
+
+      @job.stub(:destroy)
+      @job.model_class_name = 'TestClass'
+      @job.model_id = 'xyz'
+      @job.callback = 'test_instance_method'
+      @arguments = ['a', 'b', { 'c' => 2, 'd' => 1 }]
+      @argument_json = JSON.generate(@arguments)
+      @job.args = @argument_json
+
       @err
       begin
         raise StandardError.new('hello world')
@@ -316,22 +361,50 @@ describe "BossQueue::Job" do
       @job.fail(@err)
     end
 
-    context "when failure_action is 'callback'" do
+
+
+
+
+    context "when delete_if_target_missing is true and the target cannot be found" do
+      it "should destroy the record" do
+        @job.failure_action = 'callback'
+        @job.failure_callback = 'failure'
+        @job.delete_if_target_missing = true
+        TestClass.stub(:find).and_raise('not found')
+
+        @job.should_receive(:destroy)
+        @job.fail(@err)
+      end
+    end
+
+
+
+
+    context "when delete_if_target_missing is false and the target cannot be found" do
       before(:each) do
         @job.failure_action = 'callback'
         @job.failure_callback = 'failure'
+        TestClass.stub(:find).and_raise('not found')
+      end
 
-        @job.stub(:destroy)
-        @job.model_class_name = 'TestClass'
-        @job.model_id = 'xyz'
-        @job.callback = 'test_instance_method'
-        @arguments = ['a', 'b', { 'c' => 2, 'd' => 1 }]
-        @argument_json = JSON.generate(@arguments)
-        @job.args = @argument_json
-        @instance_to_work_on = double('instance_to_work_on')
-        @instance_to_work_on.stub(:test_instance_method)
-        @instance_to_work_on.stub(:failure).and_return(false)
-        TestClass.stub(:find).and_return(@instance_to_work_on)
+      it "should set target_missing on the job" do
+        @job.fail(@err)
+        @job.target_missing.should be_true
+      end
+
+      it "should not destroy the record" do
+        @job.should_not_receive(:destroy)
+        @job.fail(@err)
+      end
+    end
+
+
+
+
+    context "when failure_action is 'callback'" do
+      before(:each) do
+        @job.failure_action = 'callback'
+        @job.failure_callback = 'failure'
       end
 
       it "should call the failure_callback method with the exception and the callback arguments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boss_queue
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3950769751484491906
+      hash: -3544343806450601850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: