Commit 7bc4c7b

committed

Coerce pagination string params

1 parent d6e534c commit 7bc4c7bCopy full SHA for 7bc4c7b

File tree

+12

-2

lines changed

elasticsearch-model
- lib/elasticsearch/model/response
  - pagination.rb
- test/unit
  - response_pagination_kaminari_test.rb

+12

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def limit(value)`
`69`	`69`	`@results = nil`
`70`	`70`	`@records = nil`
`71`	`71`	`@response = nil`
`72`		`- @per_page = value`
	`72`	`+ @per_page = value.to_i`
`73`	`73`
`74`	`74`	`search.definition.update :size => @per_page`
`75`	`75`	`search.definition.update :from => @per_page * (@page - 1) if @page`
`@@ -83,7 +83,7 @@ def offset(value)`
`83`	`83`	`@records = nil`
`84`	`84`	`@response = nil`
`85`	`85`	`@page = nil`
`86`		`- search.definition.update :from => value`
	`86`	`+ search.definition.update :from => value.to_i`
`87`	`87`	`self`
`88`	`88`	`end`
`89`	`89`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ def self.document_type; 'bar'; end`
`104`	`104`	`assert_nil @response.instance_variable_get(:@records)`
`105`	`105`	`assert_nil @response.instance_variable_get(:@results)`
`106`	`106`	`end`
	`107`	`+`
	`108`	`+ should 'coerce string parameters' do`
	`109`	`+ @response.limit("35")`
	`110`	`+ assert_equal 35, @response.search.definition[:size]`
	`111`	`+ end`
`107`	`112`	`end`
`108`	`113`
`109`	`114`	`context "with the page() and limit() methods" do`
`@@ -151,6 +156,11 @@ def self.document_type; 'bar'; end`
`151`	`156`	`assert_nil @response.instance_variable_get(:@records)`
`152`	`157`	`assert_nil @response.instance_variable_get(:@results)`
`153`	`158`	`end`
	`159`	`+`
	`160`	`+ should 'coerce string parameters' do`
	`161`	`+ @response.offset("35")`
	`162`	`+ assert_equal 35, @response.search.definition[:from]`
	`163`	`+ end`
`154`	`164`	`end`
`155`	`165`
`156`	`166`	`context "total" do`

Comments

(0)