lib/jsonapi/paginator.rb in jsonapi-resources-0.5.4 vs lib/jsonapi/paginator.rb in jsonapi-resources-0.5.5

@@ -72,12 +72,16 @@
         'limit' => @limit
       }
     end
 
     if record_count
+      last_offset = record_count - @limit
+
+      last_offset = 0 if last_offset < 0
+
       links_page_params['last'] = {
-        'offset' => record_count - @limit,
+        'offset' => last_offset,
         'limit' => @limit
       }
     end
 
     links_page_params
@@ -157,10 +161,10 @@
       }
     end
 
     if record_count
       links_page_params['last'] = {
-        'number' => page_count,
+        'number' => page_count == 0 ? 1 : page_count,
         'size' => @size
       }
     end
 
     links_page_params