Refactor add_links in JSONAPI adapter.

Author: beauby

lib/active_model/serializer/adapter/json_api.rb

@@ -29,7 +29,10 @@ def serializable_hash(options = nil)
               end
             end
 
-            add_links(options)
+            if serializer.paginated?
+              @hash[:links] ||= {}
+              @hash[:links].update(links_for(serializer, options))
+            end
           else
             primary_data = primary_data_for(serializer, options)
             relationships = relationships_for(serializer)
@@ -145,20 +148,7 @@ def _included_for(serializer, includes)
           end
         end
 
-        def add_links(options)
-          links = @hash.fetch(:links) { {} }
-          collection = serializer.object
-          @hash[:links] = add_pagination_links(links, collection, options) if paginated?(collection)
-        end
-
-        def add_pagination_links(links, resources, options)
-          pagination_links = ActiveModel::Serializer::Adapter::JsonApi::PaginationLinks.new(resources, options[:context]).serializable_hash(options)
-          links.update(pagination_links)
-        end
-
-        def paginated?(collection)
-          collection.respond_to?(:current_page) &&
-            collection.respond_to?(:total_pages) &&
-            collection.respond_to?(:size)
+        def links_for(serializer, options)
+          JsonApi::PaginationLinks.new(serializer.object, options[:context]).serializable_hash(options)
         end
 end

lib/active_model/serializer/array_serializer.rb

@@ -29,6 +29,12 @@ def json_key
         key = root || @serializers.first.try(:json_key) || object.try(:name).try(:underscore)
         key.try(:pluralize)
       end
+
+      def paginated?
+        object.respond_to?(:current_page) &&
+          object.respond_to?(:total_pages) &&
+          object.respond_to?(:size)
+      end
     end
   end
 end