activejob 7.0.0.alpha1 → 7.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ec9d3dc4bb88ce5c06f50a5efb7d34fb383b38088a400a1dc307329be429a9
-  data.tar.gz: 8d2a9541a56b633fabb47adbf164d6568f7487ab07f5749e96917320c5f66b0a
+  metadata.gz: 76df0430ea7f5eadb7780020ffc50c075fdc64b39a3cda073da2bfe4f44a2e58
+  data.tar.gz: 53d24d3b2274f2546ce40986ba8e8bacd4afd1b3c5fc809b98562bbe51cec989
 SHA512:
-  metadata.gz: 52b3116d2eba23f548e2af97a90a31fb544a0bb8c53e2642b6d0d8cdc03d419dc2de8bac6243b409b32d15fbf1af4da42e356f19df765d6b708b5b55b7283bb9
-  data.tar.gz: b8f3195cf56348deed886b834fe67a9f036b931f7b93c386888411d6aabc84467d87fc0a56ac2263b9d21df0e8294a3438d80e0748099ec1bd28bfcd4940c96e
+  metadata.gz: 3971cc1118a54d061425cbb011f0c1a77d7dc06b892be34f3b692c6644495346dbbdfdc30fd4daba59ea8c2dc0f4c23a45c6e5222999eae202aecd8e6bca405f
+  data.tar.gz: 490a6b13ef22e5a380208ff3bf9c74f81713efe159a26a3730cc9550d4664a4ee99f7970641c02d0e9b2dc0ddcfa0f192229c20913379ae82e8c1a17c2f50ea8

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## Rails 7.0.0.rc3 (December 14, 2021) ##
+
+*   No changes.
+
+
+## Rails 7.0.0.rc2 (December 14, 2021) ##
+
+*   Remove deprecated `:return_false_on_aborted_enqueue` option.
+
+    *Rafael Mendonça França*
+
+*   Deprecated `Rails.config.active_job.skip_after_callbacks_if_terminated`.
+
+    *Rafael Mendonça França*
+
+*   Removed deprecated behavior that was not halting `after_enqueue`/`after_perform` callbacks when a
+    previous callback was halted with `throw :abort`.
+
+    *Rafael Mendonça França*
+
+*   Raise an `SerializationError` in `Serializer::ModuleSerializer`
+    if the module name is not present.
+
+    *Veerpal Brar*
+
+
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
+
+*   No changes.
+
+
 ## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
 *   Allow a job to retry indefinitely

data/lib/active_job/callbacks.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/callbacks"
-require "active_support/core_ext/object/with_options"
 require "active_support/core_ext/module/attribute_accessors"
 
 module ActiveJob
@@ -30,24 +29,16 @@ module ActiveJob
 
     included do
       class_attribute :return_false_on_aborted_enqueue, instance_accessor: false, instance_predicate: false, default: false
-      singleton_class.deprecate :return_false_on_aborted_enqueue, :return_false_on_aborted_enqueue=
       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=
 
-      with_options(skip_after_callbacks_if_terminated: skip_after_callbacks_if_terminated) do
-        define_callbacks :perform
-        define_callbacks :enqueue
-      end
+      define_callbacks :perform, skip_after_callbacks_if_terminated: true
+      define_callbacks :enqueue, skip_after_callbacks_if_terminated: true
     end
 
     # These methods will be included into any Active Job object, adding
     # callbacks for +perform+ and +enqueue+ methods.
     module ClassMethods
-      def inherited(klass)
-        klass.get_callbacks(:enqueue).config[:skip_after_callbacks_if_terminated] = skip_after_callbacks_if_terminated
-        klass.get_callbacks(:perform).config[:skip_after_callbacks_if_terminated] = skip_after_callbacks_if_terminated
-        super
-      end
-
       # Defines a callback that will get called right before the
       # job's perform method is executed.
       #
@@ -178,21 +169,5 @@ module ActiveJob
         set_callback(:enqueue, :around, *filters, &blk)
       end
     end
