Merge pull request #826 from knapo/dont-call-link-builder-when-custom-self-is-present

Don't call link_builder when custom link is provided

Author: lgebhardt

lib/jsonapi/resource_serializer.rb

@@ -230,9 +230,9 @@ def meta_hash(source)
     end
 
     def links_hash(source)
-      {
-        self: link_builder.self_link(source)
-      }.merge(custom_links_hash(source)).compact
+      links = custom_links_hash(source)
+      links[:self] = link_builder.self_link(source) unless links.key?(:self)
+      links.compact
     end
 
     def custom_links_hash(source)