Skip to content

Commit 8f543ad

Browse files
committed
Removed the extraction of from and size from request body in Kaminari methods
Closes elastic#16
1 parent e58ebfe commit 8f543ad

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

elasticsearch-model/lib/elasticsearch/model/response/pagination.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ def #{::Kaminari.config.page_method_name}(num=nil)
4545
#
4646
def limit_value
4747
case
48-
when search.definition[:body] && search.definition[:body][:size]
49-
search.definition[:body][:size]
5048
when search.definition[:size]
5149
search.definition[:size]
5250
else
@@ -58,8 +56,6 @@ def limit_value
5856
#
5957
def offset_value
6058
case
61-
when search.definition[:body] && search.definition[:body][:from]
62-
search.definition[:body][:from]
6359
when search.definition[:from]
6460
search.definition[:from]
6561
else

elasticsearch-model/test/unit/response_pagination_test.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,13 @@ def self.document_type; 'bar'; end
7474
assert_equal 50, @response.offset_value
7575
end
7676

77-
should "return the value from body" do
78-
search = Elasticsearch::Model::Searching::SearchRequest.new ModelClass, { query: { match_all: {} }, from: 10, size: 50 }
77+
should "ignore the value from request body" do
78+
search = Elasticsearch::Model::Searching::SearchRequest.new ModelClass,
79+
{ query: { match_all: {} }, from: 333, size: 999 }
7980
@response = Elasticsearch::Model::Response::Response.new ModelClass, search, RESPONSE
8081

81-
assert_equal 50, @response.limit_value
82-
assert_equal 10, @response.offset_value
82+
assert_equal Kaminari.config.default_per_page, @response.limit_value
83+
assert_equal 0, @response.offset_value
8384
end
8485
end
8586

0 commit comments

Comments
 (0)