Merge pull request #682 from ride/json-api-root

Include root by default in JSON-API serializers

lib/active_model/serializer/adapter/json_api.rb

@@ -2,6 +2,11 @@ module ActiveModel
   class Serializer
     class Adapter
       class JsonApi < Adapter
+        def initialize(serializer, options = {})
+          super
+          serializer.root ||= true
+        end
+
         def serializable_hash(opts = {})
           @hash = serializer.attributes
 

test/action_controller/serialization_test.rb

@@ -13,6 +13,16 @@ def render_using_custom_root
           @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
           render json: @profile, root: "custom_root"
         end
+
+        def render_using_default_adapter_root
+          old_adapter = ActiveModel::Serializer.config.adapter
+          # JSON-API adapter sets root by default
+          ActiveModel::Serializer.config.adapter = ActiveModel::Serializer::Adapter::JsonApi
+          @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+          render json: @profile
+        ensure
+          ActiveModel::Serializer.config.adapter = old_adapter
+        end
       end
 
       tests MyController
@@ -31,6 +41,13 @@ def test_render_using_custom_root
         assert_equal 'application/json', @response.content_type
         assert_equal '{"custom_root":{"name":"Name 1","description":"Description 1"}}', @response.body
       end
+
+      def test_render_using_default_root
+        get :render_using_default_adapter_root
+
+        assert_equal 'application/json', @response.content_type
+        assert_equal '{"profile":{"name":"Name 1","description":"Description 1"}}', @response.body
+      end
     end
   end
 end