delayed 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace621cdafc8489809a02bcd03d0367f686b7bc1d9eba634263595da038b559f
-  data.tar.gz: 25b7047017850106283822f0ce6ef89c93b53e81303591b47772c121b3ec7eb9
+  metadata.gz: 1a6428c0614b28cf06d2921310bea48cc8e0bcc891a9772b7aed44238dbf1533
+  data.tar.gz: fa61f990945d382d21dd856170ce10dc52ecf44f2360a5be8ac9ec3463f9b5ac
 SHA512:
-  metadata.gz: abc7e1858bb94efaa865df785abd79818d107952821e83830d8dc16a6415d506f50316a851fb01bf1182753e3f71565381e0b1c54a5ad9481123d46fadc2a283
-  data.tar.gz: 7eeaa1c9e12d6fc78345a29f8fb99ef5f6aa956bae5923fe94a0c78358247fbd581f96a07fcf9b33e79ff86ad06f78b357eba14e8d9638f1152fd39d139942ea
+  metadata.gz: 46152e349a8b725978c3ef8a281789e288301e1d605b67fe4a8562733dac1742d5a9783a329c1569dce69910e73249b1134f8a5a1b19956ccb2b3a3a355dddd9
+  data.tar.gz: f6bd7af40fd73a4d4d9fe5c2af5eb307241d627a43ecf972cc7fb6510ba1a0d2ad0b2e065fdf935bb2bc3f03ffa912f91d2cead31cd01a2ab5aa6e70d446203a

data/lib/delayed/active_job_adapter.rb

@@ -14,7 +14,7 @@ module Delayed
       opts.merge!({ queue: job.queue_name, priority: job.priority }.compact)
         .merge!(job.provider_attributes || {})
 
-      Delayed::Job.enqueue(JobWrapper.new(job.serialize), opts).tap do |dj|
+      Delayed::Job.enqueue(JobWrapper.new(job), opts).tap do |dj|
         job.provider_job_id = dj.id
       end
     end
@@ -36,34 +36,4 @@ module Delayed
       end
     end
   end
-
-  class JobWrapper # rubocop:disable Betterment/ActiveJobPerformable
-    attr_accessor :job_data
-
-    delegate_missing_to :job
-
-    def initialize(job_data)
-      @job_data = job_data
-    end
-
-    def display_name
-      job_data['job_class']
-    end
-
-    def perform
-      ActiveJob::Callbacks.run_callbacks(:execute) do
-        job.perform_now
-      end
-    end
-
-    def encode_with(coder)
-      coder['job_data'] = @job_data
-    end
-
-    private
-
-    def job
-      @job ||= ActiveJob::Base.deserialize(job_data) if job_data
-    end
-  end
 end

data/lib/delayed/job_wrapper.rb

@@ -0,0 +1,39 @@
+module Delayed
+  class JobWrapper # rubocop:disable Betterment/ActiveJobPerformable
+    attr_accessor :job_data
+
+    delegate_missing_to :job
+
+    def initialize(job_or_data)
+      # During enqueue the job instance is passed in directly, saves us deserializing
+      # it to find out how to queue the job.
+      # During load from the db, we get a data hash passed in so deserialize lazily.
+      if job_or_data.is_a?(ActiveJob::Base)
+        @job = job_or_data
+        @job_data = job_or_data.serialize
+      else
+        @job_data = job_or_data
+      end
+    end
+
+    def display_name
+      job_data['job_class']
+    end
+
+    def perform
+      ActiveJob::Callbacks.run_callbacks(:execute) do
+        job.perform_now
+      end
+    end
+
+    def encode_with(coder)
+      coder['job_data'] = @job_data
+    end
+
+    private
+
+    def job
+      @job ||= ActiveJob::Base.deserialize(job_data) if job_data
+    end
+  end
+end

data/lib/delayed/monitor.rb

@@ -34,7 +34,7 @@ module Delayed
     attr_reader :jobs
 
     def emit_metric!(metric)
-      send("#{metric}_grouped").reverse_merge(default_results).each do |(priority, queue), value|
+      send(:"#{metric}_grouped").reverse_merge(default_results).each do |(priority, queue), value|
         ActiveSupport::Notifications.instrument(
           "delayed.job.#{metric}",
           default_tags.merge(priority: Priority.new(priority).to_s, queue: queue, value: value),

data/lib/delayed.rb

@@ -14,6 +14,7 @@ require 'delayed/plugins/instrumentation'
 require 'delayed/backend/base'
 require 'delayed/backend/job_preparer'
 require 'delayed/worker'
+require 'delayed/job_wrapper'
 
 if defined?(Rails::Engine)
   require 'delayed/engine'

data/spec/delayed/active_job_adapter_spec.rb

@@ -23,6 +23,16 @@ RSpec.describe Delayed::ActiveJobAdapter do
     ActiveJob::Base.queue_adapter = adapter_was
   end
 
+  it "does not invoke #deserialize during enqueue" do # rubocop:disable RSpec/NoExpectationExample
+    JobClass.include(Module.new do
+      def deserialize(*)
+        raise "uh oh, deserialize called during enqueue!"
+      end
+    end)
+
+    JobClass.perform_later
+  end
+
   it 'serializes a JobWrapper in the handler with expected fields' do
     Timecop.freeze('2023-01-20T18:52:29Z') do
       JobClass.perform_later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Nathan Griffith
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,6 +72,7 @@ files:
 - lib/delayed/backend/job_preparer.rb
 - lib/delayed/engine.rb
 - lib/delayed/exceptions.rb
+- lib/delayed/job_wrapper.rb
 - lib/delayed/lifecycle.rb
 - lib/delayed/message_sending.rb
 - lib/delayed/monitor.rb