activejob 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06565d1267b4596e11732d12bd80c67c2c56804d5dc147e8d95aaa4e6ae76377
-  data.tar.gz: da0d32071a22e4db4011275e44c1feddba2a5812686c0ff5e8f813bdfc05e49e
+  metadata.gz: 7ec0339a8983bf95c5187133495c6e1040c036e6d33eb4232b356b3168e49c87
+  data.tar.gz: 61e797a26d9b2095069dd191d0ca8771ad05e72578ca59a9ee8df6e2ccd4664d
 SHA512:
-  metadata.gz: 68d94c0c68bb56b61f558c8e03df5c888c1968348512995f00ea40dbb5eb84776244ace807e764573da394c2b4b9631c01dff57f14f4c8a64ccdf3ad9974c0d3
-  data.tar.gz: 13d3f3921e071c93e7b22b02338b616663a6fb79284cec4a3bce01caef46974f704cc660bb1da8801627584538baa11f74eca5c3ffe30abc669c9196faa254f7
+  metadata.gz: aafb4d12bc22e1579568a44fcc5a74fe23eb7a919401b367a53f4933259e5145664f82c6861f004f3dc8c0f4b1ab95e6bed0bfa3f08acb09042e148932f2e1fc
+  data.tar.gz: 8e805ac4f844e3529aed3bd832cb41fa29db12e847a37ca6346cb76d4ce05fe8f65350249915f6abc9be5b9e00d8692a92475eb9132ed436df2737720523023d

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## Rails 7.1.3 (January 16, 2024) ##
+
+*   Do not trigger immediate loading of `ActiveJob::Base` when loading `ActiveJob::TestHelper`.
+
+    *Maxime Réty*
+
+*   Preserve the serialized timezone when deserializing `ActiveSupport::TimeWithZone` arguments.
+
+    *Joshua Young*
+
+*   Fix ActiveJob arguments serialization to correctly serialize String subclasses having custom serializers.
+
+    *fatkodima*
+
+
 ## Rails 7.1.2 (November 10, 2023) ##
 
 *   No changes.

data/lib/active_job/arguments.rb

@@ -46,8 +46,6 @@ module ActiveJob
     end
 
     private
-      # :nodoc:
-      PERMITTED_TYPES = [ NilClass, String, Integer, Float, TrueClass, FalseClass ]
       # :nodoc:
       GLOBALID_KEY = "_aj_globalid"
       # :nodoc:
@@ -67,13 +65,23 @@ module ActiveJob
         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,
+      private_constant :RESERVED_KEYS, :GLOBALID_KEY,
         :SYMBOL_KEYS_KEY, :RUBY2_KEYWORDS_KEY, :WITH_INDIFFERENT_ACCESS_KEY
 
       def serialize_argument(argument)
         case argument
-        when *PERMITTED_TYPES
+        when nil, true, false, Integer, Float # Types that can hardly be subclassed
           argument
+        when String
+          if argument.class == String
+            argument
+          else
+            begin
+              Serializers.serialize(argument)
+            rescue SerializationError
+              argument
+            end
+          end
         when GlobalID::Identification
           convert_to_global_id_hash(argument)
         when Array
@@ -90,10 +98,10 @@ module ActiveJob
           result = serialize_hash(argument)
           result[aj_hash_key] = symbol_keys
           result
-        when -> (arg) { arg.respond_to?(:permitted?) && arg.respond_to?(:to_h) }
-          serialize_indifferent_hash(argument.to_h)
         else
-          if BigDecimal === argument && !ActiveJob.use_big_decimal_serializer
+          if argument.respond_to?(:permitted?) && argument.respond_to?(:to_h)
+            serialize_indifferent_hash(argument.to_h)
+          elsif BigDecimal === argument && !ActiveJob.use_big_decimal_serializer
             ActiveJob.deprecator.warn(<<~MSG)
               Primitive serialization of BigDecimal job arguments is deprecated as it may serialize via .to_s using certain queue adapters.
               Enable config.active_job.use_big_decimal_serializer to use BigDecimalSerializer instead, which will be mandatory in Rails 7.2.
@@ -101,16 +109,16 @@ module ActiveJob
               Note that if your application has multiple replicas, you should only enable this setting after successfully deploying your app to Rails 7.1 first.
               This will ensure that during your deployment all replicas are capable of deserializing arguments serialized with BigDecimalSerializer.
             MSG
-            return argument
+            argument
+          else
+            Serializers.serialize(argument)
           end
-
-          Serializers.serialize(argument)
         end
       end
 
       def deserialize_argument(argument)
         case argument
-        when *PERMITTED_TYPES
+        when nil, true, false, String, Integer, Float
           argument
         when BigDecimal # BigDecimal may have been legacy serialized; Remove in 7.2
           argument

data/lib/active_job/callbacks.rb

@@ -132,7 +132,8 @@ module ActiveJob
       #     queue_as :default
       #
       #     after_enqueue do |job|
-      #       $statsd.increment "enqueue-video-job.success"
+      #       result = job.successfully_enqueued? ? "success" : "failure"
+      #       $statsd.increment "enqueue-video-job.#{result}"
       #     end
       #
       #     def perform(video_id)

data/lib/active_job/gem_version.rb

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

data/lib/active_job/serializers/time_with_zone_serializer.rb

@@ -2,9 +2,18 @@
 
 module ActiveJob
   module Serializers
-    class TimeWithZoneSerializer < TimeObjectSerializer # :nodoc:
+    class TimeWithZoneSerializer < ObjectSerializer # :nodoc:
+      NANO_PRECISION = 9
+
+      def serialize(time_with_zone)
+        super(
+          "value" => time_with_zone.iso8601(NANO_PRECISION),
+          "time_zone" => time_with_zone.time_zone.tzinfo.name
+        )
+      end
+
       def deserialize(hash)
-        Time.iso8601(hash["value"]).in_time_zone
+        Time.iso8601(hash["value"]).in_time_zone(hash["time_zone"] || Time.zone)
       end
 
       private

data/lib/active_job/test_helper.rb

@@ -34,7 +34,9 @@ module ActiveJob
       end
     end
 
-    ActiveJob::Base.include(TestQueueAdapter)
+    ActiveSupport.on_load(:active_job) do
+      ActiveJob::Base.include(TestQueueAdapter)
+    end
 
     def before_setup # :nodoc:
       test_adapter = queue_adapter_for_test

metadata

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