Merge pull request #1007 from jiajiawang/array_serializer_json_key_fix

Bug fix for ArraySerializer json_key

lib/active_model/serializer/array_serializer.rb

@@ -29,7 +29,7 @@ module ActiveModel
         if @objects.first
           @objects.first.json_key.pluralize
         else
-          @resource.name.downcase.pluralize if @resource.try(:name)
+          @resource.name.underscore.pluralize if @resource.try(:name)
         end
       end
 

test/array_serializer_test.rb

@@ -38,6 +38,17 @@ module ActiveModel
         assert_equal @serializer.meta, "the meta"
         assert_equal @serializer.meta_key, "the meta key"
       end
+
+      def test_json_key_when_resource_is_empty
+        Array.class_eval do
+          def name
+            'PostComment'
+          end
+        end
+        @post_comments = []
+        @serializer = ArraySerializer.new(@post_comments)
+        assert_equal @serializer.json_key, "post_comments"
+      end
     end
   end
 end