开源软件构建与测试

_service:tar_scm:rubygem-activejob.spec Changed

@@ -1,7 +1,7 @@
 %global gem_name activejob
 
 Name:		rubygem-%{gem_name}
-Version:	6.1.4.1
+Version:	7.0.4
 Release:	1
 Summary:	Job framework with pluggable queues
 License:	MIT
@@ -9,18 +9,19 @@
 Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Tests are not shipped with the gem
 # git clone https://github.com/rails/rails.git
-# cd rails/activejob && git archive -v -o activejob-6.1.4.1-tests.txz v6.1.4.1 test/
-Source1:	%{gem_name}-%{version}%{?prerelease}-tests.txz
+# cd rails/activejob && git archive -v -o activejob-7.0.4-tests.txz v7.0.4 test/
+Source1:        %{gem_name}-%{version}-tests.txz
 # The tools are needed for the test suite, are however unpackaged in gem file.
 # git clone http://github.com/rails/rails.git --no-checkout
-# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/
-Source2:	rails-%{version}-tools.txz
+# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/
+Source2:        rails-%{version}-tools.txz
 
 BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
 BuildRequires:	ruby >= 2.2.2
 BuildRequires:	rubygem(activesupport) = %{version}
 BuildRequires:	rubygem(globalid)
+BuildRequires:  rubygem(zeitwerk)
 BuildArch:	noarch
 
 %description
@@ -53,9 +54,16 @@
 
 sed -i '/ActiveJob::QueueAdapters::SneakersAdapter/ d' test/cases/exceptions_test.rb
 
+mv test/cases/delayed_job_adapter_test.rb{,.disable}
+
+
+
+# Do not execute integration tests, otherwise Rails's generators are required.
+# Bigdecimal does not get auto-required
+# https://github.com/rails/rails/issues/44399
 ADAPTERS='async inline test'
 for ADAPTER in ${ADAPTERS}; do
-    AJ_ADAPTER=${ADAPTER} ruby -Ilib:test \
+    AJ_ADAPTER=${ADAPTER} ruby -rbigdecimal -Ilib:test \
         -e 'Dir.glob "./test/cases/**/*_test.rb", &method(:require)'
 done
 
@@ -74,6 +82,9 @@
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Thu Jan 19 2023 wangkai <wangkai385@h-partners.com> - 7.0.4-1
+- Upgrade to version 7.0.4
+
 * Mon May 02 2022 wangkerong <wangkerong@h-partners.com>- 6.1.4.1-1
 - Upgrade to 6.1.4.1

_service Changed

_service:tar_scm:activejob-6.1.4.1-tests.txz Deleted

_service:tar_scm:activejob-7.0.4-tests.txz Added

_service:tar_scm:activejob-6.1.4.1.gem/checksums.yaml.gz -> _service:tar_scm:activejob-7.0.4.gem/checksums.yaml.gz Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/CHANGELOG.md -> _service:tar_scm:activejob-7.0.4.gem/data/CHANGELOG.md Changed

@@ -1,176 +1,182 @@
-## Rails 6.1.4.1 (August 19, 2021) ##
+## Rails 7.0.4 (September 09, 2022) ##
 
-*   No changes.
+*   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 6.1.4 (June 24, 2021) ##
+## Rails 7.0.3.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.2 (May 05, 2021) ##
+## Rails 7.0.3 (May 09, 2022) ##
 
-*   No changes.
+*   Add missing `bigdecimal` require in `ActiveJob::Arguments`
 
+    Could cause `uninitialized constant ActiveJob::Arguments::BigDecimal (NameError)`
+    when loading Active Job in isolation.
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+    *Jean Boussier*
+
+## Rails 7.0.2.4 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3 (February 17, 2021) ##
+## Rails 7.0.2.3 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2.1 (February 10, 2021) ##
+## Rails 7.0.2.2 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2 (February 09, 2021) ##
+## Rails 7.0.2.1 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.1 (January 07, 2021) ##
-
-*   Make `retry_job` return the job that was created.
+## Rails 7.0.2 (February 08, 2022) ##
 
