rocketjob 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90895c69510bfbacc92d44ee5145106c5ab07dac
-  data.tar.gz: 68297e81bd9d77e56c224443558c4db24c0ba701
+  metadata.gz: 1750c9257c4d70baebe0d97b1a8549aaf86fd61c
+  data.tar.gz: 027cb7272e67685d1f49eb5455723a093d40e690
 SHA512:
-  metadata.gz: 2bcd1137b8bdfa9fd2627c1a1d7f94bd051b9cf1868b159c5c2024932d4f12bb33d9e5151fcdf07599fc992b547717fc1b20bb1fc3a5a89b57b8d8c7b349b0b6
-  data.tar.gz: 07ebf671c8d45cf9e255cb079a1b31e2c26810fc4a94bcde1758d4b51b9e41ff8760e94e0f2a473c94d471a3723fb0e3a19ec65045ced24aa4c09c476a767263
+  metadata.gz: 6f109722d6ecb509dca6f4ca8fa4da70f85d9c06c6bf85c7ae24aad7e155a580bb643db19b0ab5ce1f4b67369f30639d83c9a830fa8a7035b077e3639b19710e
+  data.tar.gz: f2181de5a394b23acf108369d8c3b49b527714d3833010ff648168d61dfed49d5fc86d394f7fcfb93b2d36d1d666385c2eac31bf450ed0e7667d9b72bed0b7e4

data/lib/rocket_job/cli.rb

@@ -27,6 +27,7 @@ module RocketJob
     # Run a RocketJob::Server from the command line
     def run
       Thread.current.name = 'rocketjob main'
+      RocketJob.server!
       setup_environment
       setup_logger
       rails? ? boot_rails : boot_standalone
@@ -53,6 +54,7 @@ module RocketJob
     # Returns [true|false] whether Rails is present
     def boot_rails
       logger.info "Loading Rails environment: #{environment}"
+      RocketJob.rails!
 
       boot_file = Pathname.new(directory).join('config/environment.rb').expand_path
       require(boot_file.to_s)

data/lib/rocket_job/dirmon_entry.rb

@@ -225,7 +225,7 @@ module RocketJob
 
     # Passes each filename [Pathname] found that matches the pattern into the supplied block
     def each(&block)
-      logger.fast_tag("dirmon_entry:#{id}") do
+      SemanticLogger.named_tagged(dirmon_entry: id.to_s) do
         # Case insensitive filename matching
         Pathname.glob(pattern, File::FNM_CASEFOLD).each do |pathname|
           next if pathname.directory?

data/lib/rocket_job/extensions/rocket_job_adapter.rb

@@ -8,42 +8,82 @@ module ActiveJob
     #
     # To use Rocket Job set the queue_adapter config to +:rocket_job+.
     #
-    #   Rails.application.config.active_job.queue_adapter = :rocket_job
+    # In application.rb add the following line:
+    #   config.active_job.queue_adapter = :rocket_job
+    #
+    # Example:
+    #
+    # Create a new file in app/job/my_job.rb:
+    #
+    #   class MyJob < ActiveJob::Base
+    #     def perform(record)
+    #       p "Received: #{record}"
+    #     end
+    #   end
+    #
+    # Run the job inline to verify ActiveJob is working:
+    #
+    #   MyJob.perform_now('hello world')
+    #
+    # Enqueue the job for processing:
+    #
+    #   MyJob.perform_later('hello world')
+    #
+    # Enqueue the job for processing, 5 minutes from now:
+    #
+    #   MyJob.set(wait: 5.minutes).perform_later('hello world')
+    #
+    # Start RocketJob server (or, restart if already running)
+    #
+    #   bundle exec rocketjob
+    #
+    # Override the priority of the job:
+    #
+    #   class MyJob < ActiveJob::Base
+    #     queue_with_priority 20
+    #
+    #     def perform(record)
+    #       p "Received: #{record}"
+    #     end
+    #   end
+    #
+    # Notes:
+    # - ActiveJobs will appear in:
+    #   - Queued before the are processed.
+    #   - Failed if the fail to process.
+    #   - Scheduled if they are to be processed in the future.
+    #   - Completed jobs will not appear in completed since the Active Job adapter
+    #     uses the default Rocket Job `destroy_on_completion` of `false`.
     class RocketJobAdapter
-      def enqueue(active_job) #:nodoc:
-        rocket_job                 = JobWrapper.perform_later(active_job.serialize) do |job|
-          job.active_job_id    = active_job.job_id
-          job.active_job_class = active_job.class.name
-          job.active_job_queue = active_job.queue_name
-          job.description      = active_job.class.name
-          job.priority         = active_job.priority if active_job.priority
-        end
-        active_job.provider_job_id = rocket_job.id.to_s
-        rocket_job
+      def self.enqueue(active_job) #:nodoc:
+        job                        = RocketJob::Jobs::ActiveJob.create!(active_job_params(active_job))
+        active_job.provider_job_id = job.id.to_s if active_job.respond_to?(:provider_job_id=)
+        job
       end
 
-      def enqueue_at(active_job, timestamp) #:nodoc:
-        rocket_job                 = JobWrapper.perform_later(active_job.serialize) do |job|
-          job.active_job_id    = active_job.job_id
-          job.active_job_class = active_job.class.name
-          job.active_job_queue = active_job.queue_name
-          job.description      = active_job.class.name
-          job.priority         = active_job.priority if active_job.priority
-          job.run_at           = Time.at(timestamp).utc
-        end
-        active_job.provider_job_id = rocket_job.id.to_s
-        rocket_job
+      def self.enqueue_at(active_job, timestamp) #:nodoc:
+        params          = active_job_params(active_job)
+        params[:run_at] = Time.at(timestamp).utc
+
+        job                        = RocketJob::Jobs::ActiveJob.create!(params)
+        active_job.provider_job_id = job.id.to_s if active_job.respond_to?(:provider_job_id=)
+        job
       end
 
-      class JobWrapper < RocketJob::Job #:nodoc:
-        field :active_job_id, type: String
-        field :active_job_class, type: String
-        field :active_job_queue, type: String
+      private
 
-        def perform(job_data)
-          Base.execute job_data
-        end
+      def self.active_job_params(active_job)
+        params            = {
+          description:      active_job.class.name,
+          data:             active_job.serialize,
+          active_job_id:    active_job.job_id,
+          active_job_class: active_job.class.name,
+          active_job_queue: active_job.queue_name,
+        }
+        params[:priority] = active_job.priority if active_job.respond_to?(:priority) && active_job.priority
+        params
       end
+
     end
   end
 end

data/lib/rocket_job/jobs/active_job.rb

@@ -0,0 +1,15 @@
+module RocketJob
+  module Jobs
+    # Used to wrap an Active Job
+    class ActiveJob < RocketJob::Job #:nodoc:
+      field :data, type: Hash
+      field :active_job_id, type: String
+      field :active_job_class, type: String
+      field :active_job_queue, type: String
+
+      def perform
+        ::ActiveJob::Base.execute data
+      end
+    end
+  end
+end

data/lib/rocket_job/jobs/dirmon_job.rb

@@ -43,9 +43,10 @@ module RocketJob
       self.priority = 40
 
       # Number of seconds between directory scans. Default 5 mins
-      field :check_seconds, type: Float, default: 300.0
+      field :check_seconds, type: Float, default: 300.0, copy_on_restart: true
+
       # Hash[file_name, size]
-      field :previous_file_names, type: Hash, default: {}
+      field :previous_file_names, type: Hash, default: {}, copy_on_restart: true
 
       before_create :set_run_at
 

data/lib/rocket_job/jobs/housekeeping_job.rb

@@ -36,11 +36,11 @@ module RocketJob
 
       # Retention intervals in seconds
       # Set to nil to not
