rails-api · joaomdmoura · Jul 23, 2015 · Jul 10, 2015 · Jul 10, 2015
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -169,7 +169,7 @@ def initialize(object, options = {})
     end
 
     def json_key
-      @root || self.class.root_name
+      @root || object.class.model_name.to_s.downcase
     end
 
     def id

diff --git a/test/adapter/json/belongs_to_test.rb b/test/adapter/json/belongs_to_test.rb
@@ -39,7 +39,7 @@ def test_include_nil_author_with_specified_serializer
             serializer = PostPreviewSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            assert_equal({posts: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], author: nil}}, adapter.serializable_hash)
+            assert_equal({post: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], author: nil}}, adapter.serializable_hash)
           end
         end
       end

diff --git a/test/adapter/json/collection_test.rb b/test/adapter/json/collection_test.rb
@@ -28,7 +28,7 @@ def test_with_serializer_option
             @serializer = ArraySerializer.new([@blog], serializer: CustomBlogSerializer)
             @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
 
-            expected = {custom_blogs:[{
+            expected = {blogs:[{
               id: 1,
               special_attribute: "Special",
               articles: [{id: 1,title: "Hello!!", body: "Hello, world!!"}, {id: 2, title: "New Post", body: "Body"}]

diff --git a/test/adapter/json/has_many_test.rb b/test/adapter/json/has_many_test.rb
@@ -38,7 +38,7 @@ def test_has_many_with_no_serializer
               tags: [
                 {"attributes"=>{"id"=>1, "name"=>"#hash_tag"}}
               ]
-            }.to_json, adapter.serializable_hash[:post_with_tags].to_json)
+            }.to_json, adapter.serializable_hash[:post].to_json)
           end
         end
       end

diff --git a/test/adapter/json_test.rb b/test/adapter/json_test.rb
@@ -39,10 +39,9 @@ def test_custom_keys
                     ],
             writer: {id: 1, name: "Steve K."},
             site: {id: 1, name: "My Blog!!"}
-            }, adapter.serializable_hash[:post_with_custom_keys])
+            }, adapter.serializable_hash[:post])
         end
       end
     end
   end
 end
-
diff --git a/test/serializers/attribute_test.rb b/test/serializers/attribute_test.rb
@@ -15,7 +15,7 @@ def test_attributes_definition
 
       def test_json_serializable_hash
         adapter = ActiveModel::Serializer::Adapter::Json.new(@blog_serializer)
-        assert_equal({alternate_blog: { id:1, title:"AMS Hints"}}, adapter.serializable_hash)
+        assert_equal({blog: { id:1, title:"AMS Hints"}}, adapter.serializable_hash)
       end
 
       def test_attribute_inheritance_with_key

diff --git a/test/serializers/meta_test.rb b/test/serializers/meta_test.rb
@@ -15,7 +15,7 @@ def test_meta_is_present_with_root
         serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10})
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
         expected = {
-          alternate_blog: {
+          blog: {
             id: 1,
             title: "AMS Hints"
           },
@@ -40,7 +40,7 @@ def test_meta_key_is_used
         serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10}, meta_key: "haha_meta")
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
         expected = {
-          alternate_blog: {
+          blog: {
             id: 1,
             title: "AMS Hints"
           },
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,7 +169,7 @@ def initialize(object, options = {}) @@
         end
         def json_key
-          @root || self.class.root_name
+          @root || object.class.model_name.to_s.downcase
         end
         def id
@@ Expand Down @@