remove resource and options attr_reader from array_serialize

lib/active_model/serializer/adapter/json_api.rb

@@ -20,7 +20,7 @@ module ActiveModel
           options ||= {}
           if serializer.respond_to?(:each)
             serializer.each do |s|
-              result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash(options)
+              result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash({})
               @hash[:data] << result[:data]
 
               if result[:included]
@@ -29,9 +29,9 @@ module ActiveModel
               end
             end
 
-            include_pagination_links if serializer.options[:pagination]
+            add_links(options)
           else
-            @hash[:data] = attributes_for_serializer(serializer, options)
+            @hash[:data] = attributes_for_serializer(serializer, {})
             add_resource_relationships(@hash[:data], serializer)
           end
           @hash
@@ -161,18 +161,14 @@ module ActiveModel
           end
         end
 
-        def include_pagination_links
-          return if page_links.empty?
-
-          links? ? @hash[:links].merge!(page_links) : @hash[:links] = page_links
+        def add_links(options)
+          links = @hash.fetch(:links) { {} }
+          resources = serializer.instance_variable_get(:@resource)
+          @hash[:links] = add_pagination_links(links, resources, options) if @options[:pagination]
         end
 
-        def page_links
-          @links ||= JsonApi::PaginationLinks.new(serializer.resource, serializer.options).page_links
-        end
-
-        def links?
-          !@hash[:links].nil?
+        def add_pagination_links(links, resources, options)
+          links.update(JsonApi::PaginationLinks.new(resources).serializable_hash(options))
         end
       end
     end

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

@@ -5,18 +5,19 @@ module ActiveModel
         class PaginationLinks
           FIRST_PAGE = 1
 
-          attr_reader :collection, :options
+          attr_reader :collection
 
-          def initialize(collection, options={})
+          def initialize(collection)
             raise_unless_any_gem_installed
             @collection = collection
-            @options = options
           end
 
-          def page_links
+          def serializable_hash(options = {})
             pages_from.each_with_object({}) do |(key, value), hash|
+              query_parameters = options.fetch(:query_parameters) { {} }
               params = query_parameters.merge(page: { number: value, size: collection.size }).to_query
-              hash[key] = "#{url}?#{params}"
+
+              hash[key] = "#{url(options)}?#{params}"
             end
           end
 
@@ -44,17 +45,9 @@ module ActiveModel
               "Please install either dependency by adding one of those to your Gemfile"
           end
 
-          def url
-            return default_url unless options && options[:links] && options[:links][:self]
-            options[:links][:self]
-          end
-
-          def default_url
-            options[:original_url]
-          end
-
-          def query_parameters
-            options[:query_parameters] ? options[:query_parameters] : {}
+          def url(options)
+            self_link = options.fetch(:links) {{}}
+            self_link.fetch(:self) {} ? options[:links][:self] : options[:original_url]
           end
         end
       end