lib/bearcat/api_array.rb in bearcat-1.3.49 vs lib/bearcat/api_array.rb in bearcat-1.3.51

@@ -68,11 +68,11 @@
         @status = response.status
         @method = response.env[:method]
         init_pages(@headers[:link])
         @members = process_body(response)
         block.call(@members)
-        while @link_hash['next']
+        while @link_hash['next'] && @members.present?
           response = get_page(@link_hash['next'])
           @headers = response.headers
           @status = response.status
           @method = response.env[:method]
           @members = process_body(response)
@@ -103,10 +103,12 @@
         while @link_hash['next']
           response = get_page(@link_hash['next'])
           @headers = response.headers
           @status = response.status
           @method = response.env[:method]
-          @members.concat(process_body(response))
+          page_members = process_body(response)
+          break unless page_members.present?
+          @members.concat(page_members)
           init_pages(@headers[:link])
         end
         @link_hash = {}
       end
       self