Fixed: query builder respects custom pagination params

JsonApiClient · Aug 8, 2017 · afbcded · afbcded
1 parent 2c7493c
commit afbcded
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/json_api_client/query/builder.rb b/lib/json_api_client/query/builder.rb
@@ -47,12 +47,12 @@ def paginate(conditions = {})
       end
 
       def page(number)
-        @pagination_params[:number] = number
+        @pagination_params[ klass.paginator.page_param ] = number
         self
       end
 
       def per(size)
-        @pagination_params[:size] = size
+        @pagination_params[ klass.paginator.per_page_param ] = size
         self
       end
 

diff --git a/test/unit/custom_paginator_test.rb b/test/unit/custom_paginator_test.rb
@@ -3,6 +3,9 @@
 class CustomPaginatorTest < MiniTest::Test
 
   class CustomPaginator < JsonApiClient::Paginating::Paginator
+    self.page_param = 'pagina'
+    self.per_page_param = 'limit'
+
     def total_entries
       42
     end
@@ -15,12 +18,14 @@ class Book < JsonApiClient::Resource
 
   def test_can_override
     stub_request(:get, "http://example.com/books")
+      .with(query: {page: {pagina: 3, limit: 6}})
       .to_return(headers: {content_type: "application/vnd.api+json"}, body: {
         data: []
       }.to_json)
 
-    books = Book.all
+    books = Book.paginate(page: 3, per_page: 6).to_a
     assert_equal 42, books.total_count
     assert_equal 42, books.total_entries
   end
+
 end
diff --git a/test/unit/query_builder_test.rb b/test/unit/query_builder_test.rb
@@ -31,7 +31,7 @@ def test_can_specify_multiple_includes
 
   def test_can_paginate
     stub_request(:get, "http://example.com/articles")
-      .with(query: {page: {number: 3, size: 6}})
+      .with(query: {page: {page: 3, per_page: 6}})
       .to_return(headers: {content_type: "application/vnd.api+json"}, body: {
         data: []
       }.to_json)