-
-    private
-      def halted_callback_hook(_filter, name) # :nodoc:
-        return super unless %i(enqueue perform).include?(name.to_sym)
-        callbacks = public_send("_#{name}_callbacks")
-
-        if !self.class.skip_after_callbacks_if_terminated && callbacks.any? { |c| c.kind == :after }
-          ActiveSupport::Deprecation.warn(<<~EOM)
-            In Rails 7.0, `after_enqueue`/`after_perform` callbacks no longer run if `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
-            To enable this behavior, uncomment the `config.active_job.skip_after_callbacks_if_terminated` config
-            in the new 6.1 framework defaults initializer.
-          EOM
-        end
-
-        super
-      end
   end
 end

data/lib/active_job/configured_job.rb

@@ -8,7 +8,7 @@ module ActiveJob
     end
 
     def perform_now(...)
-      @job_class.new(...).perform_now
+      @job_class.new(...).set(@options).perform_now
     end
 
     def perform_later(...)

data/lib/active_job/core.rb

@@ -156,6 +156,16 @@ module ActiveJob
       self.enqueued_at          = job_data["enqueued_at"]
     end
 
+    # Configures the job with the given options.
+    def set(options = {}) # :nodoc:
+      self.scheduled_at = options[:wait].seconds.from_now.to_f if options[:wait]
+      self.scheduled_at = options[:wait_until].to_f if options[:wait_until]
+      self.queue_name   = self.class.queue_name_from_part(options[:queue]) if options[:queue]
+      self.priority     = options[:priority].to_i if options[:priority]
+
+      self
+    end
+
     private
       def serialize_arguments_if_needed(arguments)
         if arguments_serialized?

data/lib/active_job/enqueuing.rb

@@ -57,10 +57,7 @@ module ActiveJob
     #    my_job_instance.enqueue wait_until: Date.tomorrow.midnight
     #    my_job_instance.enqueue priority: 10
     def enqueue(options = {})
-      self.scheduled_at = options[:wait].seconds.from_now.to_f if options[:wait]
-      self.scheduled_at = options[:wait_until].to_f if options[:wait_until]
-      self.queue_name   = self.class.queue_name_from_part(options[:queue]) if options[:queue]
-      self.priority     = options[:priority].to_i if options[:priority]
+      set(options)
       self.successfully_enqueued = false
 
       run_callbacks :enqueue do

data/lib/active_job/execution.rb

@@ -54,6 +54,7 @@ module ActiveJob
 
     private
       def _perform_job
+        ActiveSupport::ExecutionContext[:job] = self
         run_callbacks :perform do
           perform(*arguments)
         end

data/lib/active_job/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveJob
     MAJOR = 7
     MINOR = 0
     TINY  = 0
-    PRE   = "alpha1"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/railtie.rb

@@ -65,12 +65,8 @@ module ActiveJob
       if query_logs_tags_enabled
         app.config.active_record.query_log_tags << :job
 
-        ActiveSupport.on_load(:active_job) do
-          include ActiveJob::QueryTags
-        end
-
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::QueryLogs.taggings[:job] = ->(context) { context[:job].class.name unless context[:job].nil? }
+          ActiveRecord::QueryLogs.taggings[:job] = ->(context) { context[:job].class.name if context[:job] }
         end
       end
     end

data/lib/active_job/serializers/module_serializer.rb

@@ -4,6 +4,7 @@ module ActiveJob
   module Serializers
     class ModuleSerializer < ObjectSerializer # :nodoc:
       def serialize(constant)
+        raise SerializationError, "Serializing an anonymous class is not supported" unless constant.name
         super("value" => constant.name)
       end
 

data/lib/active_job/test_helper.rb

@@ -109,7 +109,7 @@ module ActiveJob
     #     end
     #   end
     #
-    # +:only+ and +:except+ options accepts Class, Array of Class or Proc. When passed a Proc,
+    # +:only+ and +:except+ options accept Class, Array of Class or Proc. When passed a Proc,
     # a hash containing the job's class and it's argument are passed as argument.
     #
     # Asserts the number of times a job is enqueued to a specific queue by passing +:queue+ option.
@@ -168,7 +168,7 @@ module ActiveJob
     #     end
     #   end
     #
-    # +:only+ and +:except+ options accepts Class, Array of Class or Proc. When passed a Proc,
+    # +:only+ and +:except+ options accept Class, Array of Class or Proc. When passed a Proc,
     # a hash containing the job's class and it's argument are passed as argument.
     #
     # Asserts that no jobs are enqueued to a specific queue by passing +:queue+ option
@@ -325,7 +325,7 @@ module ActiveJob
     #     end
     #   end
     #
-    # +:only+ and +:except+ options accepts Class, Array of Class or Proc. When passed a Proc,
+    # +:only+ and +:except+ options accept Class, Array of Class or Proc. When passed a Proc,
     # an instance of the job will be passed as argument.
     #
     # If the +:queue+ option is specified,
@@ -417,8 +417,20 @@ module ActiveJob
         end
       end
 
+      matching_class = potential_matches.select do |enqueued_job|
+        enqueued_job["job_class"] == job.to_s
+      end
+
       message = +"No enqueued job found with #{expected}"
-      message << "\n\nPotential matches: #{potential_matches.join("\n")}" if potential_matches.present?
+      if potential_matches.empty?
+        message << "\n\nNo jobs were enqueued"
+      elsif matching_class.empty?
+        message << "\n\nNo jobs of class #{expected[:job]} were enqueued, job classes enqueued: "
+        message << potential_matches.map { |job| job["job_class"] }.join(", ")
+      else
+        message << "\n\nPotential matches: #{matching_class.join("\n")}"
+      end
+
       assert matching_job, message
       instantiate_job(matching_job)
     end
@@ -507,8 +519,20 @@ module ActiveJob
         end
       end
 
+      matching_class = potential_matches.select do |enqueued_job|
+        enqueued_job["job_class"] == job.to_s
+      end
+
       message = +"No performed job found with #{expected}"
-      message << "\n\nPotential matches: #{potential_matches.join("\n")}" if potential_matches.present?
+      if potential_matches.empty?
+        message << "\n\nNo jobs were performed"
+      elsif matching_class.empty?
+        message << "\n\nNo jobs of class #{expected[:job]} were performed, job classes performed: "
+        message << potential_matches.map { |job| job["job_class"] }.join(", ")
+      else
+        message << "\n\nPotential matches: #{matching_class.join("\n")}"
+      end
+
       assert matching_job, message
 
       instantiate_job(matching_job)
@@ -555,7 +579,7 @@ module ActiveJob
     #     assert_performed_jobs 1
     #   end
     #
-    # +:only+ and +:except+ options accepts Class, Array of Class or Proc. When passed a Proc,
+    # +:only+ and +:except+ options accept Class, Array of Class or Proc. When passed a Proc,
     # an instance of the job will be passed as argument.
     #
     # If the +:queue+ option is specified,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 7.0.0.alpha1
+  version: 7.0.0.rc3
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-12-14 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.0.alpha1
+        version: 7.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.alpha1
+        version: 7.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,6 @@ files:
 - lib/active_job/instrumentation.rb
 - lib/active_job/log_subscriber.rb
 - lib/active_job/logging.rb
-- lib/active_job/query_tags.rb
 - lib/active_job/queue_adapter.rb
 - lib/active_job/queue_adapters.rb
 - lib/active_job/queue_adapters/async_adapter.rb
@@ -101,11 +100,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha1/activejob/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.rc3/activejob/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.rc3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/activejob
-post_install_message: 
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.rc3/activejob
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Job framework with pluggable queues.
 test_files: []

data/lib/active_job/query_tags.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveJob
-  module QueryTags # :nodoc:
-    extend ActiveSupport::Concern
-
-    included do
-      around_perform :expose_job_to_query_logs
-    end
-
-    private
-      def expose_job_to_query_logs(&block)
-        ActiveRecord::QueryLogs.set_context(job: self, &block)
-      end
-  end
-end