activejob 6.0.2.2 → 6.0.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59defc07bc7739ed26d358406f96ede0a8737198da0440c2673e73012d0a217a
-  data.tar.gz: e247580a7cfcfb77c6489ed4de534bda2aaf340354c546a1f0b8f50cecdbc28e
+  metadata.gz: b5f5eec4ecd6c8a74c23a1def2d7721d5d4373ddc3fb54f3d51cc2f5d041c2ba
+  data.tar.gz: e0a6670180a0f3d99e5c68645ff2fb88bdca5bc216a87f7c8c2ec502bab91b8b
 SHA512:
-  metadata.gz: cae6e8017199f92a53b539e1cff49fb694d2835850ba55d4410f90621684c7bf8f968ac7c634f0e316d90a869d25c1524d89a76a21945184b797d3be7ec59cbf
-  data.tar.gz: c2df4ebd7f33e8ab05b0a4628fa51f6b9766c91da4b3e7bee1b3ffc6ca3882753f46e4c9e80cc79cdaecaa5f6654a6d949e40253cdfed4b1d8390b1600afc627
+  metadata.gz: a0038ef9bdb847508829f59320cb4e80cb35c1089e46e12765c8d6f19be5b45c9049b7fd7e24cf85318f2c32d1839d75a7b13c48712417a140139b72b42c566d
+  data.tar.gz: 90be65d1d2ec6cee70d7aed484e842242d5c38fdc042fea6661399f480973de206cad81a7482e06bf62453272185c4ef6f193b187ca8f65ae25bb917a8766af3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## Rails 6.0.3.rc1 (April 30, 2020) ##
+
+*   While using `perform_enqueued_jobs` test helper enqueued jobs must be stored for the later check with
+    `assert_enqueued_with`.
+
+    *Dmitry Polushkin*
+
+*   Add queue name support to Que adapter
+
+    *Brad Nauta*, *Wojciech Wnętrzak*
+
+
+## Rails 6.0.2.2 (March 19, 2020) ##
+
+*   No changes.
+
+
 ## Rails 6.0.2.1 (December 18, 2019) ##
 
 *   No changes.

data/README.md

@@ -130,4 +130,4 @@ Bug reports for the Ruby on Rails project can be filed here:
 
 Feature requests should be discussed on the rails-core mailing list here:
 
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core

data/lib/active_job/arguments.rb

@@ -45,7 +45,6 @@ module ActiveJob
     end
 
     private
-
       # :nodoc:
       PERMITTED_TYPES = [ NilClass, String, Integer, Float, BigDecimal, TrueClass, FalseClass ]
       # :nodoc:
@@ -53,6 +52,8 @@ module ActiveJob
       # :nodoc:
       SYMBOL_KEYS_KEY = "_aj_symbol_keys"
       # :nodoc:
+      RUBY2_KEYWORDS_KEY = "_aj_ruby2_keywords"
+      # :nodoc:
       WITH_INDIFFERENT_ACCESS_KEY = "_aj_hash_with_indifferent_access"
       # :nodoc:
       OBJECT_SERIALIZER_KEY = "_aj_serialized"
@@ -61,10 +62,39 @@ module ActiveJob
       RESERVED_KEYS = [
         GLOBALID_KEY, GLOBALID_KEY.to_sym,
         SYMBOL_KEYS_KEY, SYMBOL_KEYS_KEY.to_sym,
+        RUBY2_KEYWORDS_KEY, RUBY2_KEYWORDS_KEY.to_sym,
         OBJECT_SERIALIZER_KEY, OBJECT_SERIALIZER_KEY.to_sym,
         WITH_INDIFFERENT_ACCESS_KEY, WITH_INDIFFERENT_ACCESS_KEY.to_sym,
       ]
-      private_constant :PERMITTED_TYPES, :RESERVED_KEYS, :GLOBALID_KEY, :SYMBOL_KEYS_KEY, :WITH_INDIFFERENT_ACCESS_KEY
+      private_constant :PERMITTED_TYPES, :RESERVED_KEYS, :GLOBALID_KEY,
+        :SYMBOL_KEYS_KEY, :RUBY2_KEYWORDS_KEY, :WITH_INDIFFERENT_ACCESS_KEY
+
+      unless Hash.respond_to?(:ruby2_keywords_hash?) && Hash.respond_to?(:ruby2_keywords_hash)
+        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
+              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)
+            end
+          end
+        }
+      end
 
       def serialize_argument(argument)
         case argument
@@ -77,9 +107,14 @@ module ActiveJob
         when ActiveSupport::HashWithIndifferentAccess
           serialize_indifferent_hash(argument)
         when Hash
-          symbol_keys = argument.each_key.grep(Symbol).map(&:to_s)
+          symbol_keys = argument.each_key.grep(Symbol).map!(&:to_s)
+          aj_hash_key = if Hash.ruby2_keywords_hash?(argument)
+            RUBY2_KEYWORDS_KEY
+          else
+            SYMBOL_KEYS_KEY
+          end
           result = serialize_hash(argument)
-          result[SYMBOL_KEYS_KEY] = symbol_keys
+          result[aj_hash_key] = symbol_keys
           result
         when -> (arg) { arg.respond_to?(:permitted?) }
           serialize_indifferent_hash(argument.to_h)
@@ -133,6 +168,9 @@ module ActiveJob
           result = result.with_indifferent_access
         elsif symbol_keys = result.delete(SYMBOL_KEYS_KEY)
           result = transform_symbol_keys(result, symbol_keys)
+        elsif symbol_keys = result.delete(RUBY2_KEYWORDS_KEY)
+          result = transform_symbol_keys(result, symbol_keys)
+          result = Hash.ruby2_keywords_hash(result)
         end
         result
       end

data/lib/active_job/configured_job.rb

@@ -10,9 +10,11 @@ module ActiveJob
     def perform_now(*args)
       @job_class.new(*args).perform_now
     end
+    ruby2_keywords(:perform_now) if respond_to?(:ruby2_keywords, true)
 
     def perform_later(*args)
       @job_class.new(*args).enqueue @options
     end
+    ruby2_keywords(:perform_later) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/active_job/core.rb

@@ -86,6 +86,7 @@ module ActiveJob
       @executions = 0
       @exception_executions = {}
     end
+    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Returns a hash with the job data that can safely be passed to the
     # queuing adapter.

data/lib/active_job/enqueuing.rb

@@ -21,11 +21,13 @@ module ActiveJob
       def perform_later(*args)
         job_or_instantiate(*args).enqueue
       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)
     end
 
     # Enqueues the job to be performed by the queue adapter.

data/lib/active_job/exceptions.rb

@@ -115,7 +115,7 @@ module ActiveJob
     #    end
     #  end
     def retry_job(options = {})
-      instrument :enqueue_retry, options.slice(:error, :wait) do
+      instrument :enqueue_retry, **options.slice(:error, :wait) do
         enqueue options
       end
     end

data/lib/active_job/execution.rb

@@ -17,6 +17,7 @@ module ActiveJob
       def perform_now(*args)
         job_or_instantiate(*args).perform_now
       end
+      ruby2_keywords(:perform_now) if respond_to?(:ruby2_keywords, true)
 
       def execute(job_data) #:nodoc:
         ActiveJob::Callbacks.run_callbacks(:execute) do

data/lib/active_job/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveJob
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 2
-    PRE   = "2"
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/queue_adapters/que_adapter.rb

@@ -18,13 +18,13 @@ 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
+        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name
         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, run_at: Time.at(timestamp)
+        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name, run_at: Time.at(timestamp)
         job.provider_job_id = que_job.attrs["job_id"]
         que_job
       end

data/lib/active_job/queue_adapters/test_adapter.rb

@@ -26,28 +26,28 @@ module ActiveJob
       end
 
       def enqueue(job) #:nodoc:
-        return if filtered?(job)
-
         job_data = job_to_hash(job)
-        perform_or_enqueue(perform_enqueued_jobs, job, job_data)
+        perform_or_enqueue(perform_enqueued_jobs && !filtered?(job), job, job_data)
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        return if filtered?(job)
-
         job_data = job_to_hash(job, at: timestamp)
-        perform_or_enqueue(perform_enqueued_at_jobs, job, job_data)
+        perform_or_enqueue(perform_enqueued_at_jobs && !filtered?(job), job, job_data)
       end
 
       private
         def job_to_hash(job, extras = {})
-          { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras)
+          job.serialize.tap do |job_data|
+            job_data[:job] = job.class
+            job_data[:args] = job_data.fetch("arguments")
+            job_data[:queue] = job_data.fetch("queue_name")
+          end.merge(extras)
         end
 
         def perform_or_enqueue(perform, job, job_data)
           if perform
             performed_jobs << job_data
-            Base.execute job.serialize
+            Base.execute(job.serialize)
           else
             enqueued_jobs << job_data
           end