-    *Rafael Mendonça França*
+*   No changes.
 
-*   Include `ActiveSupport::Testing::Assertions` in `ActiveJob::TestHelpers`.
 
-    *Mikkel Malmberg*
+## Rails 7.0.1 (January 06, 2022) ##
 
+*   Allow testing `discard_on/retry_on ActiveJob::DeserializationError`
 
-## Rails 6.1.0 (December 09, 2020) ##
+    Previously in `perform_enqueued_jobs`, `deserialize_arguments_if_needed`
+    was called before calling `perform_now`. When a record no longer exists
+    and is serialized using GlobalID this led to raising
+    an `ActiveJob::DeserializationError` before reaching `perform_now` call.
+    This behaviour makes difficult testing the job `discard_on/retry_on` logic.
 
-*   Recover nano precision when serializing `Time`, `TimeWithZone` and `DateTime` objects.
+    Now `deserialize_arguments_if_needed` call is postponed to when `perform_now`
+    is called.
 
-    *Alan Tan*
+    Example:
 
-*   Deprecate `config.active_job.return_false_on_aborted_enqueue`.
+    ```ruby
+    class UpdateUserJob < ActiveJob::Base
+      discard_on ActiveJob::DeserializationError
 
-    *Rafael Mendonça França*
+      def perform(user)
+        # ...
+      end
+    end
 
-*   Return `false` when enqueuing a job is aborted.
+    # In the test
+    User.destroy_all
+    assert_nothing_raised do
+      perform_enqueued_jobs only: UpdateUserJob
+    end
+    ```
 
-    *Rafael Mendonça França*
+    *Jacopo Beschi*
 
-*   While using `perform_enqueued_jobs` test helper enqueued jobs must be stored for the later check with
-    `assert_enqueued_with`.
 
-    *Dmitry Polushkin*
+## Rails 7.0.0 (December 15, 2021) ##
 
-*   `ActiveJob::TestCase#perform_enqueued_jobs` without a block removes performed jobs from the queue.
+*   No changes.
 
-    That way the helper can be called multiple times and not perform a job invocation multiple times.
 
-    ```ruby
-    def test_jobs
-      HelloJob.perform_later("rafael")
-      perform_enqueued_jobs # only runs with "rafael"
-      HelloJob.perform_later("david")
-      perform_enqueued_jobs # only runs with "david"
-    end
-    ```
+## Rails 7.0.0.rc3 (December 14, 2021) ##
 
-    *Étienne Barrié*
+*   No changes.
 
-*   `ActiveJob::TestCase#perform_enqueued_jobs` will no longer perform retries:
 
-    When calling `perform_enqueued_jobs` without a block, the adapter will
-    now perform jobs that are **already** in the queue. Jobs that will end up in
-    the queue afterwards won't be performed.
+## Rails 7.0.0.rc2 (December 14, 2021) ##
 
-    This change only affects `perform_enqueued_jobs` when no block is given.
+*   No changes.
 
-    *Edouard Chin*
+## Rails 7.0.0.rc1 (December 06, 2021) ##
 
-*   Add queue name support to Que adapter.
+*   Remove deprecated `:return_false_on_aborted_enqueue` option.
 
-    *Brad Nauta*, *Wojciech Wnętrzak*
+    *Rafael Mendonça França*
 
-*   Don't run `after_enqueue` and `after_perform` callbacks if the callback chain is halted.
+*   Deprecated `Rails.config.active_job.skip_after_callbacks_if_terminated`.
 
