marj 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a85f9f7752849bf9e7781eef989294d45420763c16fb5fadee3df3fc7a0c2e
-  data.tar.gz: acadf4b197599bd3150629a557857b8d48fa8bed662a2f4140a8dbe16f01e7ba
+  metadata.gz: '078c3d48b27784e09425ba8eda2207038d6ce5c7a711953e8567c76aac689435'
+  data.tar.gz: c129b4848de1e2fe55de0de3a4893586a052cd814df798879dc196a81c1a94d5
 SHA512:
-  metadata.gz: a30fe477c647ca284fdcde1bcccc8b000f3b4ef78b62de84f486376fa65450fcf3a52c7132df520fd45ee7e0f2856d8812a16b804ce89baa93a8d2353dc8348f
-  data.tar.gz: 72a63c15a36f6bade30e93bb5f84d5d8c6bbab33b12f4c92c78579f07eb86689e8e7609dae9ec16b94334140e8e4c2828b6e6cb19a580ad9a42730f27afab8cb
+  metadata.gz: 4cef48fb7c862123f4a5ad7ed5bf7a9d95eb3d7036831db79ad3dc9cf94f074a112ce58f0189484f991a52185cdf8e8ceed48dd9237bf4a04d5e3bbe30b2d274
+  data.tar.gz: 7631b1a0fef1ece1edcf15541dc85d25b2d5d3ba1cb8ca716133975126e5ce9bb4f28d627a4c2a5d751029ce8f67ba4db47c6fa9d197467fade4c09d20a04716

data/README.md

@@ -290,6 +290,8 @@ SomeJob.perform_now(args)
 SomeJob.new(args).enqueue
 SomeJob.new(args).enqueue(options)
 
+SomeJob.perform_later(SomeJob.new(args))
+
 SomeJob.perform_later(args)
 SomeJob.set(options).perform_later(args)
 

data/lib/marj_record.rb

@@ -9,7 +9,7 @@ require_relative 'marj_config'
 # See https://github.com/nicholasdower/marj
 class Marj < ActiveRecord::Base
   # The Marj version.
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 
   # Executes the job associated with this record and returns the result.
   def execute
@@ -93,14 +93,18 @@ class Marj < ActiveRecord::Base
   # @param job [ActiveJob::Base]
   # @return [ActiveJob::Base]
   def self.register_callbacks(job, record)
-    raise 'callbacks already registered' if job.singleton_class.instance_variable_get(:@__marj)
+    if job.singleton_class.instance_variable_get(:@__marj)
+      # Callbacks already registered. We just need to update the record.
+      job.singleton_class.instance_variable_set(:@__marj, record)
+      return
+    end
 
     # We need to detect three cases:
     #  - If a job succeeds, after_perform will be called.
     #  - If a job fails and should be retried, enqueue will be called. This is handled by the enqueue method.
     #  - If a job exceeds its max attempts, after_discard will be called.
-    job.singleton_class.after_perform { |_j| record.destroy! }
-    job.singleton_class.after_discard { |_j, _exception| record.destroy! }
+    job.singleton_class.after_perform { |_j| job.singleton_class.instance_variable_get(:@__marj).destroy! }
+    job.singleton_class.after_discard { |_j, _exception| job.singleton_class.instance_variable_get(:@__marj).destroy! }
     job.singleton_class.instance_variable_set(:@__marj, record)
 
     job
@@ -121,19 +125,28 @@ class Marj < ActiveRecord::Base
     # registered on the job instance so that when the job is executed, the database record is deleted or updated
     # (depending on the result).
     #
-    # There are three cases:
+    # There are two normal cases:
     #  - The first time a job is enqueued, we need to create the record and register callbacks.
     #  - If a previously enqueued job instance is re-enqueued, for instance after execution fails, callbacks have
     #    already been registered. In this case we only need to update the record.
-    #  - It is also possible for new job instance to be created for a job that is already in the database. In this case
-    #    we need to update the record and register callbacks.
     #
     # We keep track of whether callbacks have been registered by setting the @__marj instance variable on the job's
     # singleton class. This holds a reference to the record. This allows us to update the record without re-fetching it
     # and also ensures that if execute is called on a record any updates to the database are reflected on that record
     # instance.
+    #
+    # There are also two edge cases:
+    #  - It is possible for new job instance to be created for a job that is already in the database. In this case
+    #    we need to update the record and register callbacks.
+    #  - It is possible for the underlying row corresponding to an existing job to have been deleted. In this case we
+    #    need to create a new record and update the reference on the job's singleton class.
     if (record = job.singleton_class.instance_variable_get(:@__marj))
-      record.update!(serialized)
+      if Marj.exists?(job_id: job.job_id)
+        record.update!(serialized)
+      else
+        record = Marj.create!(serialized)
+        register_callbacks(job, record)
+      end
     else
       record = Marj.find_or_create_by!(job_id: job.job_id) { _1.assign_attributes(serialized) }
       register_callbacks(job, record)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marj
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Nick Dower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -56,8 +56,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/nicholasdower/marj/issues
-  changelog_uri: https://github.com/nicholasdower/marj/releases/tag/v2.0.1
-  documentation_uri: https://www.rubydoc.info/github/nicholasdower/marj/v2.0.1
+  changelog_uri: https://github.com/nicholasdower/marj/releases/tag/v2.1.0
+  documentation_uri: https://www.rubydoc.info/github/nicholasdower/marj/v2.1.0
   homepage_uri: https://github.com/nicholasdower/marj
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/nicholasdower/marj