Merge pull request #696 from ggordon/explicit_serializer

Explicitly set serializer for associations

lib/active_model/serializer/adapter/json_api.rb

@@ -24,7 +24,6 @@ module ActiveModel
             end
           else
             @hash[@root] = attributes_for_serializer(serializer, @options)
-
             add_resource_links(@hash[@root], serializer)
           end
 
@@ -52,7 +51,7 @@ module ActiveModel
           resource[:links] ||= {}
           resource[:links][name] = nil
 
-          if serializer
+          if serializer && serializer.object
             type = serialized_object_type(serializer)
             if name.to_s == type || !type
               resource[:links][name] = serializer.id.to_s