-      field :aborted_retention, type: Integer, default: 7.days
-      field :completed_retention, type: Integer, default: 7.days
-      field :failed_retention, type: Integer, default: 14.days
-      field :paused_retention, type: Integer
-      field :queued_retention, type: Integer
+      field :aborted_retention, type: Integer, default: 7.days, user_editable: true, copy_on_restart: true
+      field :completed_retention, type: Integer, default: 7.days, user_editable: true, copy_on_restart: true
+      field :failed_retention, type: Integer, default: 14.days, user_editable: true, copy_on_restart: true
+      field :paused_retention, type: Integer, user_editable: true, copy_on_restart: true
+      field :queued_retention, type: Integer, user_editable: true, copy_on_restart: true
 
       def perform
         RocketJob::Job.aborted.where(created_at: {'$lte' => aborted_retention.seconds.ago}).destroy_all if aborted_retention

data/lib/rocket_job/plugins/cron.rb

@@ -100,7 +100,7 @@ module RocketJob
       included do
         include Restart
 
-        field :cron_schedule, type: String, class_attribute: true, user_editable: true
+        field :cron_schedule, type: String, class_attribute: true, user_editable: true, copy_on_restart: true
 
         before_create :rocket_job_set_run_at
 

data/lib/rocket_job/plugins/document.rb

@@ -9,43 +9,9 @@ module RocketJob
 
       included do
         store_in client: 'rocketjob'
-
-        class_attribute :user_editable_fields, instance_accessor: false
-        self.user_editable_fields = []
       end
 
       module ClassMethods
-        # Defines all the fields that are accessible on the Document
-        # For each field that is defined, a getter and setter will be
-        # added as an instance method to the Document.
-        #
-        # @example Define a field.
-        #   field :score, :type => Integer, :default => 0
-        #
-        # @param [ Symbol ] name The name of the field.
-        # @param [ Hash ] options The options to pass to the field.
-        #
-        # @option options [ Class ] :type The type of the field.
-        # @option options [ String ] :label The label for the field.
-        # @option options [ Object, Proc ] :default The field's default
-        # @option options [ Boolean ] :class_attribute Keep the fields default in a class_attribute
-        # @option options [ Boolean ] :user_editable Field can be edited by end users in RJMC
-        #
-        # @return [ Field ] The generated field
-        def field(name, options)
-          if options.delete(:user_editable) == true
-            self.user_editable_fields += [name.to_sym] unless user_editable_fields.include?(name.to_sym)
-          end
-          if options.delete(:class_attribute) == true
-            class_attribute(name, instance_accessor: false)
-            if options.has_key?(:default)
-              public_send("#{name}=", options[:default])
-            end
-            options[:default] = lambda { self.class.public_send(name) }
-          end
-          super(name, options)
-        end
-
         # V2 Backward compatibility
         # DEPRECATED
         def key(name, type, options = {})

data/lib/rocket_job/plugins/job/model.rb

@@ -8,13 +8,22 @@ module RocketJob
         extend ActiveSupport::Concern
 
         included do
+          # Fields that are end user editable.
+          # For example are editable in Rocket Job Mission Control.
+          class_attribute :user_editable_fields, instance_accessor: false
+          self.user_editable_fields = []
+
+          # Attributes to include when copying across the attributes to a new instance on restart.
+          class_attribute :rocket_job_restart_attributes
+          self.rocket_job_restart_attributes = []
+
           #
           # User definable attributes
           #
           # The following attributes are set when the job is created
 
           # Description for this job instance
-          field :description, type: String, class_attribute: true, user_editable: true
+          field :description, type: String, class_attribute: true, user_editable: true, copy_on_restart: true
 
           # Priority of this job as it relates to other jobs [1..100]
           #   1: Highest Priority
@@ -27,10 +36,10 @@ module RocketJob
           # In RocketJob Pro, if a SlicedJob is running and a higher priority job
           # arrives, then the current job will complete the current slices and process
           # the new higher priority job
-          field :priority, type: Integer, default: 50, class_attribute: true, user_editable: true
+          field :priority, type: Integer, default: 50, class_attribute: true, user_editable: true, copy_on_restart: true
 
           # When the job completes destroy it from both the database and the UI
-          field :destroy_on_complete, type: Boolean, default: true, class_attribute: true
+          field :destroy_on_complete, type: Boolean, default: true, class_attribute: true, user_editable: true, copy_on_restart: true
 
           # Whether to store the results from this job
           field :collect_output, type: Boolean, default: false, class_attribute: true
@@ -39,13 +48,13 @@ module RocketJob
           field :run_at, type: Time
 
           # If a job has not started by this time, destroy it
-          field :expires_at, type: Time
+          field :expires_at, type: Time, copy_on_restart: true
 
           # Raise or lower the log level when calling the job
           # Can be used to reduce log noise, especially during high volume calls
           # For debugging a single job can be logged at a low level such as :trace
           #   Levels supported: :trace, :debug, :info, :warn, :error, :fatal
-          field :log_level, type: Symbol, class_attribute: true, user_editable: true
+          field :log_level, type: Symbol, class_attribute: true, user_editable: true, copy_on_restart: true
 
           #
           # Read-only attributes
@@ -150,6 +159,40 @@ module RocketJob
             queued.or({:run_at => nil}, {:run_at.lte => Time.now})
           end
 
+          # Defines all the fields that are accessible on the Document
+          # For each field that is defined, a getter and setter will be
+          # added as an instance method to the Document.
+          #
+          # @example Define a field.
+          #   field :score, :type => Integer, :default => 0
+          #
+          # @param [ Symbol ] name The name of the field.
+          # @param [ Hash ] options The options to pass to the field.
+          #
+          # @option options [ Class ] :type The type of the field.
+          # @option options [ String ] :label The label for the field.
+          # @option options [ Object, Proc ] :default The field's default
+          # @option options [ Boolean ] :class_attribute Keep the fields default in a class_attribute
+          # @option options [ Boolean ] :user_editable Field can be edited by end users in RJMC
+          #
+          # @return [ Field ] The generated field
+          def field(name, options)
+            if options.delete(:user_editable) == true
+              self.user_editable_fields += [name.to_sym] unless user_editable_fields.include?(name.to_sym)
+            end
+            if options.delete(:class_attribute) == true
+              class_attribute(name, instance_accessor: false)
+              if options.has_key?(:default)
+                public_send("#{name}=", options[:default])
+              end
+              options[:default] = lambda { self.class.public_send(name) }
+            end
+            if options.delete(:copy_on_restart) == true
+              self.rocket_job_restart_attributes += [name.to_sym] unless rocket_job_restart_attributes.include?(name.to_sym)
+            end
+            super(name, options)
+          end
+
           # DEPRECATED
           def rocket_job
             warn 'Replace calls to .rocket_job with calls to set class instance variables. For example: self.priority = 50'

data/lib/rocket_job/plugins/processing_window.rb

@@ -21,8 +21,9 @@ module RocketJob
     #
     #   # The start of the processing window
     #   self.processing_schedule = "30 8 * * * America/New_York"
+    #
     #   # How long the processing window is:
-    #   self..processing_duration = 12.hours
+    #   self.processing_duration = 12.hours
     #
     #   def perform
     #     # Job will only run between 8:30am and 8:30pm Eastern
@@ -37,8 +38,8 @@ module RocketJob
       extend ActiveSupport::Concern
 
       included do
-        field :processing_schedule, type: String, class_attribute: true
-        field :processing_duration, type: Integer, class_attribute: true
+        field :processing_schedule, type: String, class_attribute: true, user_editable: true, copy_on_restart: true
+        field :processing_duration, type: Integer, class_attribute: true, user_editable: true, copy_on_restart: true
 
         before_create :rocket_job_processing_window_set_run_at
         before_retry :rocket_job_processing_window_set_run_at

data/lib/rocket_job/plugins/restart.rb

@@ -3,49 +3,93 @@ require 'active_support/concern'
 module RocketJob
   module Plugins
     # Automatically starts a new instance of this job anytime it fails, aborts, or completes.
-    # Failed jobs are aborted so that they cannot be restarted.
-    # On destroy this job is destroyed without starting a new copy. Abort the job first to get
-    # it to start a new instance before destroying.
-    # Include RocketJob::Plugins::Singleton to prevent multiple copies of a job from running at
-    # the same time.
-    #
-    # Note:
-    # - The job will not be restarted if:
-    #   - A validation fails after cloning this job.
+    #
+    # Notes:
+    # * Restartable jobs automatically abort if they fail. This prevents the failed job from being retried.
+    #   - To disable this behavior, add the following empty method:
+    #        def rocket_job_restart_abort
+    #        end
+    # * On destroy this job is destroyed without starting a new instance.
+    # * On Abort a new instance is created.
+    # * Include `RocketJob::Plugins::Singleton` to prevent multiple copies of a job from running at
+    #   the same time.
+    # * The job will not be restarted if:
+    #   - A validation fails after creating the new instance of this job.
     #   - The job has expired.
+    # * Only the fields that have `copy_on_restart: true` will be passed onto the new instance of this job.
+    #
+    # Example:
+    #
+    # class RestartableJob < RocketJob::Job
+    #   include RocketJob::Plugins::Restart
+    #
+    #   # Retain the completed job under the completed tab in Rocket Job Mission Control.
+    #   self.destroy_on_complete = false
+    #
+    #   # Will be copied to the new job on restart.
+    #   field :limit, type: Integer, copy_on_restart: true
+    #
+    #   # Will _not_ be copied to the new job on restart.
+    #   field :list, type: Array, default: [1,2,3]
+    #
+    #   # Set run_at every time a new instance of the job is created.
+    #   after_initialize set_run_at, if: :new_record?
+    #
+    #   def perform
+    #     puts "The limit is #{limit}"
+    #     puts "The list is #{list}"
+    #     'DONE'
+    #   end
+    #
+    #   private
+    #
+    #   # Run this job in 30 minutes.
+    #   def set_run_at
+    #     self.run_at = 30.minutes.from_now
+    #   end
+    # end
+    #
+    # job = RestartableJob.create!(limit: 10, list: [4,5,6])
+    # job.reload.state
+    # # => :queued
+    #
+    # job.limit
+    # # => 10
+    #
+    # job.list
+    # # => [4,5,6]
+    #
+    # # Wait 30 minutes ...
+    #
+    # job.reload.state
+    # # => :completed
+    #
+    # # A new instance was automatically created.
+    # job2 = RestartableJob.last
+    # job2.state
+    # # => :queued
+    #
+    # job2.limit
+    # # => 10
+    #
+    # job2.list
+    # # => [1,2,3]
     module Restart
       extend ActiveSupport::Concern
 
       included do
-        # Attributes to exclude when copying across the attributes to the new instance
-        class_attribute :rocket_job_restart_excludes
-        self.rocket_job_restart_excludes = %w(_id state created_at started_at completed_at failure_count worker_name percent_complete exception result run_at record_count sub_state)
-
         after_abort :rocket_job_restart_new_instance
         after_complete :rocket_job_restart_new_instance
         after_fail :rocket_job_restart_abort
       end
 
-      module ClassMethods
-        def field(name, options)
-          if options.delete(:copy_on_restart) == false
-            self.rocket_job_restart_excludes += [name.to_sym] unless rocket_job_restart_excludes.include?(name.to_sym)
-          end
-          super(name, options)
-        end
-      end
-
       private
 
       # Run again in the future, even if this run fails with an exception
       def rocket_job_restart_new_instance
+        logger.info('Job has expired. Not creating a new instance.')
         return if expired?
-        attrs = attributes.dup
-        rocket_job_restart_excludes.each { |attr| attrs.delete(attr) }
-
-        # Copy across run_at for future dated jobs
-        attrs['run_at'] = run_at if run_at && (run_at > Time.now)
-
+        attrs = rocket_job_restart_attributes.reduce({}) { |attrs, attr| attrs[attr] = send(attr); attrs }
         rocket_job_restart_create(attrs)
       end
 
@@ -60,7 +104,7 @@ module RocketJob
         while count < retry_limit
           job = self.class.create(attrs)
           if job.persisted?
-            logger.info("Started a new job instance: #{job.id}")
+            logger.info("Created a new job instance: #{job.id}")
             return true
           else
             logger.info('Job already active, retrying after a short sleep')
@@ -72,7 +116,6 @@ module RocketJob
         false
       end
 
-
     end
   end
 end

data/lib/rocket_job/plugins/retry.rb

@@ -49,7 +49,7 @@ module RocketJob
 
         # Maximum number of times to retry this job
         # 25 is approximately 3 weeks of retries
-        field :max_retries, type: Integer, default: 25, class_attribute: true, user_editable: true
+        field :max_retries, type: Integer, default: 25, class_attribute: true, user_editable: true, copy_on_restart: true
 
         # List of times when this job failed
         field :failed_times, type: Array, default: []

data/lib/rocket_job/rocket_job.rb

@@ -0,0 +1,53 @@
+module RocketJob
+  # Whether the current process is running inside a Rocket Job server process.
+  def self.server?
+    server
+  end
+
+  # When running inside a Rocket Job server process, returns
+  # true when Rails has been initialized.
+  def self.rails?
+    rails
+  end
+
+  # When running inside a Rocket Job server process, returns
+  # true when running standalone.
+  def self.standalone?
+    !rails
+  end
+
+  # Returns a human readable duration from the supplied [Float] number of seconds
+  def self.seconds_as_duration(seconds)
+    return nil unless seconds
+    if seconds >= 86400.0 # 1 day
+      "#{(seconds / 86400).to_i}d #{Time.at(seconds).strftime('%-Hh %-Mm')}"
+    elsif seconds >= 3600.0 # 1 hour
+      Time.at(seconds).strftime('%-Hh %-Mm')
+    elsif seconds >= 60.0 # 1 minute
+      Time.at(seconds).strftime('%-Mm %-Ss')
+    elsif seconds >= 1.0 # 1 second
+      "#{'%.3f' % seconds}s"
+    else
+      duration = seconds * 1000
+      if defined? JRuby
+        "#{duration.to_i}ms"
+      else
+        duration < 10.0 ? "#{'%.3f' % duration}ms" : "#{'%.1f' % duration}ms"
+      end
+    end
+  end
+
+  # private
+
+  @rails  = false
+  @server = false
+
+  def self.server!
+    @server = true
+  end
+
+  def self.rails!
+    @rails = true
+  end
+
+end

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/rocket_job/worker.rb

@@ -102,7 +102,7 @@ module RocketJob
         job = Job.rocket_job_next_job(name, current_filter)
         break unless job
 
-        logger.fast_tag("job:#{job.id}") do
+        SemanticLogger.named_tagged(job: job.id.to_s) do
           unless job.rocket_job_work(self, false, current_filter)
             processed = true
           end

data/lib/rocketjob.rb

@@ -2,6 +2,7 @@ require 'semantic_logger'
 require 'mongoid'
 require 'rocket_job/extensions/mongo/logging'
 require 'rocket_job/version'
+require 'rocket_job/rocket_job'
 
 # @formatter:off
 module RocketJob
@@ -41,33 +42,11 @@ module RocketJob
   end
 
   module Jobs
+    autoload :ActiveJob,        'rocket_job/jobs/active_job'
     autoload :DirmonJob,        'rocket_job/jobs/dirmon_job'
     autoload :HousekeepingJob,  'rocket_job/jobs/housekeeping_job'
     autoload :SimpleJob,        'rocket_job/jobs/simple_job'
   end
-
-  # @formatter:on
-  # Returns a human readable duration from the supplied [Float] number of seconds
-  def self.seconds_as_duration(seconds)
-    return nil unless seconds
-    if seconds >= 86400.0 # 1 day
-      "#{(seconds / 86400).to_i}d #{Time.at(seconds).strftime('%-Hh %-Mm')}"
-    elsif seconds >= 3600.0 # 1 hour
-      Time.at(seconds).strftime('%-Hh %-Mm')
-    elsif seconds >= 60.0 # 1 minute
-      Time.at(seconds).strftime('%-Mm %-Ss')
-    elsif seconds >= 1.0 # 1 second
-      "#{'%.3f' % seconds}s"
-    else
-      duration = seconds * 1000
-      if defined? JRuby
-        "#{duration.to_i}ms"
-      else
-        duration < 10.0 ? "#{'%.3f' % duration}ms" : "#{'%.1f' % duration}ms"
-      end
-    end
-  end
-
 end
 
 # Add Active Job adapter for Rails

data/test/plugins/restart_test.rb

@@ -6,9 +6,6 @@ module Plugins
     class RestartableJob < RocketJob::Job
       include RocketJob::Plugins::Restart
 
-      # Ensure a new start_at and end_at is generated every time this job is restarted
-      self.rocket_job_restart_excludes += %w(start_at end_at)
-
       field :start_at, type: Date
       field :end_at, type: Date
 
@@ -153,11 +150,14 @@ module Plugins
           assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.queued?, job2.attributes.ai
 
+          assert RestartableJob.rocket_job_restart_attributes.include?(:priority)
+          assert RestartableJob.rocket_job_restart_attributes.exclude?(:start_at)
+          assert RestartableJob.rocket_job_restart_attributes.exclude?(:end_at)
+          assert RestartableJob.rocket_job_restart_attributes.exclude?(:run_at)
+
           # Copy across all attributes, except
-          job2.attributes.each_pair do |key, value|
-            refute_equal 'start_at', key, "Should not include start_at in retried job. #{job2.attributes.inspect}"
-            next if RestartableJob.rocket_job_restart_excludes.include?(key)
-            assert_equal value, job2[key], "Attributes are supposed to be copied across. For #{key}"
+          RestartableJob.rocket_job_restart_attributes.each do |key|
+            assert_equal @job.send(key).to_s, job2.send(key).to_s, "Attributes are supposed to be copied across. For #{key}"
           end
 
           assert_nil job2.start_at
@@ -172,22 +172,6 @@ module Plugins
           assert_nil job2.exception
           refute job2.result
         end
-
-        it 'copies run_at when it is in the future' do
-          @job = RestartableJob.create!(run_at: Time.now + 1.day, destroy_on_complete: true)
-          @job.perform_now
-          assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(:id.ne => @job.id).first
-          assert job2.run_at, job2.attributes.ai
-        end
-
-        it 'does not copy run_at when it is in the past' do
-          @job = RestartableJob.create!(run_at: Time.now - 1.day, destroy_on_complete: true)
-          @job.perform_now
-          assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(:id.ne => @job.id).first
-          assert_nil job2.run_at
-        end
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -89,6 +89,7 @@ files:
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb
 - lib/rocket_job/job_exception.rb
+- lib/rocket_job/jobs/active_job.rb
 - lib/rocket_job/jobs/dirmon_job.rb
 - lib/rocket_job/jobs/housekeeping_job.rb
 - lib/rocket_job/jobs/simple_job.rb
@@ -110,6 +111,7 @@ files:
 - lib/rocket_job/plugins/rufus/zo_time.rb
 - lib/rocket_job/plugins/singleton.rb
 - lib/rocket_job/plugins/state_machine.rb
+- lib/rocket_job/rocket_job.rb
 - lib/rocket_job/server.rb
 - lib/rocket_job/version.rb
 - lib/rocket_job/worker.rb