From 0b8db094623977b60ff51bb74221624e74c16adf Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 17 Mar 2020 21:48:16 -0700 Subject: [PATCH] Fixed pagination [skip ci] --- lib/searchkick/relation.rb | 24 ++++++++++++++++++------ test/pagination_test.rb | 6 +++--- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/searchkick/relation.rb b/lib/searchkick/relation.rb index 9466ce4..d451b50 100644 --- a/lib/searchkick/relation.rb +++ b/lib/searchkick/relation.rb @@ -50,8 +50,12 @@ module Searchkick self end - def offset(value) - spawn.offset!(value) + def offset(*args) + if args.empty? + execute.offset + else + spawn.offset!(*args) + end end def offset!(value) @@ -94,8 +98,12 @@ module Searchkick self end - def per_page(value) - spawn.per_page!(value) + def per_page(*args) + if args.empty? + execute.per_page + else + spawn.per_page!(*args) + end end def per_page!(value) @@ -103,8 +111,12 @@ module Searchkick self end - def padding(value) - spawn.padding!(value) + def padding(*args) + if args.empty? + execute.padding + else + spawn.padding!(*args) + end end def padding!(value) diff --git a/test/pagination_test.rb b/test/pagination_test.rb index 14da4db..1646755 100644 --- a/test/pagination_test.rb +++ b/test/pagination_test.rb @@ -49,8 +49,8 @@ class PaginationTest < Minitest::Test assert_equal ["Product D", "Product E"], products.map(&:name) assert_equal "product", products.entry_name assert_equal 2, products.current_page - # assert_equal 1, products.padding - # assert_equal 2, products.per_page + assert_equal 1, products.padding + assert_equal 2, products.per_page assert_equal 2, products.size assert_equal 2, products.length assert_equal 3, products.total_pages @@ -58,7 +58,7 @@ class PaginationTest < Minitest::Test assert_equal 6, products.total_entries assert_equal 2, products.limit_value assert_equal 3, products.offset_value - # assert_equal 3, products.offset + assert_equal 3, products.offset assert_equal 3, products.next_page assert_equal 1, products.previous_page assert_equal 1, products.prev_page -- libgit2 0.21.0