simple_job 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Simple Job
 
+== Version 0.3.0
+* Allowing JobDefinition#execute method to take a message parameter
+* Adding max_attempt_count declaration to JobDefinition
+
 == Version 0.2.1
 * Disabling type/version checking to support multiple type declarations in one job
 

data/lib/simple_job/job_definition.rb

@@ -150,6 +150,11 @@ module JobDefinition
       ::SimpleJob::JobDefinition.job_definitions << new_definition
     end
 
+    def max_attempt_count(attempts = nil)
+      @max_attempt_count = attempts if attempts 
+      @max_attempt_count
+    end
+
     def job_queue(queue_type = nil)
       @job_queue = JobQueue[queue_type] if queue_type
       @job_queue

data/lib/simple_job/sqs_job_queue.rb

@@ -66,6 +66,9 @@ class SQSJobQueue < JobQueue
   # two arguments, the matching job definition (already populated with the
   # contents of the message) and the raw AWS message.
   #
+  # The #execute method MAY have a parameter, which will be populated with
+  # the raw AWS::SQS::ReceivedMessage object if it exists.
+  #
   # The queue's configured visibility timeout will be used unless the
   # :visibility_timeout option is passed (as a number of seconds).
   #
@@ -84,6 +87,9 @@ class SQSJobQueue < JobQueue
   # will safely complete processing the current message and return if a HUP,
   # INT, or TERM signal is sent to the process.
   #
+  # You may also pass a :max_executions option (as an integer), in which case
+  # the poll method will poll that many times and then exit.
+  #
   # Note that this method will override any signal handlers for the HUP, INT,
   # or TERM signals during its execution, but the previous handlers will be
   # restored once the method returns.
@@ -98,7 +104,12 @@ class SQSJobQueue < JobQueue
     }.merge(options)
 
     message_handler = block || lambda do |definition, message|
-      definition.execute
+      execute_method = definition.method(:execute)
+      arguments = []
+      if execute_method.arity >= 1
+        arguments << message
+      end
+      execute_method.call(*arguments)
     end
 
     exit_next = false
@@ -127,7 +138,13 @@ class SQSJobQueue < JobQueue
           raw_message = JSON.parse(message.body)
           current_job_type = raw_message['type']
           definition_class = JobDefinition.job_definition_class_for(raw_message['type'], raw_message['version'])
+
           raise('no definition found') if !definition_class
+
+          if definition_class.max_attempt_count && (message.receive_count > definition_class.max_attempt_count)
+            raise('max attempt count reached') 
+          end
+
           definition = definition_class.new.from_json(message.body)
           message_handler.call(definition, message)
         end

data/lib/simple_job/version.rb

@@ -1,3 +1,3 @@
 module SimpleJob
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_job
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Dawson