fixup! Allow resource level links to be defined

Author: superslau

lib/graphiti/serializer.rb

@@ -25,7 +25,7 @@ def self.inherited(klass)
     def as_jsonapi(*)
       super.tap do |hash|
         strip_relationships!(hash) if strip_relationships?
-        hash[:links] = @resource.links(@object) if @resource.links?
+        add_links!(hash)
       end
     end
 
@@ -50,6 +50,12 @@ def respond_to_missing?(method_name, include_private = true)
 
     private
 
+    def add_links!(hash)
+      return unless @resource.respond_to?(:links?)
+
+      hash[:links] = @resource.links(@object).compact if @resource.links?
+    end
+
     def strip_relationships!(hash)
       hash[:relationships]&.select! do |name, payload|
         payload.key?(:data)

spec/serialization_spec.rb

@@ -860,7 +860,7 @@ def admin?(object)
     end
   end
 
-  describe "links" do
+  describe "relationship links" do
     let!(:employee) { PORO::Employee.create }
 
     def positions
@@ -1377,4 +1377,38 @@ def classification
       end
     end
   end
+
+  describe "resource-level links" do
+    let!(:employee) { PORO::Employee.create(id: 123) }
+    context "by default" do
+      specify "are not emitted" do
+        render
+
+        expect(json["data"][0]).not_to have_key("links")
+      end
+    end
+
+    context "when specified" do
+      before do
+        resource.link :test_link do |model| "#{self.endpoint[:url]}/#{model.id}" end
+      end
+
+      it "links correctly" do
+        render
+        expect(json["data"][0]["links"]["test_link"])
+          .to eq("/poro/employees/123")
+      end
+    end
+
+    context "nil links" do
+      before do
+        resource.link :test_link do |model| nil end
+      end
+
+      specify "are omitted" do
+        render
+        expect(json["data"][0]["links"]).not_to have_key("test_link")
+      end
+    end
+  end
 end