data/lib/active_job/serializers/date_serializer.rb

@@ -12,7 +12,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           Date
         end

data/lib/active_job/serializers/date_time_serializer.rb

@@ -12,7 +12,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           DateTime
         end

data/lib/active_job/serializers/duration_serializer.rb

@@ -15,7 +15,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           ActiveSupport::Duration
         end

data/lib/active_job/serializers/object_serializer.rb

@@ -44,7 +44,6 @@ module ActiveJob
       end
 
       private
-
         # The class of the object that will be serialized.
         def klass # :doc:
           raise NotImplementedError

data/lib/active_job/serializers/symbol_serializer.rb

@@ -12,7 +12,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           Symbol
         end

data/lib/active_job/serializers/time_serializer.rb

@@ -12,7 +12,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           Time
         end

data/lib/active_job/serializers/time_with_zone_serializer.rb

@@ -12,7 +12,6 @@ module ActiveJob
       end
 
       private
-
         def klass
           ActiveSupport::TimeWithZone
         end

data/lib/active_job/test_helper.rb

@@ -351,9 +351,21 @@ module ActiveJob
     #     assert_enqueued_with(job: MyJob, at: Date.tomorrow.noon)
     #   end
     #
+    # The +at+ and +args+ arguments also accept a proc.
     #
-    # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to return a boolean value determining if
+    # To the +at+ proc, it will get passed the actual job's at argument.
+    #
+    #   def test_assert_enqueued_with
+    #     expected_time = ->(at) do
+    #       (Date.yesterday..Date.tomorrow).cover?(at)
+    #     end
+    #
+    #     MyJob.set(at: Date.today.noon).perform_later
+    #     assert_enqueued_with(job: MyJob, at: expected_time)
+    #   end
+    #
+    # To the +args+ proc, it will get passed the actual job's arguments
+    # Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -366,7 +378,6 @@ module ActiveJob
     #     assert_enqueued_with(job: MyJob, args: expected_args, queue: 'low')
     #   end
     #
-    #
     # If a block is passed, asserts that the block will cause the job to be
     # enqueued with the given arguments.
     #
@@ -425,8 +436,21 @@ module ActiveJob
     #     assert_performed_with(job: MyJob, at: Date.tomorrow.noon)
     #   end
     #
-    # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to return a boolean value determining if
+    # The +at+ and +args+ arguments also accept a proc.
+    #
+    # To the +at+ proc, it will get passed the actual job's at argument.
+    #
+    #   def test_assert_enqueued_with
+    #     expected_time = ->(at) do
+    #       (Date.yesterday..Date.tomorrow).cover?(at)
+    #     end
+    #
+    #     MyJob.set(at: Date.today.noon).perform_later
+    #     assert_enqueued_with(job: MyJob, at: expected_time)
+    #   end
+    #
+    # To the +args+ proc, it will get passed the actual job's arguments
+    # Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -630,7 +654,10 @@ module ActiveJob
 
       def prepare_args_for_assertion(args)
         args.dup.tap do |arguments|
-          arguments[:at] = round_time_arguments(arguments[:at]) if arguments[:at]
+          if arguments[:at] && !arguments[:at].respond_to?(:call)
+            at_range = arguments[:at] - 1..arguments[:at] + 1
+            arguments[:at] = ->(at) { at_range.cover?(at) }
+          end
           arguments[:args] = round_time_arguments(arguments[:args]) if arguments[:args]
         end
       end
@@ -650,16 +677,15 @@ module ActiveJob
 
       def deserialize_args_for_assertion(job)
         job.dup.tap do |new_job|
-          new_job[:at] = round_time_arguments(Time.at(new_job[:at])) if new_job[:at]
+          new_job[:at] = Time.at(new_job[:at]) if new_job[:at]
           new_job[:args] = ActiveJob::Arguments.deserialize(new_job[:args]) if new_job[:args]
         end
       end
 
       def instantiate_job(payload)
-        args = ActiveJob::Arguments.deserialize(payload[:args])
-        job = payload[:job].new(*args)
+        job = payload[:job].deserialize(payload)
         job.scheduled_at = Time.at(payload[:at]) if payload.key?(:at)
-        job.queue_name = payload[:queue]
+        job.send(:deserialize_arguments_if_needed)
         job
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 6.0.2.2
+  version: 6.0.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -95,10 +95,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.2.2/activejob/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.2.2/
-  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.2.2/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.rc1/activejob/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.3.rc1/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.rc1/activejob
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -110,11 +110,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Job framework with pluggable queues.