Finish rebase.

Author: beauby

lib/active_model/serializer/adapter/json_api.rb

@@ -92,7 +92,8 @@ def _resource_objects_for(serializer, include_tree, is_primary, hashes = {})
           resource_object = Resource.new(
             resource_identifier,
             attributes_for(serializer),
-            relationships_for(serializer))
+            relationships_for(serializer),
+            links_for(serializer))
           hashes[resource_identifier] = { resource_object: resource_object, is_primary: is_primary }
 
           serializer.associations(include_tree).each do |association|

lib/active_model/serializer/adapter/json_api/resource.rb

@@ -2,11 +2,12 @@ module ActiveModel
   class Serializer
     module Adapter
       class JsonApi
-        Resource = Struct.new(:identifier, :attributes, :relationships) do
+        Resource = Struct.new(:identifier, :attributes, :relationships, :links) do
           def to_h
             hash = identifier.to_h
             hash[:attributes] = attributes if attributes.any?
             hash[:relationships] = Hash[relationships.map { |k, v| [k, v.to_h] }] if relationships.any?
+            hash[:links] = links if links.any?
 
             hash
           end