Change syntax.

Author: beauby

lib/active_model/serializer.rb

@@ -33,6 +33,8 @@ class Serializer
       self._attributes ||= []
       class_attribute :_attributes_keys
       self._attributes_keys ||= {}
+      class_attribute :_links_blocks
+      self._links_blocks ||= {}
       serializer.class_attribute :_cache
       serializer.class_attribute :_fragmented
       serializer.class_attribute :_cache_key
@@ -45,6 +47,7 @@ class Serializer
     def self.inherited(base)
       base._attributes = _attributes.dup
       base._attributes_keys = _attributes_keys.dup
+      base._links_blocks = _links_blocks.dup
       base._cache_digest = digest_caller_file(caller.first)
       super
     end
@@ -53,8 +56,8 @@ def self.type(type)
       self._type = type
     end
 
-    def self.links(&block)
-      self._links_block = block
+    def self.link(name, &block)
+      _links_blocks[name] = block
     end
 
     def self.attributes(*attrs)
@@ -143,9 +146,7 @@ def self.get_serializer_for(klass)
       end
     end
 
-    attr_accessor :object, :root, :scope, :links
-    class_attribute :_type, instance_writer: false
-    class_attribute :_links_block, instance_writer: false
+    attr_accessor :object, :root, :scope
 
     def initialize(object, options = {})
       self.object = object
@@ -159,19 +160,18 @@ def initialize(object, options = {})
           define_method scope_name, lambda { scope }
         end
       end
-
-      instance_eval(&_links_block) if _links_block
-    end
-
-    def link(name, value)
-      self.links ||= {}
-      self.links[name] = value
     end
 
     def json_key
       root || object.class.model_name.to_s.underscore
     end
 
+    def links
+      self.class._links_blocks.each_with_object({}) do |(name, block), hash|
+        hash[name] = instance_eval(&block)
+      end
+    end
+
     def attributes
       attributes = self.class._attributes.dup
 

test/adapter/json_api/links_test.rb

@@ -1,26 +1,39 @@
 require 'test_helper'
 
-LinkPost = Class.new(Model)
-class LinkPostSerializer < ActiveModel::Serializer
-  belongs_to :link_author
-end
-
-LinkAuthor = Class.new(Model)
-class LinkAuthorSerializer < ActiveModel::Serializer
-  links do
-    link :self, href: "//example.com/link_author/#{object.id}"
-  end
-end
-
 module ActiveModel
   class Serializer
     module Adapter
       class JsonApi
         class LinksTest < Minitest::Test
+          LinkAuthor = Class.new(::Model)
+          class LinkAuthorSerializer < ActiveModel::Serializer
+            link :self do
+              { href: "//example.com/link_author/#{object.id}" }
+            end
+          end
+
           def setup
+            @post = Post.new(id: 1337, comments: [], author: nil)
             @author = LinkAuthor.new(id: 1337)
           end
 
+          def test_toplevel_links
+            hash = ActiveModel::SerializableResource.new(
+              @post,
+              adapter: :json_api,
+              links: {
+                self: {
+                  href: '//example.com/posts'
+                }
+              }).serializable_hash
+            expected = {
+              self: {
+                href: '//example.com/posts'
+              }
+            }
+            assert_equal(expected, hash[:links])
+          end
+
           def test_resource_links
             hash = serializable(@author, adapter: :json_api).serializable_hash
             expected = {