From 343f8b96bd663a32efa9678a7525b7de12aaf720 Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <lucas.hosseini@gmail.com>
Date: Mon, 31 Aug 2015 06:25:20 +0200
Subject: [PATCH] Fix bug preventing id overriding.

---
 lib/active_model/serializer/adapter/json_api.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
index 2447ca03..4566accb 100644
--- a/lib/active_model/serializer/adapter/json_api.rb
+++ b/lib/active_model/serializer/adapter/json_api.rb
@@ -50,7 +50,8 @@ module ActiveModel
                  else
                    serializer.object.class.model_name.singular
                  end
-          id = serializer.object.id.to_s
+          id = serializer.id.to_s if serializer.respond_to?('id')
+          id ||= serializer.object.id.to_s
 
           { id: id, type: type }
         end