activejob 5.2.1.1 → 5.2.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc514bd9f97da2bbe477eee38eb5bb3b21df663baba450c0a08df2e6ced0a2b
-  data.tar.gz: d1ec4911647ab5d83071cad3af50bb4b70d2427498eba2944ad3b0598118006c
+  metadata.gz: 67232e1851713cf072bc96e4451b10930205933fcce173ac4101f056df36ccce
+  data.tar.gz: 9a3a46381e090c488ab44073e3413e6c2da119179d1bf4a3962c3dac50bb440b
 SHA512:
-  metadata.gz: e376b5e32ccbd0b183b7f43c7103326bdb0ebdf32e83ea9e4b170df9b6f6fd0c6b51a98a56fb3a02c45df0a0e84f5e43da3d4b8b158d13c1d35a66cfa92b147a
-  data.tar.gz: 027a340eca2bed0400ac5c785d0bc89b7b07cd91fdb564032a34037f617c845548fc1671ab6388adbaf9aa061e0642ad7814cfbb3f01f5f295c7fb3dcc248cc8
+  metadata.gz: 06b88781fd187207d998377c715f971fe7f42fee7a44995fec6ba34b3aa64642b4f7e9e747b3d237ce2749bab6183bf3d427a6313bf7bf55cfd54392c29f8428
+  data.tar.gz: 6b1827f4f4583812e1d997d1a0d938c844359c09844c42373480851ba0253f7f1eb557c4e7ccdf49a5a94ceab09a55911d98b7411eab4dae56b36b3f0cde4f9c

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 5.2.2.rc1 (November 28, 2018) ##
+
+*   Make sure `assert_enqueued_with()` & `assert_performed_with()` work reliably with hash arguments.
+
+    *Sharang Dashputre*
+
+*   Restore `ActionController::Parameters` support to `ActiveJob::Arguments.serialize`.
+
+    *Bernie Chiu*
+
+*   Restore `HashWithIndifferentAccess` support to `ActiveJob::Arguments.deserialize`.
+
+    *Gannon McGibbon*
+
+*   Include deserialized arguments in job instances returned from
+    `assert_enqueued_with` and `assert_performed_with`
+
+    *Alan Wu*
+
+*   Increment execution count before deserialize arguments.
+
+    Currently, the execution count increments after deserializes arguments.
+    Therefore, if an error occurs with deserialize, it retries indefinitely.
+
+    *Yuji Yaginuma*
+
+
 ## Rails 5.2.1.1 (November 27, 2018) ##
 
 *   Do not deserialize GlobalID objects that were not generated by Active Job.

data/lib/active_job/arguments.rb

@@ -61,14 +61,14 @@ module ActiveJob
         when Array
           argument.map { |arg| serialize_argument(arg) }
         when ActiveSupport::HashWithIndifferentAccess
-          result = serialize_hash(argument)
-          result[WITH_INDIFFERENT_ACCESS_KEY] = serialize_argument(true)
-          result
+          serialize_indifferent_hash(argument)
         when Hash
           symbol_keys = argument.each_key.grep(Symbol).map(&:to_s)
           result = serialize_hash(argument)
           result[SYMBOL_KEYS_KEY] = symbol_keys
           result
+        when -> (arg) { arg.respond_to?(:permitted?) }
+          serialize_indifferent_hash(argument.to_h)
         else
           raise SerializationError.new("Unsupported argument type: #{argument.class.name}")
         end
@@ -136,8 +136,17 @@ module ActiveJob
         end
       end
 
+      def serialize_indifferent_hash(indifferent_hash)
+        result = serialize_hash(indifferent_hash)
+        result[WITH_INDIFFERENT_ACCESS_KEY] = serialize_argument(true)
+        result
+      end
+
       def transform_symbol_keys(hash, symbol_keys)
