Deep serialization

1 files changed, 28 insertions, 4 deletions

diff --git a/lib/active_job/arguments.rb b/lib/active_job/arguments.rb
index d1cc6d3177..6fe52397da 100644
--- a/lib/active_job/arguments.rb
+++ b/lib/active_job/arguments.rb
@@ -3,14 +3,19 @@ require 'active_support/core_ext/object/try'
 
 module ActiveJob
   class Arguments
-    TYPE_WHITELIST = [ NilClass, Fixnum, Float, String, TrueClass, FalseClass, Hash, Array, Bignum ]
+    TYPE_WHITELIST = [ NilClass, Fixnum, Float, String, TrueClass, FalseClass, Bignum ]
 
     def self.serialize(arguments)
       arguments.collect do |argument|
-        if argument.respond_to?(:global_id)
+        case argument
+        when ActiveModel::GlobalIdentification
           argument.global_id
-        elsif TYPE_WHITELIST.include?(argument.class)
+        when *TYPE_WHITELIST
           argument
+        when Hash
+          Hash[ argument.map{ |key, value| [ serialize_hash_key(key), serialize([value]).first ] } ]
+        when Array
+          serialize(argument)
         else
           raise "Unsupported argument type: #{argument.class.name}"
         end
@@ -18,7 +23,26 @@ module ActiveJob
     end
 
     def self.deserialize(arguments)
-      arguments.collect { |argument| ActiveModel::GlobalLocator.locate(argument) || argument }
+      arguments.collect do |argument|
+        case argument
+        when Array
+          deserialize(argument)
+        when Hash
+          argument.with_indifferent_access
+        else
+          ActiveModel::GlobalLocator.locate(argument) || argument
+        end
+      end
     end
+
+    private
+      def self.serialize_hash_key(key)
+        case key
+        when String, Symbol
+          key.to_s
+        else
+          raise "Unsupported hash key type: #{key.class.name}"
+        end
+      end
   end
 end