1 files changed, 35 insertions, 12 deletions

diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb
index b6dd03a0bc..ddd7d1361c 100644
--- a/activejob/lib/active_job/core.rb
+++ b/activejob/lib/active_job/core.rb
@@ -13,17 +13,17 @@ module ActiveJob
       # Job Identifier
       attr_accessor :job_id
 
-      # Queue on which the job should be run on.
+      # Queue in which the job will reside.
       attr_writer :queue_name
     end
 
+    # These methods will be included into any Active Job object, adding
+    # helpers for de/serialization and creation of job instances.
     module ClassMethods
       # Creates a new job instance from a hash created with +serialize+
       def deserialize(job_data)
-        job                      = job_data['job_class'].constantize.new
-        job.job_id               = job_data['job_id']
-        job.queue_name           = job_data['queue_name']
-        job.serialized_arguments = job_data['arguments']
+        job = job_data['job_class'].constantize.new
+        job.deserialize(job_data)
         job
       end
 
@@ -40,16 +40,16 @@ module ActiveJob
       #
       #    VideoJob.set(queue: :some_queue).perform_later(Video.last)
       #    VideoJob.set(wait: 5.minutes).perform_later(Video.last)
-      #    VideoJob.set(wait_until: Time.tomorroe).perform_later(Video.last)
+      #    VideoJob.set(wait_until: Time.now.tomorrow).perform_later(Video.last)
       #    VideoJob.set(queue: :some_queue, wait: 5.minutes).perform_later(Video.last)
-      #    VideoJob.set(queue: :some_queue, wait_until: Time.tomorroe).perform_later(Video.last)
+      #    VideoJob.set(queue: :some_queue, wait_until: Time.now.tomorrow).perform_later(Video.last)
       def set(options={})
         ConfiguredJob.new(self, options)
       end
     end
 
-    # Creates a new job instance. Takes as arguments the arguments that
-    # will be passed to the perform method.
+    # Creates a new job instance. Takes the arguments that will be
+    # passed to the perform method.
     def initialize(*arguments)
       @arguments  = arguments
       @job_id     = SecureRandom.uuid
@@ -67,6 +67,32 @@ module ActiveJob
       }
     end
 
+    # Attaches the stored job data to the current instance. Receives a hash
+    # returned from +serialize+
+    #
+    # ==== Examples
+    #
+    #    class DeliverWebhookJob < ActiveJob::Base
+    #      def serialize
+    #        super.merge('attempt_number' => (@attempt_number || 0) + 1)
+    #      end
+    #
+    #      def deserialize(job_data)
+    #        super
+    #        @attempt_number = job_data['attempt_number']
+    #      end
+    #
+    #      rescue_from(TimeoutError) do |exception|
+    #        raise exception if @attempt_number > 5
+    #        retry_job(wait: 10)
+    #      end
+    #    end
+    def deserialize(job_data)
+      self.job_id               = job_data['job_id']
+      self.queue_name           = job_data['queue_name']
+      self.serialized_arguments = job_data['arguments']
+    end
+
     private
       def deserialize_arguments_if_needed
         if defined?(@serialized_arguments) && @serialized_arguments.present?
@@ -84,6 +110,3 @@ module ActiveJob
       end
   end
 end
-
-
-