Default nil associations to [] when embedding in root

joefiorini · Feb 5, 2014 · f8e9bd8 · f8e9bd8
1 parent 9436d73
commit f8e9bd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -157,7 +157,7 @@ def embedded_in_root_associations
             if hash.has_key?(key)
               hash[key].concat(serialized_data).uniq!
             else
-              hash[key] = serialized_data
+              hash[key] = serialized_data || []
             end
           end
         end

diff --git a/test/unit/active_model/serializer/has_one_test.rb b/test/unit/active_model/serializer/has_one_test.rb
@@ -75,6 +75,21 @@ def profile
         }, @user_serializer.as_json)
       end
 
+      def test_associations_embedding_nil_ids_in_root_serialization_using_as_json
+        @association.embed = :ids
+        @association.embed_in_root = true
+        @user.instance_eval do
+          def profile
+            nil
+          end
+        end
+
+        assert_equal({
+          'user' => { name: 'Name 1', email: 'mail@server.com', 'profile_id' => nil },
+          'profiles' => []
+        }, @user_serializer.as_json)
+      end
+
       def test_associations_embedding_nil_objects_serialization_using_as_json
         @association.embed = :objects
         @user.instance_eval do