activejob 7.0.3.1 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b52c57ec26b00940ffe64ac85b469cf455d8fec27c3fd2b117497b0109746677
-  data.tar.gz: 69985eb16b795b0e76a34d2cd6b1903204df79ffc300242936eed6d12ede70cc
+  metadata.gz: 619c392b3b1934bf8928a00e6a3ccc7489d892a6e14789c532163656878ee46b
+  data.tar.gz: 9e2b6ef26f6da87c576e02fc63331afc17ff74771dbe3c72e1b653852cca24d1
 SHA512:
-  metadata.gz: ab63ae1b77d0faed85d5cfcd553b33936d1c7e8aa956ed01968231743e6c6fb23c6bfcdf28616f165bc1a4ac4d6ff51c5175026fd1769d325a549c94a6a5706f
-  data.tar.gz: c9af2e154d909fa40f41ed9e5a716a1ed2dd297b02b8dbd226e1188da61207b16df94141b8e3c2a30f0c0ecea820119d6dbf4a7256325178936022edfe993f17
+  metadata.gz: 37154184efe19657d6994393ff0750c8507386d9620ac4afbe7551727dbe2f8f882bac214d01d99e993733fa94a0fd1250fdcb0a58cd43fd8cf73d5fb0ea9aab
+  data.tar.gz: 7225a316b52bb1c4b576ee98049aba194e5f1601047cb4b25531b5fcfbbc1f94600d9ff1ae4f642756b9bd501b06ee2c5f78e6f61a41dc08c95200013930b366

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 7.0.4 (September 09, 2022) ##
+
+*   Update `ActiveJob::QueueAdapters::QueAdapter` to remove deprecation warning.
+
+    Remove a deprecation warning introduced in que 1.2 to prepare for changes in
+    que 2.0 necessary for Ruby 3 compatibility.
+
+    *Damir Zekic* and *Adis Hasovic*
+
 ## Rails 7.0.3.1 (July 12, 2022) ##
 
 *   No changes.

data/lib/active_job/callbacks.rb

@@ -28,7 +28,6 @@ module ActiveJob
     end
 
     included do
-      class_attribute :return_false_on_aborted_enqueue, instance_accessor: false, instance_predicate: false, default: false
       cattr_accessor :skip_after_callbacks_if_terminated, instance_accessor: false, default: false
       singleton_class.deprecate :skip_after_callbacks_if_terminated, :skip_after_callbacks_if_terminated=
 

data/lib/active_job/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveJob
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 3
-    PRE   = "1"
+    TINY  = 4
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/queue_adapters/que_adapter.rb

@@ -18,22 +18,44 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :que
     class QueAdapter
       def enqueue(job) # :nodoc:
-        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name
+        job_options = { priority: job.priority, queue: job.queue_name }
+        que_job = nil
+
+        if require_job_options_kwarg?
+          que_job = JobWrapper.enqueue job.serialize, job_options: job_options
+        else
+          que_job = JobWrapper.enqueue job.serialize, **job_options
+        end
+
         job.provider_job_id = que_job.attrs["job_id"]
         que_job
       end
 
       def enqueue_at(job, timestamp) # :nodoc:
-        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name, run_at: Time.at(timestamp)
+        job_options = { priority: job.priority, queue: job.queue_name, run_at: Time.at(timestamp) }
+        que_job = nil
+
+        if require_job_options_kwarg?
+          que_job = JobWrapper.enqueue job.serialize, job_options: job_options
+        else
+          que_job = JobWrapper.enqueue job.serialize, **job_options
+        end
+
         job.provider_job_id = que_job.attrs["job_id"]
         que_job
       end
 
-      class JobWrapper < Que::Job # :nodoc:
-        def run(job_data)
-          Base.execute job_data
+      private
+        def require_job_options_kwarg?
+          @require_job_options_kwarg ||=
+            JobWrapper.method(:enqueue).parameters.any? { |ptype, pname| ptype == :key && pname == :job_options }
+        end
+
+        class JobWrapper < Que::Job # :nodoc:
+          def run(job_data)
+            Base.execute job_data
+          end
         end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 7.0.3.1
+  version: 7.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -100,10 +100,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.3.1/activejob/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.3.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.4/activejob/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.3.1/activejob
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/activejob
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []