Merge 38cb096 into 3201c63

lib/active_model/serializable.rb

@@ -3,7 +3,15 @@ module Serializable
     def as_json(options={})
       if root = options.fetch(:root, json_key)
         hash = { root => serializable_object }
-        hash.merge!(serializable_data)
+
+        serializable_data.each_pair do |key, value|
+          if hash[key].is_a?(Array)
+            hash[key].concat(value)
+          else
+            hash[key] = value
+          end
+        end
+
         hash
       else
         serializable_object
@@ -22,4 +30,4 @@ def embedded_in_root_associations
       {}
     end
   end
-end
+end

test/fixtures/poro.rb

@@ -35,6 +35,15 @@ def comments
 class Comment < Model
 end
 
+class Catalog < Model
+  def sub_catalogs
+    @attributes[:sub_catalogs] ||= [
+      Catalog.new(name: 'Catalog 1', :sub_catalogs => []),
+      Catalog.new(name: 'Catalog 2', :sub_catalogs => [])
+    ]
+  end
+end
+
 ###
 ## Serializers
 ###
@@ -62,3 +71,8 @@ class PostSerializer < ActiveModel::Serializer
 class CommentSerializer < ActiveModel::Serializer
   attributes :content
 end
+
+class CatalogSerializer < ActiveModel::Serializer
+  attributes :name
+  has_many :sub_catalogs, root: :catalogs, embed: :ids, embed_in_root: true #serializer: CatalogSerializer
+end

test/unit/active_model/array_serializer/root_test.rb

@@ -98,5 +98,22 @@ def test_root_as_argument_takes_precedence
         }, @rooted_serializer.as_json(root: :argument))
       end
     end
+
+    class DuplicateRootKeysTest < Minitest::Test
+      def setup
+        @catalog = Catalog.new({ name: 'Catalog root' })
+        @serializer = ArraySerializer.new([@catalog], root: :catalogs)
+      end
+
+      def test_duplicate_root_keys_using_as_json
+        assert_equal({
+          catalogs: [
+            { name: 'Catalog root', 'sub_catalog_ids' => @catalog.sub_catalogs.map(&:object_id) },
+            { name: 'Catalog 1', 'sub_catalog_ids' => [] },
+            { name: 'Catalog 2', 'sub_catalog_ids' => [] },
+          ]
+        }, @serializer.as_json)
+      end
+    end
   end
 end