lib/zendesk_api/collection.rb in zendesk_api-1.7.1 vs lib/zendesk_api/collection.rb in zendesk_api-1.7.3

@@ -111,15 +111,15 @@
       @options["page"] = number
       self
     end
 
     def first_page?
-      !@options["page"] || @options["page"].to_i <= 1
+      !@prev_page
     end
 
     def last_page?
-      !@options["page"] || @options["page"].to_i * @options["per_page"].to_i >= count
+      !@next_page || @next_page == @query
     end
 
     # Saves all newly created resources stored in this collection.
     # @return [Collection] self
     def save
@@ -170,10 +170,9 @@
       end
 
       @response = get_response(@query || self.path)
       handle_response(@response.body)
 
-      @query = nil
       @resources
     end
 
     def fetch(*args)
       fetch!(*args)