postburner 1.0.0.pre.21 → 1.0.0.pre.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cea7097e8d2f498dcf2c63fefa199fa1926399e93d773acb3b6527f4309d7a0
-  data.tar.gz: 98133fa630e92291a5c36c327693b7f1b0b1602e2d1ca1a62977f85b5e654ae3
+  metadata.gz: 7751ed8ba40ce899b9bf180cff95e8b72f0862d3dabafba282ea3a34e1a116c1
+  data.tar.gz: 584283e10f18bca0010f5cb5936c3cfb957fc8105a5f92ddbbf11415a527a476
 SHA512:
-  metadata.gz: e170a612372e0687405a1e4bb61a5b71e159c256fe258b889a76d9b0d8b35adaef2e362666db70b51045becf1d125b3d115e0fb86cbf021f0e085a7a5f16e3b3
-  data.tar.gz: 7754802face80f7e39de89ffc5be7e44197376a53c5ac1bc78f890230ecd840ff0211fce3f489ff8ce9a4298e35084171064ae73882060025c40494371e4075d
+  metadata.gz: 45ee3b0c0246b2a5a565941e1d2cf00532e5ce957a5ff5dd27da541774bc36e14cbab2676de6a3e9dd78752a3c32e0a3095439134f7596748265bdd6776cce0c
+  data.tar.gz: caba9af9897d1e0cc4ac267b18637f88c4631302b6b7905715ea363842ef6ae03d5d4e754944ccdab9550f5f795e4a08d262e88ed302f4650c7c02e045d45b1f

data/app/concerns/postburner/execution.rb

@@ -48,7 +48,7 @@ module Postburner
       # @see Queue.handle_perform!
       # @see NullQueue.handle_perform!
       #
-      def perform(id, _={})
+      def perform(id, beanstalk_job: nil)
         job = nil
         begin
           job = self.find(id)
@@ -57,7 +57,7 @@ module Postburner
 [Postburner::Job] [#{id}] Not Found.
           MSG
         end
-        #job.perform!(job.args)
+        job.bk = beanstalk_job if job && beanstalk_job
         Postburner.queue_strategy.handle_perform!(job)
       end
     end

data/app/models/postburner/job.rb

@@ -174,12 +174,26 @@ module Postburner
     # @see #kick!
     #
     def bk
-      return unless self.bkid.present?
       return @__job if @__job
+      return unless self.bkid.present?
 
       @__job = Postburner.connection.beanstalk.jobs.find(self.bkid)
     end
 
+    # Sets the Beanstalkd job object directly.
+    #
+    # Used by the worker to pass the reserved Beanstalkd job to the model,
+    # ensuring that operations like {#extend!}, {#delete!}, and {#kick!}
+    # use the actual reserved job rather than a fresh lookup via peek.
+    #
+    # @param job [Beaneater::Job] Reserved Beanstalkd job object
+    #
+    # @see #bk
+    #
+    def bk=(job)
+      @__job = job
+    end
+
     # Returns the Beanstalkd job object with cache invalidation.
     #
     # Same as {#bk} but clears the cached instance variable first,

data/lib/postburner/active_job/execution.rb

@@ -21,13 +21,13 @@ module Postburner
         #
         # @raise [StandardError] if job execution fails
         #
-        def execute(payload_json)
+        def execute(payload_json, beanstalk_job: nil)
           payload = Payload.parse(payload_json)
 
           if Payload.legacy_format?(payload)
-            execute_legacy(payload)
+            execute_legacy(payload, beanstalk_job: beanstalk_job)
           elsif Payload.tracked?(payload)
-            execute_tracked(payload)
+            execute_tracked(payload, beanstalk_job: beanstalk_job)
           else
             execute_default(payload)
           end
@@ -44,7 +44,7 @@ module Postburner
         #
         # @return [void]
         #
-        def execute_tracked(payload)
+        def execute_tracked(payload, beanstalk_job: nil)
           job_id = payload['postburner_job_id']
 
           unless job_id
@@ -52,7 +52,7 @@ module Postburner
           end
 
           # Delegate to Postburner::Job.perform which handles the full lifecycle
-          Postburner::Job.perform(job_id)
+          Postburner::Job.perform(job_id, beanstalk_job: beanstalk_job)
         end
 
         # Executes a default job (Beanstalkd only, no PostgreSQL).
@@ -96,12 +96,12 @@ module Postburner
         #
         # @return [void]
         #
-        def execute_legacy(payload)
+        def execute_legacy(payload, beanstalk_job: nil)
           job_class = payload['class'].constantize
           job_id = payload['args'].first
 
           # Delegate to the class's perform method (Postburner::Job.perform)
-          job_class.perform(job_id)
+          job_class.perform(job_id, beanstalk_job: beanstalk_job)
         end
       end
     end

data/lib/postburner/version.rb

@@ -1,3 +1,3 @@
 module Postburner
-  VERSION = '1.0.0.pre.21'
+  VERSION = '1.0.0.pre.22'
 end

data/lib/postburner/worker.rb

@@ -628,7 +628,7 @@ module Postburner
 
       ActiveSupport::Notifications.instrument('perform.job.postburner', instrument_payload) do
         Rails.application.reloader.wrap do
-          Postburner::ActiveJob::Execution.execute(beanstalk_job.body)
+          Postburner::ActiveJob::Execution.execute(beanstalk_job.body, beanstalk_job: beanstalk_job)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postburner
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.21
+  version: 1.0.0.pre.22
 platform: ruby
 authors:
 - Matt Smith