-        class MyJob < ApplicationJob
-          before_enqueue { throw(:abort) }
-          after_enqueue { # won't enter here anymore }
-        end
+    *Rafael Mendonça França*
 
-    `after_enqueue` and `after_perform` callbacks will no longer run if the callback chain is halted.
-    This behaviour is a breaking change and won't take effect until Rails 6.2.
-    To enable this behaviour in your app right now, you can add in your app's configuration file
-    `config.active_job.skip_after_callbacks_if_terminated = true`.
+*   Removed deprecated behavior that was not halting `after_enqueue`/`after_perform` callbacks when a
+    previous callback was halted with `throw :abort`.
 
-    *Edouard Chin*
+    *Rafael Mendonça França*
 
-*   Fix enqueuing and performing incorrect logging message.
+*   Raise an `SerializationError` in `Serializer::ModuleSerializer`
+    if the module name is not present.
 
-    Jobs will no longer always log "Enqueued MyJob" or "Performed MyJob" when they actually didn't get enqueued/performed.
+    *Veerpal Brar*
 
-    ```ruby
-      class MyJob < ApplicationJob
-        before_enqueue { throw(:abort) }
-      end
 
-      MyJob.perform_later # Will no longer log "Enqueued MyJob" since job wasn't even enqueued through adapter.
-    ```
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
 
-    A new message will be logged in case a job couldn't be enqueued, either because the callback chain was halted or
-    because an exception happened during enqueuing. (i.e. Redis is down when you try to enqueue your job)
+*   No changes.
 
-    *Edouard Chin*
 
-*   Add an option to disable logging of the job arguments when enqueuing and executing the job.
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-        class SensitiveJob < ApplicationJob
-          self.log_arguments = false
+*   Allow a job to retry indefinitely
 
-          def perform(my_sensitive_argument)
-          end
-        end
+    The `attempts` parameter of the `retry_on` method now accepts the
+    symbol reference `:unlimited` in addition to a specific number of retry

_service:tar_scm:activejob-6.1.4.1.gem/data/MIT-LICENSE -> _service:tar_scm:activejob-7.0.4.gem/data/MIT-LICENSE Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/README.md -> _service:tar_scm:activejob-7.0.4.gem/data/README.md Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/arguments.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/arguments.rb Changed

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "bigdecimal"
 require "active_support/core_ext/hash"
 
 module ActiveJob
@@ -7,7 +8,7 @@
   #
   # Wraps the original exception raised as +cause+.
   class DeserializationError < StandardError
-    def initialize #:nodoc:
+    def initialize # :nodoc:
       super("Error while trying to deserialize arguments: #{$!.message}")
       set_backtrace $!.backtrace
     end
@@ -17,8 +18,8 @@
   # currently support String, Integer, Float, NilClass, TrueClass, FalseClass,
   # BigDecimal, Symbol, Date, Time, DateTime, ActiveSupport::TimeWithZone,
   # ActiveSupport::Duration, Hash, ActiveSupport::HashWithIndifferentAccess,
-  # Array or GlobalID::Identification instances, although this can be extended
-  # by adding custom serializers.
+  # Array, Range, or GlobalID::Identification instances, although this can be
+  # extended by adding custom serializers.
   # Raised if you set the key for a Hash something else than a string or
   # a symbol. Also raised when trying to serialize an object which can't be
   # identified with a GlobalID - such as an unpersisted Active Record model.
@@ -73,24 +74,19 @@
         using Module.new {
           refine Hash do
             class << Hash
-              if RUBY_VERSION >= "2.7"
-                def ruby2_keywords_hash?(hash)
-                  !new(*hash).default.equal?(hash)
-                end
-              else
-                def ruby2_keywords_hash?(hash)
-                  false
-                end
+              def ruby2_keywords_hash?(hash)
+                !new(*hash).default.equal?(hash)
               end
 
               def ruby2_keywords_hash(hash)
                 _ruby2_keywords_hash(**hash)
               end
 
-              private def _ruby2_keywords_hash(*args)
-                args.last
-              end
-              ruby2_keywords(:_ruby2_keywords_hash) if respond_to?(:ruby2_keywords, true)
+              private
+                def _ruby2_keywords_hash(*args)
+                  args.last
+                end
+                ruby2_keywords(:_ruby2_keywords_hash)
             end
           end
         }

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/base.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/base.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/callbacks.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/callbacks.rb Changed

@@ -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
@@ -29,25 +28,16 @@
     end
 
     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 +168,5 @@
         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 6.2, `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

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/configured_job.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/configured_job.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/core.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/core.rb Changed

@@ -43,6 +43,16 @@
     # Track when a job was enqueued
     attr_accessor :enqueued_at
 
+    # Track whether the adapter received the job successfully.
+    attr_writer :successfully_enqueued # :nodoc:
+
+    def successfully_enqueued?
+      @successfully_enqueued
+    end
+
+    # Track any exceptions raised by the backend so callers can inspect the errors.
+    attr_accessor :enqueue_error
+
     # These methods will be included into any Active Job object, adding
     # helpers for de/serialization and creation of job instances.
     module ClassMethods
@@ -87,7 +97,7 @@
       @exception_executions = {}
       @timezone   = Time.zone&.name
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
+    ruby2_keywords(:initialize)
 
     # Returns a hash with the job data that can safely be passed to the
     # queuing adapter.
@@ -146,6 +156,16 @@
       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?

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/enqueuing.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/enqueuing.rb Changed

@@ -4,6 +4,11 @@
 
 module ActiveJob
   # Provides behavior for enqueuing jobs.
+
+  # Can be raised by adapters if they wish to communicate to the caller a reason
+  # why the adapter was unexpectedly unable to enqueue a job.
+  class EnqueueError < StandardError; end
+
   module Enqueuing
     extend ActiveSupport::Concern
 
@@ -12,22 +17,28 @@
       # Push a job onto the queue. By default the arguments must be either String,
       # Integer, Float, NilClass, TrueClass, FalseClass, BigDecimal, Symbol, Date,
       # Time, DateTime, ActiveSupport::TimeWithZone, ActiveSupport::Duration,
-      # Hash, ActiveSupport::HashWithIndifferentAccess, Array or
+      # Hash, ActiveSupport::HashWithIndifferentAccess, Array, Range, or
       # GlobalID::Identification instances, although this can be extended by adding
       # custom serializers.
       #
       # Returns an instance of the job class queued with arguments available in
-      # Job#arguments.
-      def perform_later(*args)
-        job_or_instantiate(*args).enqueue
+      # Job#arguments or false if the enqueue did not succeed.
+      #
+      # After the attempted enqueue, the job will be yielded to an optional block.
+      def perform_later(...)
+        job = job_or_instantiate(...)
+        enqueue_result = job.enqueue
+
+        yield job if block_given?
+
+        enqueue_result
       end
-      ruby2_keywords(:perform_later) if respond_to?(:ruby2_keywords, true)
 
       private
         def job_or_instantiate(*args) # :doc:
           args.first.is_a?(self) ? args.first : new(*args)
         end
-        ruby2_keywords(:job_or_instantiate) if respond_to?(:ruby2_keywords, true)
+        ruby2_keywords(:job_or_instantiate)
     end
 
     # Enqueues the job to be performed by the queue adapter.
@@ -46,11 +57,8 @@
     #    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
-      successfully_enqueued = false
+      set(options)
+      self.successfully_enqueued = false
 
       run_callbacks :enqueue do
         if scheduled_at
@@ -59,10 +67,12 @@
           queue_adapter.enqueue self
         end
 
-        successfully_enqueued = true
+        self.successfully_enqueued = true
+      rescue EnqueueError => e
+        self.enqueue_error = e
       end
 
-      if successfully_enqueued
+      if successfully_enqueued?
         self
       else
         false

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/exceptions.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/exceptions.rb Changed

@@ -25,7 +25,8 @@
       #   as a computing proc that takes the number of executions so far as an argument, or as a symbol reference of
       #   <tt>:exponentially_longer</tt>, which applies the wait algorithm of <tt>((executions**4) + (Kernel.rand * (executions**4) * jitter)) + 2</tt>
       #   (first wait ~3s, then ~18s, then ~83s, etc)
-      # * <tt>:attempts</tt> - Re-enqueues the job the specified number of times (default: 5 attempts)
+      # * <tt>:attempts</tt> - Re-enqueues the job the specified number of times (default: 5 attempts) or a symbol reference of <tt>:unlimited</tt>
+      #   to retry the job until it succeeds
       # * <tt>:queue</tt> - Re-enqueues the job on a different queue
       # * <tt>:priority</tt> - Re-enqueues the job with a different priority
       # * <tt>:jitter</tt> - A random delay of wait time used when calculating backoff. The default is 15% (0.15) which represents the upper bound of possible wait time (expressed as a percentage)
@@ -35,6 +36,7 @@
       #  class RemoteServiceJob < ActiveJob::Base
       #    retry_on CustomAppException # defaults to ~3s wait, 5 attempts
       #    retry_on AnotherCustomAppException, wait: ->(executions) { executions * 2 }
+      #    retry_on CustomInfrastructureException, wait: 5.minutes, attempts: :unlimited
       #
       #    retry_on ActiveRecord::Deadlocked, wait: 5.seconds, attempts: 3
       #    retry_on Net::OpenTimeout, Timeout::Error, wait: :exponentially_longer, attempts: 10 # retries at most 10 times for Net::OpenTimeout and Timeout::Error combined
@@ -56,7 +58,7 @@
       def retry_on(*exceptions, wait: 3.seconds, attempts: 5, queue: nil, priority: nil, jitter: JITTER_DEFAULT)
         rescue_from(*exceptions) do |error|
           executions = executions_for(exceptions)
-          if executions < attempts
+          if attempts == :unlimited || executions < attempts
             retry_job wait: determine_delay(seconds_or_duration_or_algorithm: wait, executions: executions, jitter: jitter), queue: queue, priority: priority, error: error
           else
             if block_given?

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/execution.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/execution.rb Changed

@@ -14,12 +14,11 @@
       #
       #   MyJob.perform_now("mike")
       #
-      def perform_now(*args)
-        job_or_instantiate(*args).perform_now
+      def perform_now(...)
+        job_or_instantiate(...).perform_now
       end
-      ruby2_keywords(:perform_now) if respond_to?(:ruby2_keywords, true)
 
-      def execute(job_data) #:nodoc:
+      def execute(job_data) # :nodoc:
         ActiveJob::Callbacks.run_callbacks(:execute) do
           job = deserialize(job_data)
           job.perform_now
@@ -44,15 +43,21 @@
 
       deserialize_arguments_if_needed
 
-      run_callbacks :perform do
-        perform(*arguments)
-      end
-    rescue => exception
+      _perform_job
+    rescue Exception => exception
       rescue_with_handler(exception) || raise
     end
 
     def perform(*)
       fail NotImplementedError
     end
+
+    private
+      def _perform_job
+        ActiveSupport::ExecutionContext:job = self
+        run_callbacks :perform do
+          perform(*arguments)
+        end
+      end
   end
 end

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/gem_version.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/gem_version.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/instrumentation.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/instrumentation.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/log_subscriber.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/log_subscriber.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/logging.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/logging.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/async_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/async_adapter.rb Changed

@@ -36,23 +36,23 @@
         @scheduler = Scheduler.new(**executor_options)
       end
 
-      def enqueue(job) #:nodoc:
+      def enqueue(job) # :nodoc:
         @scheduler.enqueue JobWrapper.new(job), queue_name: job.queue_name
       end
 
-      def enqueue_at(job, timestamp) #:nodoc:
+      def enqueue_at(job, timestamp) # :nodoc:
         @scheduler.enqueue_at JobWrapper.new(job), timestamp, queue_name: job.queue_name
       end
 
       # Gracefully stop processing jobs. Finishes in-progress work and handles
       # any new jobs following the executor's fallback policy (`caller_runs`).
       # Waits for termination by default. Pass `wait: false` to continue.
-      def shutdown(wait: true) #:nodoc:
+      def shutdown(wait: true) # :nodoc:
         @scheduler.shutdown wait: wait
       end
 
       # Used for our test suite.
-      def immediate=(immediate) #:nodoc:
+      def immediate=(immediate) # :nodoc:
         @scheduler.immediate = immediate
       end
 
@@ -60,7 +60,7 @@
       # performing them in-process, but we do so anyway for parity with other
       # adapters and deployment environments. Otherwise, serialization bugs
       # may creep in undetected.
-      class JobWrapper #:nodoc:
+      class JobWrapper # :nodoc:
         def initialize(job)
           job.provider_job_id = SecureRandom.uuid
           @job_data = job.serialize
@@ -71,7 +71,7 @@
         end
       end
 
-      class Scheduler #:nodoc:
+      class Scheduler # :nodoc:
         DEFAULT_EXECUTOR_OPTIONS = {
           min_threads:     0,
           max_threads:     Concurrent.processor_count,

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/backburner_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/backburner_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/delayed_job_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/delayed_job_adapter.rb Changed

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "delayed_job"
+require "active_support/core_ext/string/inflections"
 
 module ActiveJob
   module QueueAdapters
@@ -15,19 +16,19 @@
     #
     #   Rails.application.config.active_job.queue_adapter = :delayed_job
     class DelayedJobAdapter
-      def enqueue(job) #:nodoc:
+      def enqueue(job) # :nodoc:
         delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, priority: job.priority)
         job.provider_job_id = delayed_job.id
         delayed_job
       end
 
-      def enqueue_at(job, timestamp) #:nodoc:
+      def enqueue_at(job, timestamp) # :nodoc:
         delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, priority: job.priority, run_at: Time.at(timestamp))
         job.provider_job_id = delayed_job.id
         delayed_job
       end
 
-      class JobWrapper #:nodoc:
+      class JobWrapper # :nodoc:
         attr_accessor :job_data
 
         def initialize(job_data)
@@ -35,12 +36,21 @@
         end
 
         def display_name
-          "#{job_data'job_class'} #{job_data'job_id'} from DelayedJob(#{job_data'queue_name'}) with arguments: #{job_data'arguments'}"
+          base_name = "#{job_data"job_class"} #{job_data"job_id"} from DelayedJob(#{job_data"queue_name"})"
+
+          return base_name unless log_arguments?
+
+          "#{base_name} with arguments: #{job_data"arguments"}"
         end
 
         def perform
           Base.execute(job_data)
         end
+
+        private
+          def log_arguments?
+            job_data"job_class".constantize.log_arguments?
+          end
       end
     end
   end

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/inline_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/inline_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/que_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/que_adapter.rb Changed

@@ -17,23 +17,45 @@
     #
     #   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
+      def enqueue(job) # :nodoc:
+        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)
+      def enqueue_at(job, timestamp) # :nodoc:
+        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

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/queue_classic_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/queue_classic_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/resque_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/resque_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/sidekiq_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/sidekiq_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/sneakers_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/sneakers_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/sucker_punch_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/sucker_punch_adapter.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_adapters/test_adapter.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_adapters/test_adapter.rb Changed

@@ -5,10 +5,10 @@
     # == Test adapter for Active Job
     #
     # The test adapter should be used only in testing. Along with
-    # <tt>ActiveJob::TestCase</tt> and <tt>ActiveJob::TestHelper</tt>
+    # ActiveJob::TestCase and ActiveJob::TestHelper
     # it makes a great tool to test your Rails application.
     #
-    # To use the test adapter set queue_adapter config to +:test+.
+    # To use the test adapter set +queue_adapter+ config to +:test+.
     #
     #   Rails.application.config.active_job.queue_adapter = :test
     class TestAdapter
@@ -25,12 +25,12 @@
         @performed_jobs ||= 
       end
 
-      def enqueue(job) #:nodoc:
+      def enqueue(job) # :nodoc:
         job_data = job_to_hash(job)
         perform_or_enqueue(perform_enqueued_jobs && !filtered?(job), job, job_data)
       end
 
-      def enqueue_at(job, timestamp) #:nodoc:
+      def enqueue_at(job, timestamp) # :nodoc:
         job_data = job_to_hash(job, at: timestamp)
         perform_or_enqueue(perform_enqueued_at_jobs && !filtered?(job), job, job_data)
       end
@@ -41,6 +41,7 @@
             job_data:job = job.class
             job_data:args = job_data.fetch("arguments")
             job_data:queue = job_data.fetch("queue_name")
+            job_data:priority = job_data.fetch("priority")
           end.merge(extras)
         end

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/queue_name.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/queue_name.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/railtie.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/railtie.rb Changed

@@ -8,6 +8,7 @@
   class Railtie < Rails::Railtie # :nodoc:
     config.active_job = ActiveSupport::OrderedOptions.new
     config.active_job.custom_serializers = 
+    config.active_job.log_query_tags_around_perform = true
 
     initializer "active_job.logger" do
       ActiveSupport.on_load(:active_job) { self.logger = ::Rails.logger }
@@ -15,7 +16,7 @@
 
     initializer "active_job.custom_serializers" do |app|
       config.after_initialize do
-        custom_serializers = app.config.active_job.delete(:custom_serializers)
+        custom_serializers = app.config.active_job.custom_serializers
         ActiveJob::Serializers.add_serializers custom_serializers
       end
     end
@@ -25,6 +26,12 @@
       options.queue_adapter ||= :async
 
       ActiveSupport.on_load(:active_job) do
+        # Configs used in other initializers
+        options = options.except(
+          :log_query_tags_around_perform,
+          :custom_serializers
+        )
+
         options.each do  |k, v|
           k = "#{k}="
           send(k, v) if respond_to? k
@@ -49,5 +56,19 @@
         end
       end
     end
+
+    initializer "active_job.query_log_tags" do |app|
+      query_logs_tags_enabled = app.config.respond_to?(:active_record) &&
+        app.config.active_record.query_log_tags_enabled &&
+        app.config.active_job.log_query_tags_around_perform
+
+      if query_logs_tags_enabled
+        app.config.active_record.query_log_tags << :job
+
+        ActiveSupport.on_load(:active_record) do
+          ActiveRecord::QueryLogs.taggings:job = ->(context) { context:job.class.name if context:job }
+        end
+      end
+    end
   end
 end

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/serializers.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/serializers.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/serializers/module_serializer.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/serializers/module_serializer.rb Changed

_service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/serializers/range_serializer.rb Added

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/test_helper.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/test_helper.rb Changed

@@ -57,12 +57,12 @@
     # Specifies the queue adapter to use with all Active Job test helpers.
     #
     # Returns an instance of the queue adapter and defaults to
-    # <tt>ActiveJob::QueueAdapters::TestAdapter</tt>.
+    # ActiveJob::QueueAdapters::TestAdapter.
     #
     # Note: The adapter provided by this method must provide some additional
-    # methods from those expected of a standard <tt>ActiveJob::QueueAdapter</tt>
+    # methods from those expected of a standard ActiveJob::QueueAdapter
     # in order to be used with the active job test helpers. Refer to
-    # <tt>ActiveJob::QueueAdapters::TestAdapter</tt>.
+    # ActiveJob::QueueAdapters::TestAdapter.
     def queue_adapter_for_test
       ActiveJob::QueueAdapters::TestAdapter.new
     end
@@ -109,7 +109,7 @@
     #     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.
@@ -124,7 +124,7 @@
       if block_given?
         original_jobs = enqueued_jobs_with(only: only, except: except, queue: queue)
 
-        assert_nothing_raised(&block)
+        _assert_nothing_raised_or_warn("assert_enqueued_jobs", &block)
 
         new_jobs = enqueued_jobs_with(only: only, except: except, queue: queue)
 
@@ -168,7 +168,7 @@
     #     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 @@
     #     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,
@@ -389,15 +389,15 @@
     #       MyJob.set(wait_until: Date.tomorrow.noon).perform_later
     #     end
     #   end
-    def assert_enqueued_with(job: nil, args: nil, at: nil, queue: nil, &block)
-      expected = { job: job, args: args, at: at, queue: queue }.compact
+    def assert_enqueued_with(job: nil, args: nil, at: nil, queue: nil, priority: nil, &block)
+      expected = { job: job, args: args, at: at, queue: queue, priority: priority }.compact
       expected_args = prepare_args_for_assertion(expected)
       potential_matches = 
 
       if block_given?
         original_enqueued_jobs = enqueued_jobs.dup
 
-        assert_nothing_raised(&block)
+        _assert_nothing_raised_or_warn("assert_enqueued_with", &block)
 
         jobs = enqueued_jobs - original_enqueued_jobs
       else
@@ -417,8 +417,20 @@
         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
@@ -479,8 +491,8 @@
     #       MyJob.set(wait_until: Date.tomorrow.noon).perform_later
     #     end
     #   end
-    def assert_performed_with(job: nil, args: nil, at: nil, queue: nil, &block)
-      expected = { job: job, args: args, at: at, queue: queue }.compact
+    def assert_performed_with(job: nil, args: nil, at: nil, queue: nil, priority: nil, &block)
+      expected = { job: job, args: args, at: at, queue: queue, priority: priority }.compact
       expected_args = prepare_args_for_assertion(expected)
       potential_matches = 
 
@@ -507,8 +519,20 @@
         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 @@
     #     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,
@@ -591,7 +615,7 @@
         queue_adapter.queue = queue
         queue_adapter.at = at
 
-        assert_nothing_raised(&block)
+        _assert_nothing_raised_or_warn("perform_enqueued_jobs", &block)
       ensure
         queue_adapter.perform_enqueued_jobs = old_perform_enqueued_jobs
         queue_adapter.perform_enqueued_at_jobs = old_perform_enqueued_at_jobs
@@ -664,7 +688,7 @@
         enqueued_jobs_with(only: only, except: except, queue: queue, at: at) do |payload|
           queue_adapter.enqueued_jobs.delete(payload)
           queue_adapter.performed_jobs << payload
-          instantiate_job(payload).perform_now
+          instantiate_job(payload, skip_deserialize_arguments: true).perform_now
         end.count
       end
 
@@ -684,10 +708,10 @@
         end
       end
 
-      def instantiate_job(payload)
+      def instantiate_job(payload, skip_deserialize_arguments: false)
         job = payload:job.deserialize(payload)
         job.scheduled_at = Time.at(payload:at) if payload.key?(:at)
-        job.send(:deserialize_arguments_if_needed)
+        job.send(:deserialize_arguments_if_needed) unless skip_deserialize_arguments
         job
       end

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/timezones.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/timezones.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/translation.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/translation.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/data/lib/active_job/version.rb -> _service:tar_scm:activejob-7.0.4.gem/data/lib/active_job/version.rb Changed

_service:tar_scm:activejob-6.1.4.1.gem/metadata.gz -> _service:tar_scm:activejob-7.0.4.gem/metadata.gz Changed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 6.1.4.1
+  version: 7.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: 
-date: 2021-08-19 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 @@
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,7 @@
 - lib/active_job/serializers/duration_serializer.rb
 - lib/active_job/serializers/module_serializer.rb
 - lib/active_job/serializers/object_serializer.rb
+- lib/active_job/serializers/range_serializer.rb
 - lib/active_job/serializers/symbol_serializer.rb
 - lib/active_job/serializers/time_object_serializer.rb
 - lib/active_job/serializers/time_serializer.rb
@@ -99,10 +100,11 @@
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.1/activejob/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.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/v6.1.4.1/activejob
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/activejob
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: 
 require_paths:
@@ -111,14 +113,14 @@
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: 
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Job framework with pluggable queues.

_service:tar_scm:rails-6.1.4.1-tools.txz Deleted

_service:tar_scm:rails-7.0.4-tools.txz Added

Changes of Revision 2