Commit f676a15

meesterdudekarmi

authored and

committed

[MODEL] Added the length method to the "will_paginate" integration

Closes #175 Related: #131, #135

1 parent d9777fd commit f676a15Copy full SHA for f676a15

File tree

+12

-1

lines changed

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

+12

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ def self.included(base)`
`102`	`102`
`103`	`103`	`# Include the paging methods in results and records`
`104`	`104`	`#`
`105`		`- methods = [:current_page, :offset, :per_page, :total_entries, :total_pages, :previous_page, :next_page, :out_of_bounds?]`
	`105`	`+ methods = [:current_page, :offset, :length,:per_page, :total_entries, :total_pages, :previous_page, :next_page, :out_of_bounds?]`
`106`	`106`	`Elasticsearch::Model::Response::Results.__send__ :delegate, *methods, to: :response`
`107`	`107`	`Elasticsearch::Model::Response::Records.__send__ :delegate, *methods, to: :response`
`108`	`108`	`end`
`@@ -111,6 +111,10 @@ def offset`
`111`	`111`	`(current_page - 1) * per_page`
`112`	`112`	`end`
`113`	`113`
	`114`	`+ def length`
	`115`	`+ search.definition[:size]`
	`116`	`+ end`
	`117`	`+`
`114`	`118`	`# Main pagination method`
`115`	`119`	`#`
`116`	`120`	`# @example`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response`
`33`	`33`	`:offset,`
`34`	`34`	`:per_page,`
`35`	`35`	`:total_entries,`
	`36`	`+ :length,`
`36`	`37`
`37`	`38`	`# methods defined by WillPaginate::CollectionMethods`
`38`	`39`	`:total_pages,`
`@@ -73,6 +74,12 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response`
`73`	`74`	`assert_equal 6, @response.offset`
`74`	`75`	`end`
`75`	`76`	`end`
	`77`	`+ context "#length method" do`
	`78`	`+ should "return count of paginated results" do`
	`79`	`+ @response.per_page(3).page(3)`
	`80`	`+ assert_equal 3, @response.length`
	`81`	`+ end`
	`82`	`+ end`
`76`	`83`
`77`	`84`	`context "#paginate method" do`
`78`	`85`	`should "set from/size using defaults" do`

Comments

(0)