resque-pertry 1.0.0 → 1.0.1

data/lib/resque/pertry/persistence.rb

@@ -62,6 +62,10 @@ module Resque
         Time.parse(@_job_properties['queue_time'])
       end
 
+      def model
+        @model ||= ResquePertryPersistence.find_by_audit_id(audit_id)
+      end
+
     end
   end
 end

data/lib/resque/pertry/resque_pertry_persistence.rb

@@ -38,6 +38,7 @@ module Resque
         def finnish_job(klass, args)
           with_job(klass, args) do |job|
             return unless job
+            return if job.finnished?
             job.update_attribute(:completed_at, Time.now)
           end
         end
@@ -45,6 +46,7 @@ module Resque
         def trying_job(klass, args)
           with_job(klass, args) do |job|
             return unless job
+            return if job.finnished?
             job.update_attributes(  :last_tried_at => Time.now,
                                     :attempt => job.attempt + 1)
           end
@@ -53,6 +55,7 @@ module Resque
         def fail_job(klass, args)
           with_job(klass, args) do |job|
             return unless job
+            return if job.finnished?
             job.update_attribute(:failed_at, Time.now)
           end
         end
@@ -74,9 +77,21 @@ module Resque
 
       end
 
-      def has_completed?
+      def completed?
         completed_at
       end
+      
+      def expired?
+        expires_at < Time.now
+      end
+
+      def failed?
+        failed_at
+      end
+
+      def finnished?
+        completed? || failed? || expired?
+      end
 
       def payload
         @payload ||= Resque.decode(arguments)

data/lib/resque/pertry/retry.rb

@@ -102,7 +102,7 @@ module Resque
       def retry?(model, exception)
         # check the obvious
         return false unless model
-        return false if model.has_completed?
+        return false if model.finnished?
 
         # job has used up all it's allowed attempts
         return false if max_attempt_reached?(model)
@@ -110,9 +110,6 @@ module Resque
         # job exception is not whitelisted for retries
         return false unless exception_whitelisted?(model, exception)
 
-        # job has expired
-        return false if ttl_expired?(model)
-
         # seems like we should be able to retry this job
         return true
       end
@@ -138,7 +135,7 @@ module Resque
         # if we didn't set a ttl, it hasn't expired
         return false unless self.class.retry_ttl
 
-        model.expires_at < Time.now
+        model.expired?
       end
 
       def max_attempt_reached?(model)

data/lib/resque/plugins/pertry.rb

@@ -6,6 +6,8 @@ module Resque
       include Resque::Pertry::Persistence
       include Resque::Pertry::Retry
 
+      attr_reader :exception_handled
+
       class << self
 
         # Enqueue a job
@@ -23,7 +25,13 @@ module Resque
         def perform(args = {})
           raise ArgumentError, "Invalid arguments, expecting a Hash but got: #{args.inspect}" unless Hash === args
 
-          instance(args).perform
+          begin
+            job = instance(args)
+            job.perform
+          rescue => e
+            job.handle_exception(e)
+            raise unless job.exception_handled
+          end
         end
 
         def instance(args = {})
@@ -88,6 +96,31 @@ module Resque
         raise NoMethodError, "No method #{self.class.name}#perform defined!"
       end
 
+      def handle_exception(exception)
+        # we don't handle exceptions by default, leave it for resque
+        # when overridding this method, if you decide you want to completely
+        # handle it, and not pass it back to resque, you'll need to call
+        # exception_handled!
+      end
+
+      def exception_handled
+        @exception_handled ||= false
+      end
+
+      def exception_handled!
+        @exception_handled = true
+      end
+
+      # mark job as failed, won't be retried
+      def fail!
+        Resque::Pertry::ResquePertryPersistence.fail_job(self.class, payload)
+      end
+
+      # mark job as complete
+      def complete!
+        Resque::Pertry::ResquePertryPersistence.finnish_job(self.class, payload)
+      end
+
       def arguments
         @_arguments
       end

data/resque-pertry.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "resque-pertry"
   s.description = "Adds persistence to Resque jobs, and retry properties"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.authors     = [ "Anthony Powles" ]
   s.email       = "rubygems+resque-pertry@idreamz.net"
   s.summary     = "Allows job to be persistent, and be retried in case of failure"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-pertry
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler