good_job 4.1.0 → 4.2.0

data/app/models/good_job/discrete_execution.rb

@@ -1,63 +1,10 @@
 # frozen_string_literal: true
 
-module GoodJob # :nodoc:
-  class DiscreteExecution < BaseRecord
-    include ErrorEvents
-
-    self.table_name = 'good_job_executions'
-    self.implicit_order_column = 'created_at'
-
-    belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'active_job_id', inverse_of: :discrete_executions, optional: true
-
-    scope :finished, -> { where.not(finished_at: nil) }
-
-    alias_attribute :performed_at, :created_at
-
-    # TODO: Remove when support for Rails 6.1 is dropped
-    attribute :duration, :interval if ActiveJob.version.canonical_segments.take(2) == [6, 1]
-
-    def number
-      serialized_params.fetch('executions', 0) + 1
-    end
-
-    # Time between when this job was expected to run and when it started running
-    def queue_latency
-      created_at - scheduled_at
-    end
-
-    # Monotonic time between when this job started and finished
-    def runtime_latency
-      duration
-    end
-
-    def last_status_at
-      finished_at || created_at
-    end
-
-    def status
-      if finished_at.present?
-        if error.present? && job.finished_at.present?
-          :discarded
-        elsif error.present?
-          :retried
-        else
-          :succeeded
-        end
-      else
-        :running
-      end
-    end
-
-    def display_serialized_params
-      serialized_params.merge({
-                                _good_job_execution: attributes.except('serialized_params'),
-                              })
-    end
-
-    def filtered_error_backtrace
-      Rails.backtrace_cleaner.clean(error_backtrace || [])
-    end
+module GoodJob
+  # Deprecated, use +Execution+ instead.
+  class DiscreteExecution < Execution
   end
-end
 
-ActiveSupport.run_load_hooks(:good_job_execution, GoodJob::DiscreteExecution)
+  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
+  deprecate_constant :DiscreteExecution, 'Execution', deprecator: GoodJob.deprecator
+end

data/app/models/good_job/execution.rb

@@ -1,8 +1,63 @@
 # frozen_string_literal: true
 
-module GoodJob
-  # Created at the time a Job begins executing.
-  # Behavior from +DiscreteExecution+ will be merged into this class.
-  class Execution < DiscreteExecution
+module GoodJob # :nodoc:
+  class Execution < BaseRecord
+    include ErrorEvents
+
+    self.table_name = 'good_job_executions'
+    self.implicit_order_column = 'created_at'
+
+    belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'id', inverse_of: :executions, optional: true
+
+    scope :finished, -> { where.not(finished_at: nil) }
+
+    alias_attribute :performed_at, :created_at
+
+    # TODO: Remove when support for Rails 6.1 is dropped
+    attribute :duration, :interval if ActiveJob.version.canonical_segments.take(2) == [6, 1]
+
+    def number
+      serialized_params.fetch('executions', 0) + 1
+    end
+
+    # Time between when this job was expected to run and when it started running
+    def queue_latency
+      created_at - scheduled_at
+    end
+
+    # Monotonic time between when this job started and finished
+    def runtime_latency
+      duration
+    end
+
+    def last_status_at
+      finished_at || created_at
+    end
+
+    def status
+      if finished_at.present?
+        if error.present? && job.finished_at.present?
+          :discarded
+        elsif error.present?
+          :retried
+        else
+          :succeeded
+        end
+      else
+        :running
+      end
+    end
+
+    def display_serialized_params
+      serialized_params.merge({
+                                _good_job_execution: attributes.except('serialized_params'),
+                              })
+    end
+
+    def filtered_error_backtrace
+      Rails.backtrace_cleaner.clean(error_backtrace || [])
+    end
   end
 end
+
+ActiveSupport.run_load_hooks(:good_job_execution, GoodJob::Execution)

data/app/models/good_job/execution_result.rb

@@ -13,22 +13,22 @@ module GoodJob
     attr_reader :error_event
     # @return [Boolean, nil]
     attr_reader :unexecutable
-    # @return [GoodJob::Execution, nil]
-    attr_reader :retried
+    # @return [GoodJob::Job, nil]
+    attr_reader :retried_job
 
     # @param value [Object, nil]
     # @param handled_error [Exception, nil]
     # @param unhandled_error [Exception, nil]
     # @param error_event [String, nil]
     # @param unexecutable [Boolean, nil]
-    # @param retried [Boolean, nil]
-    def initialize(value:, handled_error: nil, unhandled_error: nil, error_event: nil, unexecutable: nil, retried: nil)
+    # @param retried_job [GoodJob::Job, nil]
+    def initialize(value:, handled_error: nil, unhandled_error: nil, error_event: nil, unexecutable: nil, retried_job: nil)
       @value = value
       @handled_error = handled_error
       @unhandled_error = unhandled_error
       @error_event = error_event
       @unexecutable = unexecutable
-      @retried = retried
+      @retried_job = retried_job
     end
 
     # @return [Boolean]
@@ -38,7 +38,7 @@ module GoodJob
 
     # @return [Boolean]
     def retried?
-      retried.present?
+      retried_job.present?
     end
   end
 end