Fixed: query builder respects custom pagination params (#267)

Author: kdonovan

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
 

test/unit/custom_paginator_params_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class CustomPaginatorTest < MiniTest::Test
+
+  class CustomPaginator < JsonApiClient::Paginating::Paginator
+    self.page_param = 'pagina'
+    self.per_page_param = 'limit'
+  end
+
+  class Book < JsonApiClient::Resource
+    self.site = "http://example.com/"
+    self.paginator = CustomPaginator
+  end
+
+  def test_can_override_query_param_names
+    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)
+
+    Book.paginate(page: 3, per_page: 6).to_a
+  end
+
+end

test/unit/custom_paginator_test.rb

@@ -23,4 +23,5 @@ def test_can_override
     assert_equal 42, books.total_count
     assert_equal 42, books.total_entries
   end
+
 end

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)