-        hash.transform_keys do |key|
+        # NOTE: HashWithIndifferentAccess#transform_keys always
+        # returns stringified keys with indifferent access
+        # so we call #to_h here to ensure keys are symbolized.
+        hash.to_h.transform_keys do |key|
           if symbol_keys.include?(key)
             key.to_sym
           else

data/lib/active_job/execution.rb

@@ -31,11 +31,11 @@ module ActiveJob
     #
     #   MyJob.new(*args).perform_now
     def perform_now
+      # Guard against jobs that were persisted before we started counting executions by zeroing out nil counters
+      self.executions = (executions || 0) + 1
+
       deserialize_arguments_if_needed
       run_callbacks :perform do
-        # Guard against jobs that were persisted before we started counting executions by zeroing out nil counters
-        self.executions = (executions || 0) + 1
-
         perform(*arguments)
       end
     rescue => exception

data/lib/active_job/gem_version.rb

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

data/lib/active_job/test_helper.rb

@@ -300,11 +300,12 @@ module ActiveJob
     def assert_enqueued_with(job: nil, args: nil, at: nil, queue: nil)
       original_enqueued_jobs_count = enqueued_jobs.count
       expected = { job: job, args: args, at: at, queue: queue }.compact
-      serialized_args = serialize_args_for_assertion(expected)
+      expected_args = prepare_args_for_assertion(expected)
       yield
       in_block_jobs = enqueued_jobs.drop(original_enqueued_jobs_count)
       matching_job = in_block_jobs.find do |in_block_job|
-        serialized_args.all? { |key, value| value == in_block_job[key] }
+        deserialized_job = deserialize_args_for_assertion(in_block_job)
+        expected_args.all? { |key, value| value == deserialized_job[key] }
       end
       assert matching_job, "No enqueued job found with #{expected}"
       instantiate_job(matching_job)
@@ -324,11 +325,12 @@ module ActiveJob
     def assert_performed_with(job: nil, args: nil, at: nil, queue: nil)
       original_performed_jobs_count = performed_jobs.count
       expected = { job: job, args: args, at: at, queue: queue }.compact
-      serialized_args = serialize_args_for_assertion(expected)
+      expected_args = prepare_args_for_assertion(expected)
       perform_enqueued_jobs { yield }
       in_block_jobs = performed_jobs.drop(original_performed_jobs_count)
       matching_job = in_block_jobs.find do |in_block_job|
-        serialized_args.all? { |key, value| value == in_block_job[key] }
+        deserialized_job = deserialize_args_for_assertion(in_block_job)
+        expected_args.all? { |key, value| value == deserialized_job[key] }
       end
       assert matching_job, "No performed job found with #{expected}"
       instantiate_job(matching_job)
@@ -420,15 +422,21 @@ module ActiveJob
         end
       end
 
-      def serialize_args_for_assertion(args)
-        args.dup.tap do |serialized_args|
-          serialized_args[:args] = ActiveJob::Arguments.serialize(serialized_args[:args]) if serialized_args[:args]
-          serialized_args[:at]   = serialized_args[:at].to_f if serialized_args[:at]
+      def prepare_args_for_assertion(args)
+        args.dup.tap do |arguments|
+          arguments[:at] = arguments[:at].to_f if arguments[:at]
+        end
+      end
+
+      def deserialize_args_for_assertion(job)
+        job.dup.tap do |new_job|
+          new_job[:args] = ActiveJob::Arguments.deserialize(new_job[:args]) if new_job[:args]
         end
       end
 
       def instantiate_job(payload)
-        job = payload[:job].new(*payload[:args])
+        args = ActiveJob::Arguments.deserialize(payload[:args])
+        job = payload[:job].new(*args)
         job.scheduled_at = Time.at(payload[:at]) if payload.key?(:at)
         job.queue_name = payload[:queue]
         job

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.2.1.1
+  version: 5.2.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -86,8 +86,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.1.1/activejob
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.1.1/activejob/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.2.rc1/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.2.rc1/activejob/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,9 +99,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6